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

[apetrelli]

Author: apetrelli
Date: Sun Jul 13 08:39:23 2008
New Revision: 676345

URL: http://svn.apache.org/viewvc?rev=676345&view=rev
Log:
TILES-84
Added exclusion, in DAOs, of URLs that contain underscores, that could be used 
for internationalization definition files.

Modified:
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=676345&r1=676344&r2=676345&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
 Sun Jul 13 08:39:23 2008
@@ -193,7 +193,14 @@
                                 LOG.debug("Adding resource '" + resourceUrl
                                         + "' to definitions factory.");
                             }
-                            sourceURLs.add(resourceUrl);
+                            if (!resourceUrl.toExternalForm().contains("_")) {
+                                sourceURLs.add(resourceUrl);
+                            } else if (LOG.isDebugEnabled()) {
+                                LOG.debug("Not adding resource '" + resourceUrl
+                                        + "' to definitions factory because it 
is "
+                                        + "supposed to be an 
internationalization.");
+                            }
+
                         } else {
                             LOG.warn("Unable to find configured definition '"
                                     + resources[i] + "'");

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java?rev=676345&r1=676344&r2=676345&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
 Sun Jul 13 08:39:23 2008
@@ -444,6 +444,8 @@
                 "org/apache/tiles/config/defs2.xml");
         URL url3 = this.getClass().getClassLoader().getResource(
                 "org/apache/tiles/config/defs3.xml");
+        URL url4 = this.getClass().getClassLoader().getResource(
+                "org/apache/tiles/config/defs1_en_US.xml");
         TilesApplicationContext applicationContext = EasyMock
                 .createMock(TilesApplicationContext.class);
         Set<URL> urlSet = new HashSet<URL>();
@@ -464,12 +466,19 @@
                 applicationContext
                         .getResources("org/apache/tiles/config/defs3.xml"))
                 .andReturn(urlSet);
+        urlSet = new HashSet<URL>();
+        urlSet.add(url4);
+        EasyMock.expect(
+                applicationContext
+                        
.getResources("org/apache/tiles/config/defs1_en_US.xml"))
+                .andReturn(urlSet);
         EasyMock.replay(applicationContext);
         Map<String, String> params = new HashMap<String, String>();
         params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
                 "org/apache/tiles/config/defs1.xml,"
                         + "org/apache/tiles/config/defs2.xml,"
-                        + "org/apache/tiles/config/defs3.xml");
+                        + "org/apache/tiles/config/defs3.xml,"
+                        + "org/apache/tiles/config/defs1_en_US.xml");
         definitionDao.setApplicationContext(applicationContext);
         definitionDao.setSourceURLs(new ArrayList<URL>());
         definitionDao.identifySources(params);

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java?rev=676345&r1=676344&r2=676345&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
 Sun Jul 13 08:39:23 2008
@@ -448,6 +448,8 @@
                 "org/apache/tiles/config/defs2.xml");
         URL url3 = this.getClass().getClassLoader().getResource(
                 "org/apache/tiles/config/defs3.xml");
+        URL url4 = this.getClass().getClassLoader().getResource(
+                "org/apache/tiles/config/defs1_en_US.xml");
         TilesApplicationContext applicationContext = EasyMock
                 .createMock(TilesApplicationContext.class);
         Set<URL> urlSet = new HashSet<URL>();
@@ -468,12 +470,19 @@
                 applicationContext
                         .getResources("org/apache/tiles/config/defs3.xml"))
                 .andReturn(urlSet);
+        urlSet = new HashSet<URL>();
+        urlSet.add(url4);
+        EasyMock.expect(
+                applicationContext
+                        
.getResources("org/apache/tiles/config/defs1_en_US.xml"))
+                .andReturn(urlSet);
         EasyMock.replay(applicationContext);
         Map<String, String> params = new HashMap<String, String>();
         params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
                 "org/apache/tiles/config/defs1.xml,"
                         + "org/apache/tiles/config/defs2.xml,"
-                        + "org/apache/tiles/config/defs3.xml");
+                        + "org/apache/tiles/config/defs3.xml,"
+                        + "org/apache/tiles/config/defs1_en_US.xml");
         definitionDao.setApplicationContext(applicationContext);
         definitionDao.setSourceURLs(new ArrayList<URL>());
         definitionDao.identifySources(params);