svn commit: r627052 - in /tiles/framework/trunk/tiles-core/src: main/java/org/apache/tiles/definition/digester/ main/resources/org/apache/tiles/resources/ test/java/org/apache/tiles/config/ test/java/org/apache/tiles/definition/digester/

[apetrelli]

Author: apetrelli
Date: Tue Feb 12 11:33:55 2008
New Revision: 627052

URL: http://svn.apache.org/viewvc?rev=627052&view=rev
Log:
TILES-208
Added support in DigesterDefinitionsReader for put-list-attribute.

Modified:
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
    
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java

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=627052&r1=627051&r2=627052&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
 Tue Feb 12 11:33:55 2008
@@ -423,7 +423,9 @@
         if (registrations == null) {
             registrations = new String[] {
                 "-//Apache Software Foundation//DTD Tiles Configuration 
2.0//EN",
-                "/org/apache/tiles/resources/tiles-config_2_0.dtd"};
+                "/org/apache/tiles/resources/tiles-config_2_0.dtd",
+                "-//Apache Software Foundation//DTD Tiles Configuration 
2.1//EN",
+                "/org/apache/tiles/resources/tiles-config_2_1.dtd"};
         }
         return registrations;
     }

Modified: 
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd?rev=627052&r1=627051&r2=627052&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
 Tue Feb 12 11:33:55 2008
@@ -181,7 +181,7 @@
 @attr cascade        If true, the attribute will be cascaded to all inner
                      definitions. By default, cascade is false.
 -->
-<!ATTLIST put-attribute     cascade          %Boolean;    #IMPLIED>
+<!ATTLIST put-list-attribute cascade          %Boolean;        #IMPLIED>
 
 <!-- ========== Subordinate Elements ====================================== -->
 

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml?rev=627052&r1=627051&r2=627052&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2-1.xml
 Tue Feb 12 11:33:55 2008
@@ -32,6 +32,12 @@
   <definition name="doc.cascaded.test" template="/layout/classicLayout.jsp">
     <put-attribute name="title" value="Test title" cascade="false" />
     <put-attribute name="title2" value="Test title two" cascade="true" />
+    <put-list-attribute name="items1" cascade="false">
+        <add-attribute value="value1" type="string" />
+    </put-list-attribute>
+    <put-list-attribute name="items2" cascade="true">
+        <add-attribute value="value2" type="string" />
+    </put-list-attribute>
   </definition>
 
 </tiles-definitions>

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=627052&r1=627051&r2=627052&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
 Tue Feb 12 11:33:55 2008
@@ -138,6 +138,10 @@
             assertNotNull("Couldn't Find title local attribute.", attribute);
             attribute = def.getCascadedAttribute("title2");
             assertNotNull("Couldn't Find title2 cascaded attribute.", 
attribute);
+            attribute = def.getLocalAttribute("items1");
+            assertNotNull("Couldn't Find items1 local attribute.", attribute);
+            attribute = def.getCascadedAttribute("items2");
+            assertNotNull("Couldn't Find items2 cascaded attribute.", 
attribute);
         } catch (Exception e) {
             fail("Exception reading configuration." + e);
             e.printStackTrace();