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 2008/12/12 14:29:13 UTC
svn commit: r726001 - in /tiles/framework/trunk/tiles-core/src:
main/java/org/apache/tiles/definition/dao/
test/java/org/apache/tiles/definition/dao/
Author: apetrelli
Date: Fri Dec 12 05:29:13 2008
New Revision: 726001
URL: http://svn.apache.org/viewvc?rev=726001&view=rev
Log:
TILES-340
Wildcards gathering was not invoked on definitions related to locales "parent" of the submitted one: fixed.
Added test case for regression.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java?rev=726001&r1=726000&r2=726001&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java Fri Dec 12 05:29:13 2008
@@ -203,7 +203,6 @@
}
localeDefsMap = loadDefinitionsFromURLs(customizationKey);
- postDefinitionLoadOperations(localeDefsMap, customizationKey);
return localeDefsMap;
}
@@ -243,6 +242,7 @@
}
}
locale2definitionMap.put(customizationKey, localeDefsMap);
+ postDefinitionLoadOperations(localeDefsMap, customizationKey);
return localeDefsMap;
}
@@ -259,7 +259,7 @@
}
/**
- * Tries to load definitions if necessary.
+ * Operations to be done after definitions are loaded.
*
* @param localeDefsMap The loaded definitions.
* @param customizationKey The locale to use when loading URLs.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java?rev=726001&r1=726000&r2=726001&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java Fri Dec 12 05:29:13 2008
@@ -53,12 +53,6 @@
/** {@inheritDoc} */
@Override
- protected Map<String, Definition> loadDefinitions(Locale customizationKey) {
- return super.loadDefinitions(customizationKey);
- }
-
- /** {@inheritDoc} */
- @Override
protected Map<String, Definition> loadParentDefinitions(Locale parentLocale) {
return loadDefinitionsFromURLs(parentLocale);
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java?rev=726001&r1=726000&r2=726001&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java Fri Dec 12 05:29:13 2008
@@ -634,7 +634,17 @@
.setApplicationContext(applicationContext);
definitionDao.setReader(new DigesterDefinitionsReader());
- Definition definition = definitionDao.getDefinition("test.defName.subLayered", null);
+ Definition definition = definitionDao.getDefinition("test.defName.subLayered", Locale.ITALY);
+ assertEquals("The template is not correct", "/testName.jsp", definition.getTemplate());
+ assertEquals("The header attribute is not correct",
+ "/common/headerLayered.jsp", definition.getAttribute("header")
+ .getValue());
+ definition = definitionDao.getDefinition("test.defName.subLayered", Locale.ITALIAN);
+ assertEquals("The template is not correct", "/testName.jsp", definition.getTemplate());
+ assertEquals("The header attribute is not correct",
+ "/common/headerLayered.jsp", definition.getAttribute("header")
+ .getValue());
+ definition = definitionDao.getDefinition("test.defName.subLayered", null);
assertEquals("The template is not correct", "/testName.jsp", definition.getTemplate());
assertEquals("The header attribute is not correct",
"/common/headerLayered.jsp", definition.getAttribute("header")