Author: lukaszlenart
Date: Thu Aug 1 06:04:23 2013
New Revision: 1509085
URL: http://svn.apache.org/r1509085
Log:
WW-3872 Moves files to appropriate locations
Added:
struts/struts2/trunk/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
- copied unchanged from r1508387,
struts/struts2/trunk/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
struts/struts2/trunk/apps/portlet/src/main/resources/struts-tiles.xml
- copied unchanged from r1508387,
struts/struts2/trunk/src/main/resources/struts-tiles.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/tiles.xml
- copied unchanged from r1508387,
struts/struts2/trunk/src/main/webapp/WEB-INF/tiles.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/tiles/
- copied from r1508387,
struts/struts2/trunk/src/main/webapp/WEB-INF/tiles/
Removed:
struts/struts2/trunk/src/main/resources/
struts/struts2/trunk/src/main/webapp/
Modified:
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=1509085&r1=1509084&r2=1509085&view=diff
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Thu Aug 1 06:04:23 2013
@@ -109,6 +109,10 @@
org.apache.struts
struts2-dwr-plugin
+
+org.apache.struts
+struts2-portlet-tiles-plugin
+
org.apache.velocity
Modified: struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml?rev=1509085&r1=1509084&r2=1509085&view=diff
==
--- struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml Thu Aug 1
06:04:23 2013
@@ -8,4 +8,5 @@
+
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp?rev=1509085&r1=1509084&r2=1509085&view=diff
==
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
(original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
Thu Aug 1 06:04:23 2013
@@ -12,6 +12,7 @@ Here you'll find examples of what is pos
">File upload
">FreeMarker
">Velocity
+">Form Example
Validation with Tiles
">Go to edit mode and
see what's there
">Go to help mode and
see what's there
Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml?rev=1509085&r1=1509084&r2=1509085&view=diff
==
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Thu Aug
1 06:04:23 2013
@@ -1,6 +1,16 @@
http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+
+org.apache.tiles.factory.TilesContainerFactory
+
org.apache.struts2.tiles.StrutsTilesContainerFactory
+
+
+
org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG
+/WEB-INF/tiles.xml
+
+
contextConfigLocation
@@ -12,4 +22,10 @@
org.springframework.web.context.ContextLoaderListener
+
+
+ org.apache.struts2.tiles.StrutsTilesListener
+
+
+
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1509085&r1=1509084&r2=1509085&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Aug 1 06:04:23 2013
@@ -348,6 +348,11 @@
org.apache.struts
+struts2-portlet-tiles-plugin
+${project.version}
+
+
+org.apache.struts
struts2-junit-plugin
${project.version}