You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2007/06/07 15:07:01 UTC
svn commit: r545160 - in /struts/struts2/trunk: apps/showcase/
plugins/tiles/ plugins/tiles/src/main/java/org/apache/struts2/tiles/
Author: apetrelli
Date: Thu Jun 7 06:07:00 2007
New Revision: 545160
URL: http://svn.apache.org/viewvc?view=rev&rev=545160
Log:
WW-1973
Updated Struts2-Tiles plugin to depend on Tiles 2.0.4.
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/plugins/tiles/pom.xml
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=545160&r1=545159&r2=545160
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Thu Jun 7 06:07:00 2007
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
<scope>runtime</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/tiles/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?view=diff&rev=545160&r1=545159&r2=545160
==============================================================================
--- struts/struts2/trunk/plugins/tiles/pom.xml (original)
+++ struts/struts2/trunk/plugins/tiles/pom.xml Thu Jun 7 06:07:00 2007
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java?view=diff&rev=545160&r1=545159&r2=545160
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java Thu Jun 7 06:07:00 2007
@@ -74,7 +74,7 @@
this.factory = factory;
}
- public void init(Map map) {
+ public void init(Map<String, String> map) {
factory.init(map);
}
Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java?view=diff&rev=545160&r1=545159&r2=545160
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java Thu Jun 7 06:07:00 2007
@@ -20,10 +20,10 @@
*/
package org.apache.struts2.tiles;
-import org.apache.tiles.listener.TilesListener;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.factory.TilesContainerFactory;
+import org.apache.tiles.web.startup.TilesListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java?view=diff&rev=545160&r1=545159&r2=545160
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java Thu Jun 7 06:07:00 2007
@@ -30,7 +30,6 @@
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextWrapper;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;