struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r516986 - in /struts/struts2/trunk/plugins/tiles: pom.xml src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Date Sun, 11 Mar 2007 18:49:40 GMT
Author: mrdon
Date: Sun Mar 11 11:49:39 2007
New Revision: 516986

URL: http://svn.apache.org/viewvc?view=rev&rev=516986
Log:
Changing tiles plugin to use the latest released version
WW-1715

Modified:
    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/views/tiles/TilesResult.java

Modified: struts/struts2/trunk/plugins/tiles/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?view=diff&rev=516986&r1=516985&r2=516986
==============================================================================
--- struts/struts2/trunk/plugins/tiles/pom.xml (original)
+++ struts/struts2/trunk/plugins/tiles/pom.xml Sun Mar 11 11:49:39 2007
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0.1</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=516986&r1=516985&r2=516986
==============================================================================
--- 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
Sun Mar 11 11:49:39 2007
@@ -98,13 +98,13 @@
             return factory.createApplicationContext(context);
         }
 
-        public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext,
Object... requestItems) {
-            TilesRequestContext context = factory.createRequestContext(tilesApplicationContext,
requestItems);
+        public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext,
PageContext pageContext) {
+            TilesRequestContext context = factory.createRequestContext(tilesApplicationContext,
pageContext);
             return new StrutsTilesRequestContext(context);
         }
 
-        public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext,
PageContext pageContext) {
-            TilesRequestContext context = factory.createRequestContext(tilesApplicationContext,
pageContext);
+        public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext,
Object request, Object response) {
+            TilesRequestContext context = factory.createRequestContext(tilesApplicationContext,
request, response);
             return new StrutsTilesRequestContext(context);
         }
     }

Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java?view=diff&rev=516986&r1=516985&r2=516986
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
(original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Sun Mar 11 11:49:39 2007
@@ -101,6 +101,6 @@
         HttpServletRequest request = ServletActionContext.getRequest();
         HttpServletResponse response = ServletActionContext.getResponse();
 
-        container.render(location, request, response);
+        container.render(request, response, location);
     }
 }



Mime
View raw message