svn commit: r556284 - in /tiles/framework/branches/TILES_2_0_X/tiles-core/src: main/java/org/apache/tiles/definition/digester/ test/java/org/apache/tiles/config/ test/java/org/apache/tiles/definition/digester/

[ap...@apache.org]

Author: apetrelli
Date: Sat Jul 14 07:36:26 2007
New Revision: 556284

URL: http://svn.apache.org/viewvc?view=rev&rev=556284
Log:
TILES-185
Merge from trunk to branch TILES_2_0_X.
Added digesting of "role" attribute for Tiles attributes.

Modified:
    tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
    tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
    tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java

Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?view=diff&rev=556284&r1=556283&r2=556284
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Sat Jul 14 07:36:26 2007
@@ -147,6 +147,7 @@
             Attribute attribute = (Attribute) digester.peek();
             attribute.setName(attributes.getValue("name"));
             attribute.setValue(attributes.getValue("value"));
+            attribute.setRole(attributes.getValue("role"));
             attribute.setType(AttributeType
                     .getType(attributes.getValue("type")));
         }

Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml?view=diff&rev=556284&r1=556283&r2=556284
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml Sat Jul 14 07:36:26 2007
@@ -134,5 +134,9 @@
   </put-list-attribute>
 </definition>
 
+<definition name="doc.role.test" template="/layout/classicLayout.jsp">
+  <put-attribute name="title" value="Test title" role="myrole" />
+</definition>
+
 
 </tiles-definitions>

Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?view=diff&rev=556284&r1=556283&r2=556284
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Sat Jul 14 07:36:26 2007
@@ -31,6 +31,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.Attribute;
 import org.apache.tiles.Definition;
 import org.apache.tiles.definition.DefinitionsFactoryException;
 import org.apache.tiles.definition.DefinitionsReader;
@@ -98,6 +99,14 @@
             assertEquals("Incorrect Find title attribute.",
                     "Tiles Library Documentation", definitions.get(
                             "doc.mainLayout").getAttribute("title").getValue());
+
+            Definition def = definitions.get("doc.role.test");
+            assertNotNull("Couldn't find doc.role.test tile.", def);
+            Attribute attribute = def.getAttribute("title");
+            assertNotNull("Couldn't Find title attribute.", attribute
+                    .getValue());
+            assertEquals("Role 'myrole' expected", attribute.getRole(),
+                    "myrole");
 
         } catch (Exception e) {
             fail("Exception reading configuration." + e);