Merge branch 'feature/move-jsps-under-webinf' into develop

mike10004 · Apr 14, 2014 · 54c9efc · 54c9efc
2 parents 90eb79a + 0b510ca
commit 54c9efc
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/...ts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml b/...ts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
@@ -12,16 +12,16 @@
         <default-action-ref name="HelloWorld" />
 
         <action name="HelloWorld" class="${package}.example.HelloWorld">
-            <result>/example/HelloWorld.jsp</result>
+            <result>/WEB-INF/example/HelloWorld.jsp</result>
         </action>
 
         <action name="Login_*" method="{1}" class="${package}.example.Login">
-            <result name="input">/example/Login.jsp</result>
+            <result name="input">/WEB-INF/example/Login.jsp</result>
             <result type="redirectAction">Menu</result>
         </action>
 
         <action name="*" class="${package}.example.ExampleSupport">
-            <result>/example/{1}.jsp</result>
+            <result>/WEB-INF/example/{1}.jsp</result>
         </action>
 
         <!-- Add additional "example" package actions here. -->

diff --git a/...es/src/main/webapp/example/HelloWorld.jsp → ...ain/webapp/WEB-INF/example/HelloWorld.jsp b/...es/src/main/webapp/example/HelloWorld.jsp → ...ain/webapp/WEB-INF/example/HelloWorld.jsp
diff --git a/...sources/src/main/webapp/example/Login.jsp → ...src/main/webapp/WEB-INF/example/Login.jsp b/...sources/src/main/webapp/example/Login.jsp → ...src/main/webapp/WEB-INF/example/Login.jsp
diff --git a/...esources/src/main/webapp/example/Menu.jsp → .../src/main/webapp/WEB-INF/example/Menu.jsp b/...esources/src/main/webapp/example/Menu.jsp → .../src/main/webapp/WEB-INF/example/Menu.jsp
diff --git a/...urces/src/main/webapp/example/Missing.jsp → ...c/main/webapp/WEB-INF/example/Missing.jsp b/...urces/src/main/webapp/example/Missing.jsp → ...c/main/webapp/WEB-INF/example/Missing.jsp
diff --git a/...rces/src/main/webapp/example/Register.jsp → .../main/webapp/WEB-INF/example/Register.jsp b/...rces/src/main/webapp/example/Register.jsp → .../main/webapp/WEB-INF/example/Register.jsp
diff --git a/...urces/src/main/webapp/example/Welcome.jsp → ...c/main/webapp/WEB-INF/example/Welcome.jsp b/...urces/src/main/webapp/example/Welcome.jsp → ...c/main/webapp/WEB-INF/example/Welcome.jsp
diff --git a/...s2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml b/...s2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -12,12 +12,12 @@
         <default-action-ref name="index" />
 
         <action name="index" class="${package}.IndexAction">
-            <result>/jsp/index.jsp</result>
+            <result>/WEB-INF/jsp/index.jsp</result>
         </action>
 
         <action name="helloWorld" class="helloWorldAction">
             <result name="input">/jsp/index.jsp</result>
-            <result>/jsp/helloWorld.jsp</result>
+            <result>/WEB-INF/jsp/helloWorld.jsp</result>
         </action>
 
     </package>

diff --git a/...ources/src/main/webapp/jsp/helloWorld.jsp → ...rc/main/webapp/WEB-INF/jsp/helloWorld.jsp b/...ources/src/main/webapp/jsp/helloWorld.jsp → ...rc/main/webapp/WEB-INF/jsp/helloWorld.jsp
diff --git a/...e-resources/src/main/webapp/jsp/index.jsp → ...ces/src/main/webapp/WEB-INF/jsp/index.jsp b/...e-resources/src/main/webapp/jsp/index.jsp → ...ces/src/main/webapp/WEB-INF/jsp/index.jsp