Author: apetrelli
Date: Mon Jun 15 20:59:52 2009
New Revision: 784975
URL: http://svn.apache.org/viewvc?rev=784975&view=rev
Log:
TILES-416
Applied patch by Lukasz Racon.
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/digester/DigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.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=784975&r1=784974&r2=784975&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
Mon Jun 15 20:59:52 2009
@@ -24,6 +24,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
@@ -231,7 +232,7 @@
String postfix = LocaleUtil.calculatePostfix(customizationKey);
Locale parentLocale = LocaleUtil.getParentLocale(customizationKey);
- localeDefsMap = new HashMap<String, Definition>();
+ localeDefsMap = new LinkedHashMap<String, Definition>();
if (parentLocale != null) {
Map<String, Definition> parentDefs =
loadParentDefinitions(parentLocale);
if (parentDefs != null) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=784975&r1=784974&r2=784975&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
Mon Jun 15 20:59:52 2009
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.commons.digester.Digester;
@@ -301,7 +301,7 @@
// This is an instance variable instead of a local variable because
// we want to be able to call the addDefinition method to populate it.
// But we reset the Map here, which, of course, has threading
implications.
- definitions = new HashMap<String, Definition>();
+ definitions = new LinkedHashMap<String, Definition>();
if (source == null) {
// Perhaps we should throw an exception here.
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml?rev=784975&r1=784974&r2=784975&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
Mon Jun 15 20:59:52 2009
@@ -44,6 +44,17 @@
<put-attribute name="footer" value="/common/footer.jsp" />
<put-attribute name="body" value="doc.portal.body" />
</definition>
+
+ <!-- Never used on purpose, if there is the TILES-416 the test will fail -->
+ <definition name="test.def*" template="/test{1}.jsp">
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header-sub.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
+ </definition>
+
<definition name="test.def*.noAttribute" template="/test{1}.jsp" />
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?rev=784975&r1=784974&r2=784975&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
Mon Jun 15 20:59:52 2009
@@ -21,7 +21,7 @@
package org.apache.tiles.definition;
-import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.tiles.Definition;
@@ -65,7 +65,7 @@
*/
@SuppressWarnings("unchecked")
public Map<String, Definition> read(Object source) {
- return Collections.EMPTY_MAP;
+ return new LinkedHashMap();
}
/**
