You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by dd...@apache.org on 2006/12/19 19:07:23 UTC
svn commit: r488747 - in /struts/struts2/trunk/plugins/tiles: pom.xml
src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
Author: ddewolf
Date: Tue Dec 19 10:07:22 2006
New Revision: 488747
URL: http://svn.apache.org/viewvc?view=rev&rev=488747
Log:
Updating tiles plugin to use most recent tiles snapshot
Modified:
struts/struts2/trunk/plugins/tiles/pom.xml
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.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=488747&r1=488746&r2=488747
==============================================================================
--- struts/struts2/trunk/plugins/tiles/pom.xml (original)
+++ struts/struts2/trunk/plugins/tiles/pom.xml Tue Dec 19 10:07:22 2006
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>2.0-r480013-SNAPSHOT</version>
+ <version>2.0-r488734-SNAPSHOT</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=488747&r1=488746&r2=488747
==============================================================================
--- 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 Tue Dec 19 10:07:22 2006
@@ -46,19 +46,24 @@
BasicTilesContainer container)
throws TilesException {
+ Map<String, String> initParmMap =
+ TilesContainerFactory.getInitParameterMap(context);
+
TilesContextFactory contextFactory = (TilesContextFactory)
TilesContainerFactory.createFactory(
- context, TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM);
+ initParmMap, TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM);
contextFactory = new StrutsTilesContextFactory(contextFactory);
DefinitionsFactory defsFactory = (DefinitionsFactory)
TilesContainerFactory.createFactory(
- context, TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM);
+ initParmMap,
+ TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM);
PreparerFactory prepFactory =
(PreparerFactory) TilesContainerFactory.createFactory(
- context, TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM);
+ initParmMap,
+ TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM);
TilesApplicationContext tilesContext =
contextFactory.createApplicationContext(context);