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/01/21 07:45:11 UTC
git commit: Moves JSP files into WEB-INF/jsp to promote best practises
Updated Branches:
refs/heads/master 9cf7bb4fc -> 763264238
Moves JSP files into WEB-INF/jsp to promote best practises
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/76326423
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/76326423
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/76326423
Branch: refs/heads/master
Commit: 763264238aa6a9a0bb142d3369588c3fb4b73c98
Parents: 9cf7bb4
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Jan 21 07:44:28 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Jan 21 07:44:28 2014 +0100
----------------------------------------------------------------------
apps/blank/src/main/resources/example.xml | 6 ++---
apps/blank/src/main/resources/struts.xml | 2 +-
.../blank/src/main/webapp/WEB-INF/jsp/error.jsp | 15 +++++++++++
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 ++++++++++++++++++++
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 +++++++++++
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 +++
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 ++++++++
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 +++
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 +++++++++++++
apps/blank/src/main/webapp/WEB-INF/web.xml | 16 ++++++++++-
apps/blank/src/main/webapp/error.jsp | 15 -----------
.../src/main/webapp/example/HelloWorld.jsp | 28 --------------------
apps/blank/src/main/webapp/example/Login.jsp | 15 -----------
apps/blank/src/main/webapp/example/Menu.jsp | 3 ---
apps/blank/src/main/webapp/example/Missing.jsp | 11 --------
apps/blank/src/main/webapp/example/Register.jsp | 3 ---
apps/blank/src/main/webapp/example/Welcome.jsp | 18 -------------
17 files changed, 112 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/resources/example.xml
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/resources/example.xml b/apps/blank/src/main/resources/example.xml
index f28316c..169f5c8 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 -->
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/resources/struts.xml b/apps/blank/src/main/resources/struts.xml
index 1fd8cb7..ca643d8 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp
new file mode 100644
index 0000000..38edf42
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+<head><title>Simple jsp page</title></head>
+<body>
+ <h3>Exception:</h3>
+ <s:property value="exception"/>
+
+ <h3>Stack trace:</h3>
+ <pre>
+ <s:property value="exceptionStack"/>
+ </pre>
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
new file mode 100644
index 0000000..938c761
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
@@ -0,0 +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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
new file mode 100644
index 0000000..6438080
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
@@ -0,0 +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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
new file mode 100644
index 0000000..a74bd2c
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
@@ -0,0 +1,3 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
new file mode 100644
index 0000000..7c01ac9
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
@@ -0,0 +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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
new file mode 100644
index 0000000..a74bd2c
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
@@ -0,0 +1,3 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
new file mode 100644
index 0000000..64ffe9b
--- /dev/null
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
@@ -0,0 +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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/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 255c1f9..e8c0f46 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/error.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/error.jsp b/apps/blank/src/main/webapp/error.jsp
deleted file mode 100644
index 38edf42..0000000
--- a/apps/blank/src/main/webapp/error.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<html>
-<head><title>Simple jsp page</title></head>
-<body>
- <h3>Exception:</h3>
- <s:property value="exception"/>
-
- <h3>Stack trace:</h3>
- <pre>
- <s:property value="exceptionStack"/>
- </pre>
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/example/HelloWorld.jsp b/apps/blank/src/main/webapp/example/HelloWorld.jsp
deleted file mode 100644
index 938c761..0000000
--- a/apps/blank/src/main/webapp/example/HelloWorld.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/example/Login.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/example/Login.jsp b/apps/blank/src/main/webapp/example/Login.jsp
deleted file mode 100644
index 6438080..0000000
--- a/apps/blank/src/main/webapp/example/Login.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/example/Menu.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/example/Menu.jsp b/apps/blank/src/main/webapp/example/Menu.jsp
deleted file mode 100644
index a74bd2c..0000000
--- a/apps/blank/src/main/webapp/example/Menu.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/example/Missing.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/example/Missing.jsp b/apps/blank/src/main/webapp/example/Missing.jsp
deleted file mode 100644
index 7c01ac9..0000000
--- a/apps/blank/src/main/webapp/example/Missing.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/example/Register.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/example/Register.jsp b/apps/blank/src/main/webapp/example/Register.jsp
deleted file mode 100644
index a74bd2c..0000000
--- a/apps/blank/src/main/webapp/example/Register.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/76326423/apps/blank/src/main/webapp/example/Welcome.jsp
----------------------------------------------------------------------
diff --git a/apps/blank/src/main/webapp/example/Welcome.jsp b/apps/blank/src/main/webapp/example/Welcome.jsp
deleted file mode 100644
index 64ffe9b..0000000
--- a/apps/blank/src/main/webapp/example/Welcome.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ 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>