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 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-dwr-plugin</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-portlet-tiles-plugin</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
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 @@
<include file="struts-edit.xml"/>
<include file="struts-help.xml"/>
<include file="struts-eventing.xml"/>
+ <include file="struts-tiles.xml"/>
</struts>
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
<li><a href="<s:url action="fileUpload" method="input"/>">File upload</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>
<li><a href="<s:url action="index" portletMode="edit"/>">Go to edit mode and
see what's there</a></li>
<li><a href="<s:url action="index" portletMode="help"/>">Go to help mode and
see what's there</a></li>
</ul>
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 @@
<?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">
+
+ <context-param>
+ <param-name>org.apache.tiles.factory.TilesContainerFactory</param-name>
+
<param-value>org.apache.struts2.tiles.StrutsTilesContainerFactory</param-value>
+ </context-param>
+ <context-param>
+
<param-name>org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG</param-name>
+ <param-value>/WEB-INF/tiles.xml</param-value>
+ </context-param>
+
<!-- Uncomment/comment this if you need/don't need Spring support -->
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -12,4 +22,10 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+ <!-- Tiles Plugin -->
+ <listener>
+ <listener-class>org.apache.struts2.tiles.StrutsTilesListener
+ </listener-class>
+ </listener>
+
</web-app>
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 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
+ <artifactId>struts2-portlet-tiles-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
<version>${project.version}</version>
</dependency>
