Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts

Browse Source
This commit is contained in:
Lukasz Lenart
2015-09-28 20:42:36 +02:00
parent db62a57bcb 43c0309410
commit 48ea26be79
11 changed files with 74 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+4 -10
View File
@@ -86,8 +86,8 @@
<version>3.3</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.5</source>
<target>1.5</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -159,18 +159,12 @@
</executions>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.16.v20140903</version>
<version>9.3.3.v20150827</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
<systemProperties>
<systemProperty>
<name>xwork.loggerFactory</name>
<value>com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory</value>
</systemProperty>
</systemProperties>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/ApplicationAction.java
-44
View File
@@ -1,44 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package ${package}.actions;
import com.opensymphony.xwork2.ActionSupport;
/**
* <code>Set welcome message.</code>
*/
public class ApplicationAction extends ActionSupport {
private static final long serialVersionUID = -3243216917801206214L;
private boolean useMinifiedResources = false;
public String execute() throws Exception {
return SUCCESS;
}
public boolean isUseMinifiedResources() {
return useMinifiedResources;
}
public void setUseMinifiedResources(boolean useMinifiedResources) {
this.useMinifiedResources = useMinifiedResources;
}
}
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java
+11 -15
View File
@@ -1,6 +1,4 @@
/*
* $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -20,27 +18,25 @@
*/
package ${package}.actions;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
@Results({
@Result(name = Action.SUCCESS, location = "${redirectName}", type = "redirectAction")
})
/* Default action when enter the application */
public class Index extends ActionSupport {
private static final long serialVersionUID = 6153177836211979662L;
private static final long serialVersionUID = -3243216917801206214L;
private String redirectName;
private boolean useMinifiedResources = false;
public String execute() {
redirectName = "application";
return Action.SUCCESS;
public String execute() throws Exception {
return SUCCESS;
}
public String getRedirectName() {
return redirectName;
public boolean isUseMinifiedResources() {
return useMinifiedResources;
}
public void setUseMinifiedResources(boolean useMinifiedResources) {
this.useMinifiedResources = useMinifiedResources;
}
}
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java
-2
View File
@@ -1,6 +1,4 @@
/*
* $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/ApplicationActionTest.java → archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java
+5 -13
View File
@@ -16,17 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package ${package}.actions;
@ParentPackage("data")
@Namespace("/data")
package ${package}.actions.data;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.StrutsTestCase;
public class ApplicationActionTest extends StrutsTestCase {
public void testApplicationAction() throws Exception {
ApplicationAction hello = new ApplicationAction();
String result = hello.execute();
assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
assertFalse(hello.isUseMinifiedResources());
}
}
import org.apache.struts2.convention.annotation.Namespace;
import org.apache.struts2.convention.annotation.ParentPackage;
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
+3 -1
View File
@@ -8,7 +8,9 @@
<constant name="struts.devMode" value="true"/>
<constant name="struts.convention.default.parent.package" value="angularstruts"/>
<package name="angularstruts" extends="json-default"></package>
<package name="angularstruts" extends="json-default">
<default-action-ref name="index" />
</package>
<package name="data" extends="angularstruts" namespace="/data"></package>
</struts>
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/application.jsp → archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/index.jsp
View File
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+1 -1
View File
@@ -1 +1 @@
<% response.sendRedirect("application"); %>
<% response.sendRedirect("index"); %>
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
+8 -5
View File
@@ -1,6 +1,4 @@
/*
* $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,14 +19,19 @@
package ${package}.actions;
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.StrutsRestTestCase;
import org.junit.Test;
public class IndexTest extends StrutsTestCase {
import static org.junit.Assert.*;
public class IndexTest extends StrutsRestTestCase<Index> {
@Test
public void testIndex() throws Exception {
Index index = new Index();
String result = index.execute();
assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
assertTrue("Expected the 'hello' action name!!", "application".equals(index.getRedirectName()));
assertFalse(index.isUseMinifiedResources());
}
}
plugins/bean-validation/src/main/resources/struts-plugin.xml
+41
View File
@@ -72,4 +72,45 @@
<default-interceptor-ref name="beanValidationDefaultStack"/>
</package>
<package name="struts-rest-bean-validation" extends="rest-default">
<interceptors>
<interceptor name="beanValidation" class="org.apache.struts.beanvalidation.validation.interceptor.BeanValidationInterceptor"/>
<interceptor-stack name="restBeanValidationStack">
<interceptor-ref name="exception"/>
<interceptor-ref name="alias"/>
<interceptor-ref name="servletConfig"/>
<interceptor-ref name="messages">
<param name="operationMode">AUTOMATIC</param>
</interceptor-ref>
<interceptor-ref name="prepare"/>
<interceptor-ref name="i18n"/>
<interceptor-ref name="chain"/>
<interceptor-ref name="debugging"/>
<interceptor-ref name="profiling"/>
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="scopedModelDriven"/>
<interceptor-ref name="modelDriven">
<param name="refreshModelBeforeResult">true</param>
</interceptor-ref>
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="checkbox"/>
<interceptor-ref name="staticParams"/>
<interceptor-ref name="params"/>
<interceptor-ref name="rest" />
<interceptor-ref name="conversionError"/>
<interceptor-ref name="beanValidation">
<param name="excludeMethods">input,back,cancel,browse,index,show,edit,editNew</param>
</interceptor-ref>
<interceptor-ref name="restWorkflow">
<param name="excludeMethods">input,back,cancel,browse,index,show,edit,editNew</param>
</interceptor-ref>
</interceptor-stack>
</interceptors>
<default-interceptor-ref name="beanValidationDefaultStack"/>
</package>
</struts>
plugins/rest/src/main/resources/struts-plugin.xml
+1 -3
View File
@@ -92,9 +92,7 @@
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="checkbox"/>
<interceptor-ref name="staticParams"/>
<interceptor-ref name="params">
<param name="excludeParams">dojo\..*</param>
</interceptor-ref>
<interceptor-ref name="params"/>
<interceptor-ref name="rest" />
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">