Merge branch 'release/2.3.17'

mike10004 · Apr 6, 2014 · 6d55d01 · 6d55d01
2 parents a77f28d + e1f97c8
commit 6d55d01
Show file tree

Hide file tree

Showing 404 changed files with 3,544 additions and 1,618 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,9 @@
 .project
 .settings/
 
+# OSX
+.DS_Store
+
 # Scripts
 *.sh
 

diff --git a/apps/blank/README.txt b/apps/blank/README.txt
@@ -7,4 +7,10 @@ For more on getting started with Struts, see
 
 * http://cwiki.apache.org/WW/home.html
 
-----------------------------------------------------------------------------
+I18N:
+=====
+Please note that this project was created with the assumption that it will be run
+in an environment where the default locale is set to English. This means that
+the default messages defined in package.properties are in English. If the default
+locale for your server is different, then rename package.properties to package_en.properties
+and create a new package.properties with proper values for your default locale.
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.16.1</version>
+        <version>2.3.18-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>
     <packaging>war</packaging>
-    <name>Blank Webapp</name>
+    <name>Struts 2 Blank Webapp</name>
 
     <dependencies>
 

diff --git a/apps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml
@@ -31,4 +31,9 @@
         </auth-constraint>
     </security-constraint>
 
+    <security-role>
+        <description>Don't assign users to this role</description>
+        <role-name>no-users</role-name>
+    </security-role>
+
 </web-app>
diff --git a/apps/jboss-blank/README.txt b/apps/jboss-blank/README.txt
@@ -7,4 +7,10 @@ For more on getting started with Struts, see
 
 * http://cwiki.apache.org/WW/home.html
 
-----------------------------------------------------------------------------
+I18N:
+=====
+Please note that this project was created with the assumption that it will be run
+in an environment where the default locale is set to English. This means that
+the default messages defined in package.properties are in English. If the default
+locale for your server is different, then rename package.properties to package_en.properties
+and create a new package.properties with proper values for your default locale.
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.16.1</version>
+        <version>2.3.18-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>
     <packaging>war</packaging>
-    <name>JBoss Blank Webapp</name>
+    <name>Struts 2 JBoss Blank Webapp</name>
 
     <dependencies>
 

diff --git a/apps/jboss-blank/src/main/resources/example.xml b/apps/jboss-blank/src/main/resources/example.xml
@@ -8,16 +8,16 @@
     <package name="example" namespace="/example" extends="struts-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/...nk/src/main/webapp/example/HelloWorld.jsp → ...webapp/WEB-INF/jsp/example/HelloWorld.jsp b/...nk/src/main/webapp/example/HelloWorld.jsp → ...webapp/WEB-INF/jsp/example/HelloWorld.jsp
@@ -1,28 +1,28 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title><s:text name="HelloWorld.message"/></title>
-</head>
-
-<body>
-<h2><s:property value="message"/></h2>
-
-<h3>Languages</h3>
-<ul>
-    <li>
-        <s:url id="url" action="HelloWorld">
-            <s:param name="request_locale">en</s:param>
-        </s:url>
-        <s:a href="%{url}">English</s:a>
-    </li>
-    <li>
-        <s:url id="url" action="HelloWorld">
-            <s:param name="request_locale">es</s:param>
-        </s:url>
-        <s:a href="%{url}">Espanol</s:a>
-    </li>
-</ul>
-
-</body>
-</html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title><s:text name="HelloWorld.message"/></title>
+</head>
+
+<body>
+<h2><s:property value="message"/></h2>
+
+<h3>Languages</h3>
+<ul>
+    <li>
+        <s:url id="url" action="HelloWorld">
+            <s:param name="request_locale">en</s:param>
+        </s:url>
+        <s:a href="%{url}">English</s:a>
+    </li>
+    <li>
+        <s:url id="url" action="HelloWorld">
+            <s:param name="request_locale">es</s:param>
+        </s:url>
+        <s:a href="%{url}">Espanol</s:a>
+    </li>
+</ul>
+
+</body>
+</html>
diff --git a/...s-blank/src/main/webapp/example/Login.jsp → ...main/webapp/WEB-INF/jsp/example/Login.jsp b/...s-blank/src/main/webapp/example/Login.jsp → ...main/webapp/WEB-INF/jsp/example/Login.jsp
@@ -1,15 +1,15 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title>Sign On</title>
-</head>
-
-<body>
-<s:form action="Login">
-    <s:textfield key="username"/>
-    <s:password key="password" />
-    <s:submit/>
-</s:form>
-</body>
-</html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title>Sign On</title>
+</head>
+
+<body>
+<s:form action="Login">
+    <s:textfield key="username"/>
+    <s:password key="password" />
+    <s:submit/>
+</s:form>
+</body>
+</html>
diff --git a/...ss-blank/src/main/webapp/example/Menu.jsp → .../main/webapp/WEB-INF/jsp/example/Menu.jsp b/...ss-blank/src/main/webapp/example/Menu.jsp → .../main/webapp/WEB-INF/jsp/example/Menu.jsp
@@ -1,3 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <s:include value="Missing.jsp"/>
diff --git a/...blank/src/main/webapp/example/Missing.jsp → ...in/webapp/WEB-INF/jsp/example/Missing.jsp b/...blank/src/main/webapp/example/Missing.jsp → ...in/webapp/WEB-INF/jsp/example/Missing.jsp
@@ -1,11 +1,11 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head><title>Missing Feature</title></head>
-
-<body>
-<p>
-    <s:text name="Missing.message"/>
-</p>
-</body>
-</html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head><title>Missing Feature</title></head>
+
+<body>
+<p>
+    <s:text name="Missing.message"/>
+</p>
+</body>
+</html>
diff --git a/...lank/src/main/webapp/example/Register.jsp → ...n/webapp/WEB-INF/jsp/example/Register.jsp b/...lank/src/main/webapp/example/Register.jsp → ...n/webapp/WEB-INF/jsp/example/Register.jsp
@@ -1,3 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <s:include value="Missing.jsp"/>
diff --git a/...blank/src/main/webapp/example/Welcome.jsp → ...in/webapp/WEB-INF/jsp/example/Welcome.jsp b/...blank/src/main/webapp/example/Welcome.jsp → ...in/webapp/WEB-INF/jsp/example/Welcome.jsp
@@ -1,18 +1,18 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title>Welcome</title>
-    <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
-          type="text/css"/>
-</head>
-
-<body>
-<h3>Commands</h3>
-<ul>
-    <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
-    <li><a href="<s:url action="Register"/>">Register</a></li>
-</ul>
-
-</body>
-</html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title>Welcome</title>
+    <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
+          type="text/css"/>
+</head>
+
+<body>
+<h3>Commands</h3>
+<ul>
+    <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
+    <li><a href="<s:url action="Register"/>">Register</a></li>
+</ul>
+
+</body>
+</html>
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
@@ -17,4 +17,21 @@
         <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>
