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 2016/04/04 11:25:41 UTC
[1/2] struts git commit: Uses proper doctype version
Repository: struts
Updated Branches:
refs/heads/master 5e31097d8 -> 4b7426605
Uses proper doctype version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/098ee502
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/098ee502
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/098ee502
Branch: refs/heads/master
Commit: 098ee502b406235755b939c7ef44a8b6cbf9416e
Parents: 5e31097
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 4 11:21:54 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 4 11:25:20 2016 +0200
----------------------------------------------------------------------
apps/portlet/src/main/webapp/WEB-INF/web.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/098ee502/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..c95c0af 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/web.xml
+++ b/apps/portlet/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="StrutsPortlet">
+<web-app
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5"
+ id="StrutsPortlet">
<context-param>
<param-name>org.apache.tiles.factory.TilesContainerFactory</param-name>
[2/2] struts git commit: Adds missing closing tags
Posted by lu...@apache.org.
Adds missing closing tags
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4b742660
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4b742660
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4b742660
Branch: refs/heads/master
Commit: 4b74266053fb15a00ebac947f7d9cd3e29885674
Parents: 098ee50
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 4 11:21:37 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 4 11:25:33 2016 +0200
----------------------------------------------------------------------
apps/portlet/src/main/webapp/WEB-INF/view/index.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4b742660/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
index 217b158..6f6b97c 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
+++ b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
@@ -5,11 +5,11 @@ Here you'll find examples of what is possible with the Struts Portlet integratio
<ul>
<li><a href="<s:url action="formExample"/>">A simple form</a></li>
<li><a href="<s:url action="formExamplePrg" method="input"/>">Form example with proper PRG</a></li>
-<li><a href="<s:url action="formExampleModelDriven" method="input"/>">Model driven example</li>
+<li><a href="<s:url action="formExampleModelDriven" method="input"/>">Model driven example</a>/li>
<li><a href="<s:url action="validationExample"/>">Validation</a></li>
<li><a href="<s:url action="tokenExample"/>">Token</a></li>
<li><a href="<s:url action="springExample"/>">Spring integration</a></li>
-<li><a href="<s:url action="fileUpload" method="input"/>">File upload</li>
+<li><a href="<s:url action="fileUpload" method="input"/>">File upload</a></li>
<li><a href="<s:url action="freeMarkerExample"/>">FreeMarker</a></li>
<li><a href="<s:url action="velocityHelloWorld"/>">Velocity</a></li>
<li><a href="<s:url action="index" namespace="/tiles"/>">Form Example Validation with Tiles</a></li>