svn commit: r891411 [2/2] - in /tiles/sandbox/trunk/tiles3: tiles-core/src/main/java/org/apache/tiles/factory/ tiles-core/src/main/java/org/apache/tiles/impl/ tiles-core/src/main/java/org/apache/tiles/renderer/impl/ tiles-core/src/test/java/org/apache/...

[apetrelli]

Modified: 
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java?rev=891411&r1=891410&r2=891411&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
 Wed Dec 16 20:06:48 2009
@@ -21,20 +21,15 @@
 
 package org.apache.tiles.test.db;
 
-import java.util.List;
 import java.util.Locale;
 
 import javax.sql.DataSource;
 
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
 import org.apache.tiles.definition.LocaleDefinitionsFactory;
 import org.apache.tiles.definition.dao.DefinitionDAO;
 import org.apache.tiles.factory.BasicTilesContainerFactory;
-import 
org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
 import org.apache.tiles.locale.LocaleResolver;
 import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
 
 
 /**
@@ -47,7 +42,6 @@
     /** {...@inheritdoc} */
     @Override
     protected DefinitionDAO<Locale> 
createLocaleDefinitionDao(ApplicationContext applicationContext,
-            TilesRequestContextFactory contextFactory,
             LocaleResolver resolver) {
         LocaleDbDefinitionDAO definitionDao = new LocaleDbDefinitionDAO();
         definitionDao.setDataSource((DataSource) applicationContext
@@ -58,22 +52,7 @@
     /** {...@inheritdoc} */
     @Override
     protected LocaleDefinitionsFactory instantiateDefinitionsFactory(
-            ApplicationContext applicationContext, TilesRequestContextFactory 
contextFactory,
-            LocaleResolver resolver) {
+            ApplicationContext applicationContext, LocaleResolver resolver) {
         return new LocaleDefinitionsFactory();
     }
-
-    /** {...@inheritdoc} */
-    @Override
-    protected List<TilesRequestContextFactory> 
getTilesRequestContextFactoriesToBeChained(
-            ChainedTilesRequestContextFactory parent) {
-        List<TilesRequestContextFactory> factories = 
super.getTilesRequestContextFactoriesToBeChained(parent);
-        registerRequestContextFactory(
-                FreeMarkerTilesRequestContextFactory.class.getName(),
-                factories, parent);
-        registerRequestContextFactory(
-                VelocityTilesRequestContextFactory.class.getName(),
-                factories, parent);
-        return factories;
-    }
 }