svn commit: r797729 - in /tiles/framework/trunk/tiles-core/src: main/java/org/apache/tiles/definition/ main/java/org/apache/tiles/factory/ test/java/org/apache/tiles/definition/ test/java/org/apache/tiles/factory/

[ap...@apache.org]

Author: apetrelli
Date: Sat Jul 25 09:32:38 2009
New Revision: 797729

URL: http://svn.apache.org/viewvc?rev=797729&view=rev
Log:
TILES-444
Deprecated UrlDefinitionsFactory.
Removed tests for it.
Changed references into LocaleDefinitionsFactory in non-deprecated classes.

Removed:
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
Modified:
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?rev=797729&r1=797728&r2=797729&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java Sat Jul 25 09:32:38 2009
@@ -40,14 +40,17 @@
 /**
  * {@link DefinitionsFactory DefinitionsFactory} implementation that manages
  * Definitions configuration data from URLs, resolving inheritance when the URL
- * is loaded. <p/>
+ * is loaded.
+ * <p/>
  * <p>
  * The Definition objects are read from the
- * {@link org.apache.tiles.definition.digester.DigesterDefinitionsReader DigesterDefinitionsReader}
- * class unless another implementation is specified.
+ * {@link org.apache.tiles.definition.digester.DigesterDefinitionsReader
+ * DigesterDefinitionsReader} class unless another implementation is specified.
  * </p>
  *
  * @version $Rev$ $Date$
+ * @deprecated Use {@link LocaleDefinitionsFactory} and using
+ * {@link ResolvingLocaleUrlDefinitionDAO} as Tiles DAO.
  */
 public class UrlDefinitionsFactory extends LocaleDefinitionsFactory implements
         Refreshable {

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=797729&r1=797728&r2=797729&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Sat Jul 25 09:32:38 2009
@@ -35,7 +35,6 @@
 import org.apache.tiles.definition.DefinitionsReader;
 import org.apache.tiles.definition.LocaleDefinitionsFactory;
 import org.apache.tiles.definition.Refreshable;
-import org.apache.tiles.definition.UrlDefinitionsFactory;
 import org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO;
 import org.apache.tiles.definition.dao.DefinitionDAO;
 import org.apache.tiles.definition.dao.ResolvingLocaleUrlDefinitionDAO;
@@ -196,7 +195,7 @@
 
     /**
      * Creates the definitions factory. By default it creates a
-     * {@link UrlDefinitionsFactory} with default dependencies.
+     * {@link LocaleDefinitionsFactory} with default dependencies.
      * @param applicationContext The Tiles application context.
      * @param contextFactory The Tiles context factory.
      * @param resolver The locale resolver.
@@ -231,7 +230,7 @@
     protected LocaleDefinitionsFactory instantiateDefinitionsFactory(TilesApplicationContext applicationContext,
             TilesRequestContextFactory contextFactory,
             LocaleResolver resolver) {
-        return new UrlDefinitionsFactory();
+        return new LocaleDefinitionsFactory();
     }
 
 

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=797729&r1=797728&r2=797729&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java Sat Jul 25 09:32:38 2009
@@ -32,7 +32,7 @@
 import org.apache.tiles.context.TilesRequestContextFactory;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.definition.DefinitionsReader;
-import org.apache.tiles.definition.UrlDefinitionsFactory;
+import org.apache.tiles.definition.LocaleDefinitionsFactory;
 import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
 import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
 import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
@@ -114,7 +114,7 @@
         DefinitionsFactory defsFactory = factory.createDefinitionsFactory(
                 applicationContext, requestContextFactory, resolver);
         assertTrue("The class of the definitions factory is not correct",
-                defsFactory instanceof UrlDefinitionsFactory);
+                defsFactory instanceof LocaleDefinitionsFactory);
     }
 
     /**