Author: apetrelli
Date: Tue Feb 24 11:40:06 2009
New Revision: 747349
URL: http://svn.apache.org/viewvc?rev=747349&view=rev
Log:
TILES-372
Merge from trunk to TILES_2_1_X for the resolution of TILES-371 for the test
webapp.
Now the role attribute is checked in <tiles:insertAttribute>
Added:
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/layout_roles.jsp
- copied unchanged from r747340,
tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
- copied unchanged from r747340,
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
tiles/framework/branches/TILES_2_1_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
- copied unchanged from r747340,
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-test/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/index.jsp
tiles/framework/branches/TILES_2_1_X/tiles-test/src/test/selenium/TestSuite.html
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
svn:mergeinfo = /tiles/framework/trunk/tiles-test:747340
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
('svn:mergeinfo' removed)
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?rev=747349&r1=747348&r2=747349&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
(original)
+++
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
Tue Feb 24 11:40:06 2009
@@ -146,6 +146,12 @@
<put-attribute name="body" value="/body.jsp" role="badrole" />
</definition>
+ <definition name="test.definition.roles.tags" template="/layout_roles.jsp">
+ <put-attribute name="title" value="This is the title."/>
+ <put-attribute name="header" value="/header.jsp" />
+ <put-attribute name="body" value="/body.jsp" />
+ </definition>
+
<!-- Tests for cascaded attributes -->
<definition name="test.overridden.cascaded.definition"
template="/layout.jsp">
<put-attribute name="title" value="This is the title." cascade="true" />
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/index.jsp?rev=747349&r1=747348&r2=747349&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/index.jsp
(original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-test/src/main/webapp/index.jsp
Tue Feb 24 11:40:06 2009
@@ -71,6 +71,7 @@
<a href="testinsertdefinition_role.jsp">Test Insert Configured Definition
with Specified Role</a><br/>
<a href="testinsertdefinition_role_tag.jsp">Test Insert Configured
Definition with Specified Role in Tag</a><br/>
<a href="testinsertdefinition_attribute_roles.jsp">Test Insert Configured
Definition with Attribute that have Roles</a><br/>
+ <a href="testinsertdefinition_attribute_roles_tags.jsp">Test Insert
Configured Definition with Attribute that have Roles in Tags</a><br/>
<h2>Features in Tiles 2.1.x</h2>
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-test/src/test/selenium/TestSuite.html
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-test/src/test/selenium/TestSuite.html?rev=747349&r1=747348&r2=747349&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/tiles-test/src/test/selenium/TestSuite.html
(original)
+++
tiles/framework/branches/TILES_2_1_X/tiles-test/src/test/selenium/TestSuite.html
Tue Feb 24 11:40:06 2009
@@ -214,6 +214,9 @@
<td><a href="ConfiguredDefinitionAttributeRolesTest.html">Configured
Definition Attribute Roles Test</a></td>
</tr>
<tr>
+ <td><a
href="ConfiguredDefinitionAttributeRolesTagsTest.html">Configured Definition
Attribute Roles Tags Test</a></td>
+ </tr>
+ <tr>
<td><a href="ConfiguredDefinitionDbTest.html">Configured Definition Db
Test</a></td>
</tr>
<tr>
