Author: apetrelli Date: Wed May 23 07:42:55 2007 New Revision: 540963 URL: http://svn.apache.org/viewvc?view=rev&rev=540963 Log: WW-1941 Updated Struts 2 - Tiles 2 plugin to use Tiles 2.0.3 in trunk.
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=540963&r1=540962&r2=540963 ============================================================================== --- struts/struts2/trunk/plugins/tiles/pom.xml (original) +++ struts/struts2/trunk/plugins/tiles/pom.xml Wed May 23 07:42:55 2007 @@ -22,7 +22,7 @@ <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-core</artifactId> - <version>2.0.1</version> + <version>2.0.3</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=540963&r1=540962&r2=540963 ============================================================================== --- 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 Wed May 23 07:42:55 2007 @@ -29,52 +29,36 @@ import org.apache.tiles.impl.BasicTilesContainer; import org.apache.tiles.preparer.PreparerFactory; -import javax.servlet.jsp.PageContext; import java.util.Map; public class StrutsTilesContainerFactory extends TilesContainerFactory { - /** - * Initialize the container in a struts specific manner. - * - * @param context - * @param container - * @throws TilesException - */ - public void initializeContainer(Object context, - BasicTilesContainer container) - throws TilesException { - - Map<String, String> initParmMap = - TilesContainerFactory.getInitParameterMap(context); - - TilesContextFactory contextFactory = (TilesContextFactory) - TilesContainerFactory.createFactory( - initParmMap, TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM); + + @Override + protected void storeContainerDependencies(Object context, Map<String, String> initParameters, Map<String, String> configuration, BasicTilesContainer container) throws TilesException { + TilesContextFactory contextFactory = + (TilesContextFactory) createFactory(configuration, + CONTEXT_FACTORY_INIT_PARAM); contextFactory = new StrutsTilesContextFactory(contextFactory); - DefinitionsFactory defsFactory = (DefinitionsFactory) - TilesContainerFactory.createFactory( - initParmMap, - TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM); + DefinitionsFactory defsFactory = + (DefinitionsFactory) createFactory(configuration, + DEFINITIONS_FACTORY_INIT_PARAM); PreparerFactory prepFactory = - (PreparerFactory) TilesContainerFactory.createFactory( - initParmMap, - TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM); + (PreparerFactory) createFactory(configuration, + PREPARER_FACTORY_INIT_PARAM); + contextFactory.init(configuration); TilesApplicationContext tilesContext = - contextFactory.createApplicationContext(context); + contextFactory.createApplicationContext(context); container.setDefinitionsFactory(defsFactory); container.setContextFactory(contextFactory); container.setPreparerFactory(prepFactory); container.setApplicationContext(tilesContext); - - container.init(getInitParameterMap(context)); - } /** @@ -98,13 +82,10 @@ return factory.createApplicationContext(context); } - public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext, PageContext pageContext) { - TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, pageContext); - return new StrutsTilesRequestContext(context); - } - - public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext, Object request, Object response) { - TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, request, response); + public TilesRequestContext createRequestContext( + TilesApplicationContext tilesApplicationContext, + Object... requestItems) { + TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, requestItems); 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=540963&r1=540962&r2=540963 ============================================================================== --- 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 Wed May 23 07:42:55 2007 @@ -101,6 +101,6 @@ HttpServletRequest request = ServletActionContext.getRequest(); HttpServletResponse response = ServletActionContext.getResponse(); - container.render(request, response, location); + container.render(location, request, response); } }