WW-4522 Support latest stable AngularJS version in maven angularjs ar…

…chetype - Rename HelloAction to ApplicationAction
dddfans · Jul 10, 2015 · 8312ed1 · 8312ed1
1 parent 7928d34
commit 8312ed1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/...es/src/main/java/actions/HelloAction.java → .../main/java/actions/ApplicationAction.java b/...es/src/main/java/actions/HelloAction.java → .../main/java/actions/ApplicationAction.java
@@ -25,7 +25,7 @@
 /**
  * <code>Set welcome message.</code>
  */
-public class HelloAction extends ActionSupport {
+public class ApplicationAction extends ActionSupport {
 
     private static final long serialVersionUID = -3243216917801206214L;
 

diff --git a/...chetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java b/...chetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java
@@ -26,7 +26,7 @@
 import org.apache.struts2.convention.annotation.Results;
 
 @Results({
-        @Result(name = Action.SUCCESS, location = "${redirectName}", type = "redirectAction")
+    @Result(name = Action.SUCCESS, location = "${redirectName}", type = "redirectAction")
 })
 public class Index extends ActionSupport {
 
@@ -35,7 +35,7 @@ public class Index extends ActionSupport {
     private String redirectName;
 
     public String execute() {
-        redirectName = "hello";
+        redirectName = "application";
         return Action.SUCCESS;
     }
 

diff --git a/...src/main/webapp/WEB-INF/content/hello.jsp → ...in/webapp/WEB-INF/content/application.jsp b/...src/main/webapp/WEB-INF/content/hello.jsp → ...in/webapp/WEB-INF/content/application.jsp
diff --git a/...uts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/...uts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
@@ -1 +1 @@
-<% response.sendRedirect("hello"); %>
+<% response.sendRedirect("application"); %>
diff --git a/...rc/test/java/actions/HelloActionTest.java → ...t/java/actions/ApplicationActionTest.java b/...rc/test/java/actions/HelloActionTest.java → ...t/java/actions/ApplicationActionTest.java
@@ -23,14 +23,12 @@
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.StrutsTestCase;
 
-public class HelloActionTest extends StrutsTestCase {
+public class ApplicationActionTest extends StrutsTestCase {
 
-    public void testHelloAction() throws Exception {
-        HelloAction hello = new HelloAction();
+    public void testApplicationAction() throws Exception {
+        ApplicationAction hello = new ApplicationAction();
         String result = hello.execute();
-        assertTrue("Expected a success result!",
-                ActionSupport.SUCCESS.equals(result));
-        assertTrue("Expected the default message!",
-                hello.getText(HelloAction.MESSAGE).equals(hello.getMessage()));
+        assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
+        assertTrue("Expected the default message!", hello.getText(ApplicationAction.MESSAGE).equals(hello.getMessage()));
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<% response.sendRedirect("hello"); %>
		<% response.sendRedirect("application"); %>