Author: apetrelli
Date: Wed May 23 07:44:28 2007
New Revision: 540964
URL: http://svn.apache.org/viewvc?view=rev&rev=540964
Log:
WW-1941
Updated Struts 2 showcase to the changes of Struts 2 - Tiles 2 plugin.
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=540964&r1=540963&r2=540964
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Wed May 23 07:44:28 2007
@@ -69,6 +69,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-jsp</artifactId>
+ <version>2.0.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-codebehind-plugin</artifactId>
<version>${pom.version}</version>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml?view=diff&rev=540964&r1=540963&r2=540964
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml Wed
May 23 07:44:28 2007
@@ -28,15 +28,15 @@
<tiles-definitions>
<definition name="showcase.index" template="/tiles/layout.jsp">
- <put name="title" value="Tiles Showcase"/>
- <put name="header" value="/tiles/header.jsp"/>
- <put name="body" value="/tiles/body.jsp"/>
+ <put-attribute name="title" value="Tiles Showcase"/>
+ <put-attribute name="header" value="/tiles/header.jsp"/>
+ <put-attribute name="body" value="/tiles/body.jsp"/>
</definition>
<definition name="showcase.freemarker" template="/tiles/layout.jsp">
- <put name="title" value="Tiles/Freemarker Showcase"/>
- <put name="header" value="/tiles/header.jsp"/>
- <put name="body" value="/tiles/body.ftl"/>
+ <put-attribute name="title" value="Tiles/Freemarker Showcase"/>
+ <put-attribute name="header" value="/tiles/header.jsp"/>
+ <put-attribute name="body" value="/tiles/body.ftl"/>
</definition>
</tiles-definitions>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=540964&r1=540963&r2=540964
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Wed May
23 07:44:28 2007
@@ -5,11 +5,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
<display-name>Struts Showcase Application</display-name>
-
- <context-param>
- <param-name>org.apache.tiles.CONTAINER_FACTORY</param-name>
-
<param-value>org.apache.struts2.tiles.StrutsTilesContainerFactory</param-value>
- </context-param>
<filter>
<filter-name>struts-cleanup</filter-name>
@@ -57,7 +52,7 @@
<listener>
<listener-class>
- org.apache.tiles.listener.TilesListener
+ org.apache.struts2.tiles.StrutsTilesListener
</listener-class>
</listener>
