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 2007/08/30 19:32:28 UTC

svn commit: r571250 - in /tiles/framework/branches/TILES_2_0_X/tiles-core/src: main/java/org/apache/tiles/definition/ main/java/org/apache/tiles/impl/ test/java/org/apache/tiles/definition/

Author: apetrelli
Date: Thu Aug 30 10:32:28 2007
New Revision: 571250

URL: http://svn.apache.org/viewvc?rev=571250&view=rev
Log:
TILES-204
Merge from trunk to TILES_2_0_X branch.
Moved the call for "readDefinitions" inside the "init" method of UrlDefinitionsFactory.
Modified the calling code accordingly.

Modified:
    tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
    tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
    tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java

Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?rev=571250&r1=571249&r2=571250&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java Thu Aug 30 10:32:28 2007
@@ -127,6 +127,7 @@
             localeResolver = new DefaultLocaleResolver();
         }
         localeResolver.init(params);
+        definitions = readDefinitions();
     }
 
     /**
@@ -138,9 +139,6 @@
      */
     protected Definitions getDefinitions()
         throws DefinitionsFactoryException {
-        if (definitions == null) {
-            definitions = readDefinitions();
-        }
         return definitions;
     }
 

Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=571250&r1=571249&r2=571250&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Thu Aug 30 10:32:28 2007
@@ -182,7 +182,6 @@
             DefinitionsFactory definitionsFactory, String resourceString,
             Map<String, String> initParameters) throws TilesException {
         List<String> resources = getResourceNames(resourceString);
-        definitionsFactory.init(initParameters);
 
         try {
             for (String resource : resources) {
@@ -200,6 +199,9 @@
             throw new DefinitionsFactoryException("Unable to parse definitions from "
                 + resourceString, e);
         }
+
+        definitionsFactory.init(initParameters);
+
         if (LOG.isInfoEnabled()) {
             LOG.info("Tiles2 container initialization complete.");
         }

Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?rev=571250&r1=571249&r2=571250&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java Thu Aug 30 10:32:28 2007
@@ -134,13 +134,10 @@
                 "org/apache/tiles/config/defs3.xml");
         assertNotNull("Could not load defs3 file.", url3);
 
-        factory.init(Collections.EMPTY_MAP);
         factory.addSource(url1);
         factory.addSource(url2);
         factory.addSource(url3);
-
-        // Parse files.
-        factory.readDefinitions();
+        factory.init(Collections.EMPTY_MAP);
 
         TilesRequestContext emptyContext = new MockOnlyLocaleTilesContext(null);
         TilesRequestContext usContext = new MockOnlyLocaleTilesContext(Locale.US);