You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/03/02 21:23:04 UTC
[1/2] git commit: Adds security constraints to web.xml to block
access to pure JSP files
Repository: struts
Updated Branches:
refs/heads/feature/move-jsps-under-webinf 4360a0666 -> d07e8044b
Adds security constraints to web.xml to block access to pure JSP files
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/95b309a9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/95b309a9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/95b309a9
Branch: refs/heads/feature/move-jsps-under-webinf
Commit: 95b309a9b93eebadb589a335947598d815add80b
Parents: 4360a06
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Mar 2 21:13:38 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Mar 2 21:13:38 2014 +0100
----------------------------------------------------------------------
apps/blank/src/main/webapp/WEB-INF/web.xml | 5 +++++
apps/jboss-blank/src/main/webapp/WEB-INF/web.xml | 3 ---
apps/mailreader/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++
apps/portlet/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++
apps/rest-showcase/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++
apps/showcase/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++
6 files changed, 73 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/95b309a9/apps/blank/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml
index e8c0f46..f15252b 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/95b309a9/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
index 88c6fc8..d1cf020 100644
--- a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
@@ -27,9 +27,6 @@
<auth-constraint>
<role-name>no-users</role-name>
</auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
</security-constraint>
<security-role>
http://git-wip-us.apache.org/repos/asf/struts/blob/95b309a9/apps/mailreader/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/web.xml b/apps/mailreader/src/main/webapp/WEB-INF/web.xml
index 9b35ec3..b01d864 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/95b309a9/apps/portlet/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml
index f424419..d4a3c79 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/web.xml
+++ b/apps/portlet/src/main/webapp/WEB-INF/web.xml
@@ -28,4 +28,21 @@
</listener-class>
</listener>
+ <!-- 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/95b309a9/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml b/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
index d10c214..694c349 100644
--- a/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
@@ -26,4 +26,21 @@
<welcome-file>index.jsp</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>
http://git-wip-us.apache.org/repos/asf/struts/blob/95b309a9/apps/showcase/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index 62335a4..f3b88e9 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -194,4 +194,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>
[2/2] git commit: Moves mailreader related JSPs under WEB-INF
Posted by lu...@apache.org.
Moves mailreader related JSPs under WEB-INF
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d07e8044
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d07e8044
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d07e8044
Branch: refs/heads/feature/move-jsps-under-webinf
Commit: d07e8044beef98222f0140adb0b4e2892b6bf166
Parents: 95b309a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Mar 2 21:17:30 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Mar 2 21:17:30 2014 +0100
----------------------------------------------------------------------
.../src/main/java/mailreader-support.xml | 10 +-
.../src/main/webapp/ChangePassword.jsp | 25 ----
apps/mailreader/src/main/webapp/Error.jsp | 40 -------
apps/mailreader/src/main/webapp/Footer.jsp | 6 -
apps/mailreader/src/main/webapp/Login.jsp | 30 -----
apps/mailreader/src/main/webapp/MainMenu.jsp | 25 ----
.../mailreader/src/main/webapp/Registration.jsp | 115 -------------------
.../mailreader/src/main/webapp/Subscription.jsp | 60 ----------
.../main/webapp/WEB-INF/jsp/ChangePassword.jsp | 25 ++++
.../src/main/webapp/WEB-INF/jsp/Error.jsp | 40 +++++++
.../src/main/webapp/WEB-INF/jsp/Footer.jsp | 6 +
.../src/main/webapp/WEB-INF/jsp/Login.jsp | 30 +++++
.../src/main/webapp/WEB-INF/jsp/MainMenu.jsp | 25 ++++
.../main/webapp/WEB-INF/jsp/Registration.jsp | 115 +++++++++++++++++++
.../main/webapp/WEB-INF/jsp/Subscription.jsp | 60 ++++++++++
.../src/main/webapp/WEB-INF/jsp/Welcome.jsp | 55 +++++++++
apps/mailreader/src/main/webapp/Welcome.jsp | 55 ---------
17 files changed, 361 insertions(+), 361 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/java/mailreader-support.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/java/mailreader-support.xml b/apps/mailreader/src/main/java/mailreader-support.xml
index a699543..2438cb4 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/ChangePassword.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/ChangePassword.jsp b/apps/mailreader/src/main/webapp/ChangePassword.jsp
deleted file mode 100644
index ce543d7..0000000
--- a/apps/mailreader/src/main/webapp/ChangePassword.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title><s:text name="change.title"/></title>
- <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body>
-
-<p>
- <s:text name="change.message"/>
-</p>
-
-<p>
- <a href="<s:url action="Login_input"/>">
- <s:text name="change.try"/>
- </a>
-</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/Error.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/Error.jsp b/apps/mailreader/src/main/webapp/Error.jsp
deleted file mode 100644
index 05ab5e0..0000000
--- a/apps/mailreader/src/main/webapp/Error.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Unexpected Error</title>
-</head>
-
-<body>
-<h2>An unexpected error has occured</h2>
-
-<p>
- Please report this error to your system administrator
- or appropriate technical support personnel.
- Thank you for your cooperation.
-</p>
-
-<hr/>
-
-<h3>Error Message</h3>
-
-<s:actionerror />
-
-<p>
- <s:property value="%{exception.message}"/>
-</p>
-
-<hr/>
-
-<h3>Technical Details</h3>
-
-<p>
- <s:property value="%{exceptionStack}"/>
-</p>
-
-<jsp:include page="Footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/Footer.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/Footer.jsp b/apps/mailreader/src/main/webapp/Footer.jsp
deleted file mode 100644
index 56d80bb..0000000
--- a/apps/mailreader/src/main/webapp/Footer.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<hr/>
-
-<p>
- <a href="<s:url action="Welcome" includeParams="none"/>"><s:text name="index.title"/></a>
-</p>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/Login.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/Login.jsp b/apps/mailreader/src/main/webapp/Login.jsp
deleted file mode 100644
index 2994793..0000000
--- a/apps/mailreader/src/main/webapp/Login.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title><s:text name="login.title"/></title>
- <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body onLoad="self.focus();document.Login.username.focus()">
-
-<s:actionerror />
-<s:form action="Login" validate="true">
- <s:textfield key="username" />
-
- <s:password key="password" showPassword="true"/>
-
- <s:submit key="button.logon"/>
-
- <s:reset key="button.reset"/>
-
- <s:submit action="Login_cancel" key="button.cancel"
- onclick="form.onsubmit=null"/>
-</s:form>
-
-<jsp:include page="Footer.jsp"/>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/MainMenu.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/MainMenu.jsp b/apps/mailreader/src/main/webapp/MainMenu.jsp
deleted file mode 100644
index bf2f044..0000000
--- a/apps/mailreader/src/main/webapp/MainMenu.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title><s:text name="mainMenu.title"/></title>
- <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body>
-<h3><s:text name="mainMenu.heading"/> <s:property
- value="user.fullName"/></h3>
-<ul>
- <li><a href="<s:url action="Registration_input" />">
- <s:text name="mainMenu.registration"/>
- </a>
- </li>
- <li><a href="<s:url action="Logout"/>">
- <s:text name="mainMenu.logout"/>
- </a>
-</ul>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/Registration.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/Registration.jsp b/apps/mailreader/src/main/webapp/Registration.jsp
deleted file mode 100644
index 1d3cf8d..0000000
--- a/apps/mailreader/src/main/webapp/Registration.jsp
+++ /dev/null
@@ -1,115 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <s:if test="task=='Create'">
- <title><s:text name="registration.title.create"/></title>
- </s:if>
- <s:if test="task=='Edit'">
- <title><s:text name="registration.title.edit"/></title>
- </s:if>
- <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body onLoad="self.focus();document.Registration_save_username.focus()">
-
-<s:actionerror/>
-<s:form action="Registration_save" validate="false">
- <s:token />
- <s:hidden name="task"/>
- <s:if test="task == 'Create'">
- <s:textfield key="username"/>
- </s:if>
- <s:else>
- <s:label key="username"/>
- <s:hidden name="username"/>
- </s:else>
-
- <s:password key="password" showPassword="true"/>
- <s:password key="password2"/>
- <s:textfield key="user.fullName"/>
- <s:textfield key="user.fromAddress"/>
- <s:textfield key="user.replyToAddress"/>
-
- <s:if test="task == 'Create'">
- <s:submit key="button.save" action="Registration_save"/>
- <s:reset key="button.reset"/>
- <s:submit action="Welcome" key="button.cancel"
- onclick="form.onsubmit=null"/>
- </s:if>
- <s:else>
- <s:submit key="button.save" action="Registration"/>
- <s:reset key="button.reset"/>
- <s:submit action="MainMenu" key="button.cancel"
- onclick="form.onsubmit=null"/>
- </s:else>
-
-</s:form>
-
-<s:if test="task == 'Edit'">
- <div align="center">
- <h3><s:text name="heading.subscriptions"/></h3>
- </div>
-
- <table border="1" width="100%">
-
- <tr>
- <th align="center" width="30%">
- <s:text name="heading.host"/>
- </th>
- <th align="center" width="25%">
- <s:text name="heading.user"/>
- </th>
- <th align="center" width="10%">
- <s:text name="heading.type"/>
- </th>
- <th align="center" width="10%">
- <s:text name="heading.autoConnect"/>
- </th>
- <th align="center" width="15%">
- <s:text name="heading.action"/>
- </th>
- </tr>
-
- <s:iterator value="user.subscriptions">
- <tr>
- <td align="left">
- <s:property value="host"/>
- </td>
- <td align="left">
- <s:property value="username"/>
- </td>
- <td align="center">
- <s:property value="type"/>
- </td>
- <td align="center">
- <s:property value="autoConnect"/>
- </td>
- <td align="center">
-
- <a href="<s:url action="Subscription_delete"><s:param name="host" value="host"/></s:url>">
- <s:text name="registration.deleteSubscription"/>
- </a>
-
- <a href="<s:url action="Subscription_edit"><s:param name="host" value="host"/></s:url>">
- <s:text name="registration.editSubscription"/>
- </a>
-
- </td>
- </tr>
- </s:iterator>
-
- </table>
-
- <a href="<s:url action="Subscription_input"/>"><s:text
- name="registration.addSubscription"/></a>
-
-</s:if>
-
-<jsp:include page="Footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/Subscription.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/Subscription.jsp b/apps/mailreader/src/main/webapp/Subscription.jsp
deleted file mode 100644
index 60cda4a..0000000
--- a/apps/mailreader/src/main/webapp/Subscription.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <s:if test="task=='Create'">
- <title><s:text name="subscription.title.create"/></title>
- </s:if>
- <s:if test="task=='Edit'">
- <title><s:text name="subscription.title.edit"/></title>
- </s:if>
- <s:if test="task=='Delete'">
- <title><s:text name="subscription.title.delete"/></title>
- </s:if>
- <link href="<s:url value="/css/mailreader.css" includeParams="none"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body onLoad="self.focus();document.Subscription.username.focus()">
-
-<s:actionerror/>
-<s:form action="Subscription_save" validate="true">
- <s:token />
- <s:hidden name="task"/>
- <s:label key="username" name="user.username"/>
-
- <s:if test="task == 'Create'">
- <s:textfield key="host"/>
- </s:if>
- <s:else>
- <s:label key="host"/>
- <s:hidden name="host"/>
- </s:else>
-
- <s:if test="task == 'Delete'">
- <s:label key="subscription.username"/>
- <s:label key="subscription.password"/>
- <s:label key="subscription.type"/>
- <s:label key="subscription.autoConnect"/>
- <s:submit key="button.confirm"/>
- </s:if>
- <s:else>
- <s:textfield key="subscription.username"/>
- <s:textfield key="subscription.password"/>
- <s:select key="subscription.type" list="types"/>
- <s:checkbox key="subscription.autoConnect"/>
- <s:submit key="button.save"/>
- <s:reset key="button.reset"/>
- </s:else>
-
- <s:submit action="Registration_input"
- key="button.cancel"
- onclick="form.onsubmit=null"/>
-</s:form>
-
-<jsp:include page="Footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
new file mode 100644
index 0000000..ce543d7
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
@@ -0,0 +1,25 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title><s:text name="change.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body>
+
+<p>
+ <s:text name="change.message"/>
+</p>
+
+<p>
+ <a href="<s:url action="Login_input"/>">
+ <s:text name="change.try"/>
+ </a>
+</p>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
new file mode 100644
index 0000000..05ab5e0
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
@@ -0,0 +1,40 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Unexpected Error</title>
+</head>
+
+<body>
+<h2>An unexpected error has occured</h2>
+
+<p>
+ Please report this error to your system administrator
+ or appropriate technical support personnel.
+ Thank you for your cooperation.
+</p>
+
+<hr/>
+
+<h3>Error Message</h3>
+
+<s:actionerror />
+
+<p>
+ <s:property value="%{exception.message}"/>
+</p>
+
+<hr/>
+
+<h3>Technical Details</h3>
+
+<p>
+ <s:property value="%{exceptionStack}"/>
+</p>
+
+<jsp:include page="Footer.jsp"/>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
new file mode 100644
index 0000000..56d80bb
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
@@ -0,0 +1,6 @@
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<hr/>
+
+<p>
+ <a href="<s:url action="Welcome" includeParams="none"/>"><s:text name="index.title"/></a>
+</p>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
new file mode 100644
index 0000000..2994793
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
@@ -0,0 +1,30 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title><s:text name="login.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body onLoad="self.focus();document.Login.username.focus()">
+
+<s:actionerror />
+<s:form action="Login" validate="true">
+ <s:textfield key="username" />
+
+ <s:password key="password" showPassword="true"/>
+
+ <s:submit key="button.logon"/>
+
+ <s:reset key="button.reset"/>
+
+ <s:submit action="Login_cancel" key="button.cancel"
+ onclick="form.onsubmit=null"/>
+</s:form>
+
+<jsp:include page="Footer.jsp"/>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
new file mode 100644
index 0000000..bf2f044
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
@@ -0,0 +1,25 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title><s:text name="mainMenu.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body>
+<h3><s:text name="mainMenu.heading"/> <s:property
+ value="user.fullName"/></h3>
+<ul>
+ <li><a href="<s:url action="Registration_input" />">
+ <s:text name="mainMenu.registration"/>
+ </a>
+ </li>
+ <li><a href="<s:url action="Logout"/>">
+ <s:text name="mainMenu.logout"/>
+ </a>
+</ul>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
new file mode 100644
index 0000000..1d3cf8d
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
@@ -0,0 +1,115 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <s:if test="task=='Create'">
+ <title><s:text name="registration.title.create"/></title>
+ </s:if>
+ <s:if test="task=='Edit'">
+ <title><s:text name="registration.title.edit"/></title>
+ </s:if>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body onLoad="self.focus();document.Registration_save_username.focus()">
+
+<s:actionerror/>
+<s:form action="Registration_save" validate="false">
+ <s:token />
+ <s:hidden name="task"/>
+ <s:if test="task == 'Create'">
+ <s:textfield key="username"/>
+ </s:if>
+ <s:else>
+ <s:label key="username"/>
+ <s:hidden name="username"/>
+ </s:else>
+
+ <s:password key="password" showPassword="true"/>
+ <s:password key="password2"/>
+ <s:textfield key="user.fullName"/>
+ <s:textfield key="user.fromAddress"/>
+ <s:textfield key="user.replyToAddress"/>
+
+ <s:if test="task == 'Create'">
+ <s:submit key="button.save" action="Registration_save"/>
+ <s:reset key="button.reset"/>
+ <s:submit action="Welcome" key="button.cancel"
+ onclick="form.onsubmit=null"/>
+ </s:if>
+ <s:else>
+ <s:submit key="button.save" action="Registration"/>
+ <s:reset key="button.reset"/>
+ <s:submit action="MainMenu" key="button.cancel"
+ onclick="form.onsubmit=null"/>
+ </s:else>
+
+</s:form>
+
+<s:if test="task == 'Edit'">
+ <div align="center">
+ <h3><s:text name="heading.subscriptions"/></h3>
+ </div>
+
+ <table border="1" width="100%">
+
+ <tr>
+ <th align="center" width="30%">
+ <s:text name="heading.host"/>
+ </th>
+ <th align="center" width="25%">
+ <s:text name="heading.user"/>
+ </th>
+ <th align="center" width="10%">
+ <s:text name="heading.type"/>
+ </th>
+ <th align="center" width="10%">
+ <s:text name="heading.autoConnect"/>
+ </th>
+ <th align="center" width="15%">
+ <s:text name="heading.action"/>
+ </th>
+ </tr>
+
+ <s:iterator value="user.subscriptions">
+ <tr>
+ <td align="left">
+ <s:property value="host"/>
+ </td>
+ <td align="left">
+ <s:property value="username"/>
+ </td>
+ <td align="center">
+ <s:property value="type"/>
+ </td>
+ <td align="center">
+ <s:property value="autoConnect"/>
+ </td>
+ <td align="center">
+
+ <a href="<s:url action="Subscription_delete"><s:param name="host" value="host"/></s:url>">
+ <s:text name="registration.deleteSubscription"/>
+ </a>
+
+ <a href="<s:url action="Subscription_edit"><s:param name="host" value="host"/></s:url>">
+ <s:text name="registration.editSubscription"/>
+ </a>
+
+ </td>
+ </tr>
+ </s:iterator>
+
+ </table>
+
+ <a href="<s:url action="Subscription_input"/>"><s:text
+ name="registration.addSubscription"/></a>
+
+</s:if>
+
+<jsp:include page="Footer.jsp"/>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
new file mode 100644
index 0000000..60cda4a
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
@@ -0,0 +1,60 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <s:if test="task=='Create'">
+ <title><s:text name="subscription.title.create"/></title>
+ </s:if>
+ <s:if test="task=='Edit'">
+ <title><s:text name="subscription.title.edit"/></title>
+ </s:if>
+ <s:if test="task=='Delete'">
+ <title><s:text name="subscription.title.delete"/></title>
+ </s:if>
+ <link href="<s:url value="/css/mailreader.css" includeParams="none"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body onLoad="self.focus();document.Subscription.username.focus()">
+
+<s:actionerror/>
+<s:form action="Subscription_save" validate="true">
+ <s:token />
+ <s:hidden name="task"/>
+ <s:label key="username" name="user.username"/>
+
+ <s:if test="task == 'Create'">
+ <s:textfield key="host"/>
+ </s:if>
+ <s:else>
+ <s:label key="host"/>
+ <s:hidden name="host"/>
+ </s:else>
+
+ <s:if test="task == 'Delete'">
+ <s:label key="subscription.username"/>
+ <s:label key="subscription.password"/>
+ <s:label key="subscription.type"/>
+ <s:label key="subscription.autoConnect"/>
+ <s:submit key="button.confirm"/>
+ </s:if>
+ <s:else>
+ <s:textfield key="subscription.username"/>
+ <s:textfield key="subscription.password"/>
+ <s:select key="subscription.type" list="types"/>
+ <s:checkbox key="subscription.autoConnect"/>
+ <s:submit key="button.save"/>
+ <s:reset key="button.reset"/>
+ </s:else>
+
+ <s:submit action="Registration_input"
+ key="button.cancel"
+ onclick="form.onsubmit=null"/>
+</s:form>
+
+<jsp:include page="Footer.jsp"/>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp
new file mode 100644
index 0000000..0ce3e54
--- /dev/null
+++ b/apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp
@@ -0,0 +1,55 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title><s:text name="index.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body>
+<h3><s:text name="index.heading"/></h3>
+
+<ul>
+ <li><a href="<s:url action="Registration_input"/>"><s:text
+ name="index.registration"/></a></li>
+ <li><a href="<s:url action="Login_input"/>"><s:text
+ name="index.login"/></a></li>
+</ul>
+
+<h3>Language Options</h3>
+<ul>
+ <li>
+ <s:url id="en" action="Welcome">
+ <s:param name="request_locale">en</s:param>
+ </s:url>
+ <s:a href="%{en}">English</s:a>
+ </li>
+ <li>
+ <s:url id="ja" action="Welcome">
+ <s:param name="request_locale">ja</s:param>
+ </s:url>
+ <s:a href="%{ja}">Japanese</s:a>
+ </li>
+ <li>
+ <s:url id="ru" action="Welcome">
+ <s:param name="request_locale">ru</s:param>
+ </s:url>
+ <s:a href="%{ru}">Russian</s:a>
+ </li>
+</ul>
+
+<hr/>
+
+<p><s:i18n name="alternate"><a href="http://struts.apache.org/">
+ <img src="<s:text name="struts.logo.path"/>"
+ alt="<s:text name="struts.logo.alt"/>" border="0px"/>
+</a>
+</s:i18n></p>
+
+</body>
+</html>
+
http://git-wip-us.apache.org/repos/asf/struts/blob/d07e8044/apps/mailreader/src/main/webapp/Welcome.jsp
----------------------------------------------------------------------
diff --git a/apps/mailreader/src/main/webapp/Welcome.jsp b/apps/mailreader/src/main/webapp/Welcome.jsp
deleted file mode 100644
index 0ce3e54..0000000
--- a/apps/mailreader/src/main/webapp/Welcome.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title><s:text name="index.title"/></title>
- <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body>
-<h3><s:text name="index.heading"/></h3>
-
-<ul>
- <li><a href="<s:url action="Registration_input"/>"><s:text
- name="index.registration"/></a></li>
- <li><a href="<s:url action="Login_input"/>"><s:text
- name="index.login"/></a></li>
-</ul>
-
-<h3>Language Options</h3>
-<ul>
- <li>
- <s:url id="en" action="Welcome">
- <s:param name="request_locale">en</s:param>
- </s:url>
- <s:a href="%{en}">English</s:a>
- </li>
- <li>
- <s:url id="ja" action="Welcome">
- <s:param name="request_locale">ja</s:param>
- </s:url>
- <s:a href="%{ja}">Japanese</s:a>
- </li>
- <li>
- <s:url id="ru" action="Welcome">
- <s:param name="request_locale">ru</s:param>
- </s:url>
- <s:a href="%{ru}">Russian</s:a>
- </li>
-</ul>
-
-<hr/>
-
-<p><s:i18n name="alternate"><a href="http://struts.apache.org/">
- <img src="<s:text name="struts.logo.path"/>"
- alt="<s:text name="struts.logo.alt"/>" border="0px"/>
-</a>
-</s:i18n></p>
-
-</body>
-</html>
-