diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml index 7fc4ff737..70c58c450 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml @@ -86,8 +86,8 @@ 3.3 UTF-8 - 1.5 - 1.5 + 1.7 + 1.7 @@ -159,18 +159,12 @@ - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - 8.1.16.v20140903 + 9.3.3.v20150827 CTRL+C 8999 - - - xwork.loggerFactory - com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory - - 10 \${basedir}/src/main/webapp/ diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/ApplicationAction.java b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/ApplicationAction.java deleted file mode 100644 index b6440cc41..000000000 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/ApplicationAction.java +++ /dev/null @@ -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; - -/** - * Set welcome message. - */ -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; - } - -} diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java index 5643b4a5b..4d8600a19 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java @@ -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; + } } + diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java index ddbe7da33..996d08924 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/ProjectsAction.java @@ -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 diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/ApplicationActionTest.java b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java similarity index 62% rename from archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/ApplicationActionTest.java rename to archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java index 2bef9988a..3e4af32c0 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/ApplicationActionTest.java +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java @@ -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; \ No newline at end of file diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml index e7253801b..0c7352322 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml @@ -8,7 +8,9 @@ - + + + diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/application.jsp b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/index.jsp similarity index 100% rename from archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/application.jsp rename to archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/index.jsp diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp index 3fa05a5cc..a81b87fc0 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp @@ -1 +1 @@ -<% response.sendRedirect("application"); %> \ No newline at end of file +<% response.sendRedirect("index"); %> \ No newline at end of file diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java index 1c3fc2000..dde937adf 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java @@ -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 { + + @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()); } } + diff --git a/plugins/bean-validation/src/main/resources/struts-plugin.xml b/plugins/bean-validation/src/main/resources/struts-plugin.xml index b45c6cb17..523082f7c 100644 --- a/plugins/bean-validation/src/main/resources/struts-plugin.xml +++ b/plugins/bean-validation/src/main/resources/struts-plugin.xml @@ -72,4 +72,45 @@ + + + + + + + + + + + AUTOMATIC + + + + + + + + + + true + + + + + + + + + input,back,cancel,browse,index,show,edit,editNew + + + input,back,cancel,browse,index,show,edit,editNew + + + + + + + + diff --git a/plugins/rest/src/main/resources/struts-plugin.xml b/plugins/rest/src/main/resources/struts-plugin.xml index 0f0937e11..6607dcf48 100644 --- a/plugins/rest/src/main/resources/struts-plugin.xml +++ b/plugins/rest/src/main/resources/struts-plugin.xml @@ -92,9 +92,7 @@ - - dojo\..* - +