+
+    <security-role>
+        <description>Don't assign users to this role</description>
+        <role-name>no-users</role-name>
+    </security-role>
+
 </web-app>
diff --git a/apps/mailreader/README.txt b/apps/mailreader/README.txt
@@ -14,5 +14,10 @@ For more about the MailReader applicaton genneraly, visit Struts University.
 
 * http://www.StrutsUniversity.org/
 
-
-----------------------------------------------------------------------------
+I18N:
+=====
+Please note that this project was created with the assumption that it will be run
+in an environment where the default locale is set to English. This means that
+the default messages defined in package.properties are in English. If the default
+locale for your server is different, then rename package.properties to package_en.properties
+and create a new package.properties with proper values for your default locale.
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
@@ -26,12 +26,12 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.16.1</version>
+      <version>2.3.18-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>
     <packaging>war</packaging>
-    <name>Mail Reader Webapp</name>
+    <name>Struts 2 Mail Reader Webapp</name>
 
     <dependencies>
 

diff --git 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/...reader/src/main/webapp/ChangePassword.jsp → ...ain/webapp/WEB-INF/jsp/ChangePassword.jsp b/...reader/src/main/webapp/ChangePassword.jsp → ...ain/webapp/WEB-INF/jsp/ChangePassword.jsp
diff --git a/apps/mailreader/src/main/webapp/Error.jsp → ...der/src/main/webapp/WEB-INF/jsp/Error.jsp b/apps/mailreader/src/main/webapp/Error.jsp → ...der/src/main/webapp/WEB-INF/jsp/Error.jsp
diff --git a/apps/mailreader/src/main/webapp/Footer.jsp → ...er/src/main/webapp/WEB-INF/jsp/Footer.jsp b/apps/mailreader/src/main/webapp/Footer.jsp → ...er/src/main/webapp/WEB-INF/jsp/Footer.jsp
diff --git a/apps/mailreader/src/main/webapp/Login.jsp → ...der/src/main/webapp/WEB-INF/jsp/Login.jsp b/apps/mailreader/src/main/webapp/Login.jsp → ...der/src/main/webapp/WEB-INF/jsp/Login.jsp
diff --git a/apps/mailreader/src/main/webapp/MainMenu.jsp → .../src/main/webapp/WEB-INF/jsp/MainMenu.jsp b/apps/mailreader/src/main/webapp/MainMenu.jsp → .../src/main/webapp/WEB-INF/jsp/MainMenu.jsp
diff --git a/...ilreader/src/main/webapp/Registration.jsp → .../main/webapp/WEB-INF/jsp/Registration.jsp b/...ilreader/src/main/webapp/Registration.jsp → .../main/webapp/WEB-INF/jsp/Registration.jsp
diff --git a/...ilreader/src/main/webapp/Subscription.jsp → .../main/webapp/WEB-INF/jsp/Subscription.jsp b/...ilreader/src/main/webapp/Subscription.jsp → .../main/webapp/WEB-INF/jsp/Subscription.jsp
diff --git a/apps/mailreader/src/main/webapp/Welcome.jsp → ...r/src/main/webapp/WEB-INF/jsp/Welcome.jsp b/apps/mailreader/src/main/webapp/Welcome.jsp → ...r/src/main/webapp/WEB-INF/jsp/Welcome.jsp
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/web.xml b/apps/mailreader/src/main/webapp/WEB-INF/web.xml
@@ -27,4 +27,21 @@
         <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>
+
+    <security-role>
+        <description>Don't assign users to this role</description>
+        <role-name>no-users</role-name>
+    </security-role>
+
 </web-app>
diff --git a/apps/pom.xml b/apps/pom.xml
@@ -26,9 +26,8 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.16.1</version>
+        <version>2.3.18-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>
     <name>Struts 2 Webapps</name>