From 763264238aa6a9a0bb142d3369588c3fb4b73c98 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 21 Jan 2014 07:44:28 +0100
Subject: [PATCH] Moves JSP files into WEB-INF/jsp to promote best practises

---
 apps/blank/src/main/resources/example.xml        |  6 +++---
 apps/blank/src/main/resources/struts.xml         |  2 +-
 .../src/main/webapp/{ => WEB-INF/jsp}/error.jsp  |  0
 .../{ => WEB-INF/jsp}/example/HelloWorld.jsp     |  0
 .../webapp/{ => WEB-INF/jsp}/example/Login.jsp   |  0
 .../webapp/{ => WEB-INF/jsp}/example/Menu.jsp    |  0
 .../webapp/{ => WEB-INF/jsp}/example/Missing.jsp |  0
 .../{ => WEB-INF/jsp}/example/Register.jsp       |  0
 .../webapp/{ => WEB-INF/jsp}/example/Welcome.jsp |  0
 apps/blank/src/main/webapp/WEB-INF/web.xml       | 16 +++++++++++++++-
 10 files changed, 19 insertions(+), 5 deletions(-)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/error.jsp (100%)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/example/HelloWorld.jsp (100%)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/example/Login.jsp (100%)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/example/Menu.jsp (100%)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/example/Missing.jsp (100%)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/example/Register.jsp (100%)
 rename apps/blank/src/main/webapp/{ => WEB-INF/jsp}/example/Welcome.jsp (100%)

diff --git a/apps/blank/src/main/resources/example.xml b/apps/blank/src/main/resources/example.xml
index f28316c55..169f5c814 100644
--- a/apps/blank/src/main/resources/example.xml
+++ b/apps/blank/src/main/resources/example.xml
@@ -8,16 +8,16 @@
     <package name="example" namespace="/example" extends="default">
 
         <action name="HelloWorld" class="example.HelloWorld">
-            <result>/example/HelloWorld.jsp</result>
+            <result>/WEB-INF/jsp/example/HelloWorld.jsp</result>
         </action>
 
         <action name="Login_*" method="{1}" class="example.Login">
-            <result name="input">/example/Login.jsp</result>
+            <result name="input">/WEB-INF/jsp/example/Login.jsp</result>
             <result type="redirectAction">Menu</result>
         </action>
 
         <action name="*" class="example.ExampleSupport">
-            <result>/example/{1}.jsp</result>
+            <result>/WEB-INF/jsp/example/{1}.jsp</result>
         </action>
 
         <!-- Add actions here -->
diff --git a/apps/blank/src/main/resources/struts.xml b/apps/blank/src/main/resources/struts.xml
index 1fd8cb71c..ca643d8df 100644
--- a/apps/blank/src/main/resources/struts.xml
+++ b/apps/blank/src/main/resources/struts.xml
@@ -13,7 +13,7 @@
         <default-action-ref name="index" />
 
         <global-results>
-            <result name="error">/error.jsp</result>
+            <result name="error">/WEB-INF/jsp/error.jsp</result>
         </global-results>
 
         <global-exception-mappings>
diff --git a/apps/blank/src/main/webapp/error.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/error.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp
diff --git a/apps/blank/src/main/webapp/example/HelloWorld.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/example/HelloWorld.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
diff --git a/apps/blank/src/main/webapp/example/Login.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/example/Login.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
diff --git a/apps/blank/src/main/webapp/example/Menu.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/example/Menu.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
diff --git a/apps/blank/src/main/webapp/example/Missing.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/example/Missing.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
diff --git a/apps/blank/src/main/webapp/example/Register.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/example/Register.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
diff --git a/apps/blank/src/main/webapp/example/Welcome.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/example/Welcome.jsp
rename to apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
diff --git a/apps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml
index 255c1f9f7..e8c0f4654 100644
--- a/apps/blank/src/main/webapp/WEB-INF/web.xml
+++ b/apps/blank/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
     <display-name>Struts Blank</display-name>
 
@@ -17,4 +19,16 @@
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
+    <!-- Restricts access to pure JSP files - access available only via Struts action -->
+    <security-constraint>
+        <display-name>No direct JSP access</display-name>
+        <web-resource-collection>
+            <web-resource-name>No-JSP</web-resource-name>
+            <url-pattern>*.jsp</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>no-users</role-name>
+        </auth-constraint>
+    </security-constraint>
+
 </web-app>