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/04/14 22:39:42 UTC
[1/3] git commit: Moves JSPs under /WEB-INF to promote good practises
Repository: struts
Updated Branches:
refs/heads/develop 90eb79ad8 -> 54c9efc51
Moves JSPs under /WEB-INF to promote good practises
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/13a3b92a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/13a3b92a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/13a3b92a
Branch: refs/heads/develop
Commit: 13a3b92ae7acede82421f30a00e0737357b7b7dd
Parents: 90eb79a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 14 22:36:27 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 14 22:36:27 2014 +0200
----------------------------------------------------------------------
.../src/main/resources/example.xml | 6 ++---
.../main/webapp/WEB-INF/example/HelloWorld.jsp | 28 ++++++++++++++++++++
.../src/main/webapp/WEB-INF/example/Login.jsp | 15 +++++++++++
.../src/main/webapp/WEB-INF/example/Menu.jsp | 3 +++
.../src/main/webapp/WEB-INF/example/Missing.jsp | 11 ++++++++
.../main/webapp/WEB-INF/example/Register.jsp | 3 +++
.../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 +++++++++++++
.../src/main/webapp/example/HelloWorld.jsp | 28 --------------------
.../src/main/webapp/example/Login.jsp | 15 -----------
.../src/main/webapp/example/Menu.jsp | 3 ---
.../src/main/webapp/example/Missing.jsp | 11 --------
.../src/main/webapp/example/Register.jsp | 3 ---
.../src/main/webapp/example/Welcome.jsp | 18 -------------
.../src/main/resources/struts.xml | 4 +--
.../src/main/webapp/WEB-INF/jsp/helloWorld.jsp | 16 +++++++++++
.../src/main/webapp/WEB-INF/jsp/index.jsp | 20 ++++++++++++++
.../src/main/webapp/jsp/helloWorld.jsp | 16 -----------
.../src/main/webapp/jsp/index.jsp | 20 --------------
18 files changed, 119 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
index 442f5ee..7de329f 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
@@ -12,16 +12,16 @@
<default-action-ref name="HelloWorld" />
<action name="HelloWorld" class="${package}.example.HelloWorld">
- <result>/example/HelloWorld.jsp</result>
+ <result>/WEB-INF/example/HelloWorld.jsp</result>
</action>
<action name="Login_*" method="{1}" class="${package}.example.Login">
- <result name="input">/example/Login.jsp</result>
+ <result name="input">/WEB-INF/example/Login.jsp</result>
<result type="redirectAction">Menu</result>
</action>
<action name="*" class="${package}.example.ExampleSupport">
- <result>/example/{1}.jsp</result>
+ <result>/WEB-INF/example/{1}.jsp</result>
</action>
<!-- Add additional "example" package actions here. -->
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
new file mode 100644
index 0000000..938c761
--- /dev/null
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp
new file mode 100644
index 0000000..6438080
--- /dev/null
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Menu.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Menu.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Menu.jsp
new file mode 100644
index 0000000..a74bd2c
--- /dev/null
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Missing.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Missing.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Missing.jsp
new file mode 100644
index 0000000..7c01ac9
--- /dev/null
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Register.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Register.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Register.jsp
new file mode 100644
index 0000000..a74bd2c
--- /dev/null
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Welcome.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Welcome.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Welcome.jsp
new file mode 100644
index 0000000..64ffe9b
--- /dev/null
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp
deleted file mode 100644
index 938c761..0000000
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Login.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Login.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Login.jsp
deleted file mode 100644
index 6438080..0000000
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Menu.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Menu.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Menu.jsp
deleted file mode 100644
index a74bd2c..0000000
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Missing.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Missing.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Missing.jsp
deleted file mode 100644
index 7c01ac9..0000000
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Register.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Register.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Register.jsp
deleted file mode 100644
index a74bd2c..0000000
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/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/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Welcome.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Welcome.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/Welcome.jsp
deleted file mode 100644
index 64ffe9b..0000000
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/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>
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 8bcbdb1..2536c06 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -12,12 +12,12 @@
<default-action-ref name="index" />
<action name="index" class="${package}.IndexAction">
- <result>/jsp/index.jsp</result>
+ <result>/WEB-INF/jsp/index.jsp</result>
</action>
<action name="helloWorld" class="helloWorldAction">
<result name="input">/jsp/index.jsp</result>
- <result>/jsp/helloWorld.jsp</result>
+ <result>/WEB-INF/jsp/helloWorld.jsp</result>
</action>
</package>
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
new file mode 100644
index 0000000..41176a2
--- /dev/null
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.1 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Hello World</title>
+ <s:head />
+</head>
+<body>
+ Hello <s:property value="name"/>, today is <s:property value="dateNow" /><br/>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
new file mode 100644
index 0000000..71d4e1f
--- /dev/null
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.1 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Index</title>
+ <s:head />
+</head>
+<body>
+ <s:form action="helloWorld">
+ <s:textfield label="What is your name?" name="name" />
+ <s:textfield label="What is the date?" name="dateNow" />
+ <s:submit />
+ </s:form>
+</body>
+</html>
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/helloWorld.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/helloWorld.jsp b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/helloWorld.jsp
deleted file mode 100644
index 6d4a091..0000000
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/helloWorld.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.1 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Hello World</title>
- <s:head />
-</head>
-<body>
- Hello <s:property value="name"/>, today is <s:property value="dateNow" /><br/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/index.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/index.jsp b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/index.jsp
deleted file mode 100644
index 683fdcc..0000000
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/jsp/index.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.1 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Index</title>
- <s:head />
-</head>
-<body>
- <s:form action="helloWorld">
- <s:textfield label="What is your name?" name="name" />
- <s:textfield label="What is the date?" name="dateNow" />
- <s:submit />
- </s:form>
-</body>
-</html>
-
\ No newline at end of file
[2/3] git commit: Moves JSPs under /WEB-INF to promote good practises
Posted by lu...@apache.org.
Moves JSPs under /WEB-INF to promote good practises
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0b510cab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0b510cab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0b510cab
Branch: refs/heads/develop
Commit: 0b510cab890de57c4c164d85e8bb8bfc13d27ec1
Parents: 13a3b92
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 14 22:38:44 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 14 22:38:44 2014 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/helloWorld.jsp | 32 ++++++++---------
.../src/main/webapp/WEB-INF/jsp/index.jsp | 38 ++++++++++----------
2 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/0b510cab/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
index 41176a2..6d4a091 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
@@ -1,16 +1,16 @@
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.1 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Hello World</title>
- <s:head />
-</head>
-<body>
- Hello <s:property value="name"/>, today is <s:property value="dateNow" /><br/>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.1 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Hello World</title>
+ <s:head />
+</head>
+<body>
+ Hello <s:property value="name"/>, today is <s:property value="dateNow" /><br/>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/0b510cab/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
index 71d4e1f..683fdcc 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -1,20 +1,20 @@
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.1 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Index</title>
- <s:head />
-</head>
-<body>
- <s:form action="helloWorld">
- <s:textfield label="What is your name?" name="name" />
- <s:textfield label="What is the date?" name="dateNow" />
- <s:submit />
- </s:form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.1 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Index</title>
+ <s:head />
+</head>
+<body>
+ <s:form action="helloWorld">
+ <s:textfield label="What is your name?" name="name" />
+ <s:textfield label="What is the date?" name="dateNow" />
+ <s:submit />
+ </s:form>
+</body>
+</html>
\ No newline at end of file
[3/3] git commit: Merge branch 'feature/move-jsps-under-webinf' into
develop
Posted by lu...@apache.org.
Merge branch 'feature/move-jsps-under-webinf' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54c9efc5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54c9efc5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54c9efc5
Branch: refs/heads/develop
Commit: 54c9efc51b30bbd2f529ffa4c74cd96965b8a6d0
Parents: 90eb79a 0b510ca
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 14 22:39:29 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 14 22:39:29 2014 +0200
----------------------------------------------------------------------
.../src/main/resources/example.xml | 6 ++---
.../main/webapp/WEB-INF/example/HelloWorld.jsp | 28 ++++++++++++++++++++
.../src/main/webapp/WEB-INF/example/Login.jsp | 15 +++++++++++
.../src/main/webapp/WEB-INF/example/Menu.jsp | 3 +++
.../src/main/webapp/WEB-INF/example/Missing.jsp | 11 ++++++++
.../main/webapp/WEB-INF/example/Register.jsp | 3 +++
.../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 +++++++++++++
.../src/main/webapp/example/HelloWorld.jsp | 28 --------------------
.../src/main/webapp/example/Login.jsp | 15 -----------
.../src/main/webapp/example/Menu.jsp | 3 ---
.../src/main/webapp/example/Missing.jsp | 11 --------
.../src/main/webapp/example/Register.jsp | 3 ---
.../src/main/webapp/example/Welcome.jsp | 18 -------------
.../src/main/resources/struts.xml | 4 +--
.../src/main/webapp/WEB-INF/jsp/helloWorld.jsp | 16 +++++++++++
.../src/main/webapp/WEB-INF/jsp/index.jsp | 20 ++++++++++++++
.../src/main/webapp/jsp/helloWorld.jsp | 16 -----------
.../src/main/webapp/jsp/index.jsp | 20 --------------
18 files changed, 119 insertions(+), 119 deletions(-)
----------------------------------------------------------------------