svn commit: r570906 - in /tiles/framework/trunk/tiles-core/src: main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java main/java/org/apache/tiles/impl/BasicTilesContainer.java test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java

[apetrelli]

Author: apetrelli
Date: Wed Aug 29 12:33:02 2007
New Revision: 570906

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

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/impl/BasicTilesContainer.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
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?rev=570906&r1=570905&r2=570906&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
 Wed Aug 29 12:33:02 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/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=570906&r1=570905&r2=570906&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
 Wed Aug 29 12:33:02 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/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?rev=570906&r1=570905&r2=570906&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
 Wed Aug 29 12:33:02 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);