From d07e8044beef98222f0140adb0b4e2892b6bf166 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sun, 2 Mar 2014 21:17:30 +0100
Subject: [PATCH] Moves mailreader related JSPs under WEB-INF

---
 apps/mailreader/src/main/java/mailreader-support.xml   | 10 +++++-----
 .../main/webapp/{ => WEB-INF/jsp}/ChangePassword.jsp   |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/Error.jsp        |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/Footer.jsp       |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/Login.jsp        |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/MainMenu.jsp     |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/Registration.jsp |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/Subscription.jsp |  0
 .../src/main/webapp/{ => WEB-INF/jsp}/Welcome.jsp      |  0
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/ChangePassword.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Error.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Footer.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Login.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/MainMenu.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Registration.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Subscription.jsp (100%)
 rename apps/mailreader/src/main/webapp/{ => WEB-INF/jsp}/Welcome.jsp (100%)

diff --git a/apps/mailreader/src/main/java/mailreader-support.xml b/apps/mailreader/src/main/java/mailreader-support.xml
index a6995431e..2438cb4a7 100644
--- a/apps/mailreader/src/main/java/mailreader-support.xml
+++ b/apps/mailreader/src/main/java/mailreader-support.xml
@@ -12,7 +12,7 @@
         </action>
 
         <action name="Welcome" class="mailreader2.Welcome">
-            <result>/Welcome.jsp</result>
+            <result>/WEB-INF/jsp/Welcome.jsp</result>
             <interceptor-ref name="guest"/>
         </action>
 
@@ -21,7 +21,7 @@
         </action>
 
         <action name="Login_*"  method="{1}" class="mailreader2.Login">
-            <result name="input">/Login.jsp</result>
+            <result name="input">/WEB-INF/jsp/Login.jsp</result>
             <result name="cancel" type="redirectAction">Welcome</result>
             <result type="redirectAction">MainMenu</result>
             <result name="expired" type="chain">ChangePassword</result>
@@ -32,7 +32,7 @@
         </action>
 
         <action name="Registration_*" method="{1}" class="mailreader2.Registration">
-            <result name="input">/Registration.jsp</result>
+            <result name="input">/WEB-INF/jsp/Registration.jsp</result>
             <result type="redirectAction">MainMenu</result>
             <interceptor-ref name="guest"/>
         </action>
@@ -41,7 +41,7 @@
     <package name="subscription" namespace="/" extends="mailreader-support">
 
         <global-results>
-            <result name="input">/Subscription.jsp</result>
+            <result name="input">/WEB-INF/jsp/Subscription.jsp</result>
             <result type="redirectAction">Registration_input</result>
         </global-results>
 
@@ -56,7 +56,7 @@
     <package name="wildcard" namespace="/" extends="mailreader-support">
 
         <action name="*" class="mailreader2.MailreaderSupport">
-            <result>/{1}.jsp</result>
+            <result>/WEB-INF/jsp/{1}.jsp</result>
         </action>
         
     </package>
diff --git a/apps/mailreader/src/main/webapp/ChangePassword.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/ChangePassword.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
diff --git a/apps/mailreader/src/main/webapp/Error.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/Error.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
diff --git a/apps/mailreader/src/main/webapp/Footer.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/Footer.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
diff --git a/apps/mailreader/src/main/webapp/Login.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/Login.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
diff --git a/apps/mailreader/src/main/webapp/MainMenu.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/MainMenu.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
diff --git a/apps/mailreader/src/main/webapp/Registration.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/Registration.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
diff --git a/apps/mailreader/src/main/webapp/Subscription.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/Subscription.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
diff --git a/apps/mailreader/src/main/webapp/Welcome.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp
similarity index 100%
rename from apps/mailreader/src/main/webapp/Welcome.jsp
rename to apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp