You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/07/29 17:30:03 UTC
svn commit: r798946 - in /tiles/framework/branches/TILES_2_1_X: ./
tiles-core/src/main/java/org/apache/tiles/factory/
tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
Author: apetrelli
Date: Wed Jul 29 15:30:02 2009
New Revision: 798946
URL: http://svn.apache.org/viewvc?rev=798946&view=rev
Log:
TILES-451
Merge from trunk to TILES_2_1_X
Signature of KeyedDefinitionsFactoryTilesContainerFactory.storeContainerDependencies changed.
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java (props changed)
Propchange: tiles/framework/branches/TILES_2_1_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 15:30:02 2009
@@ -1 +1 @@
-/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653
+/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944
Modified: tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java?rev=798946&r1=798945&r2=798946&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java Wed Jul 29 15:30:02 2009
@@ -127,7 +127,7 @@
/** {@inheritDoc} */
@Override
- protected void storeContainerDependencies(Object context,
+ protected void storeContainerDependencies(TilesApplicationContext context,
Map<String, String> initParameters,
Map<String, String> configuration, BasicTilesContainer container) {
super.storeContainerDependencies(context, initParameters, configuration, container);
Modified: tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?rev=798946&r1=798945&r2=798946&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java Wed Jul 29 15:30:02 2009
@@ -384,6 +384,9 @@
* @param container The container to use.
* @throws TilesContainerFactoryException If something goes wrong during
* initialization.
+ * @deprecated Use
+ * {@link #storeContainerDependencies(TilesApplicationContext, Map, Map, BasicTilesContainer)}
+ * .
*/
protected void storeContainerDependencies(Object context,
Map<String, String> initParameters,
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 29 15:30:02 2009
@@ -0,0 +1 @@
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 29 15:30:02 2009
@@ -0,0 +1 @@
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java:749981,761052,761061,772781,785782,788065-789653,798944