Author: apetrelli
Date: Wed Feb 7 06:09:45 2007
New Revision: 504553
URL: http://svn.apache.org/viewvc?view=rev&rev=504553
Log:
TILES-103
Application of JSP tags and XML elements refactoring regarding attributes to
the test webapp.
Modified:
tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/testputlist.jsp
Modified:
tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml?view=diff&rev=504553&r1=504552&r2=504553
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
(original)
+++
tiles/framework/trunk/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
Wed Feb 7 06:09:45 2007
@@ -30,8 +30,8 @@
<tiles-definitions>
<definition name="classpath.definition" template="/layout.jsp">
- <put name="title" value="This is the title."/>
- <put name="header" value="/header.jsp"/>
- <put name="body" value="/classpath.jsp"/>
+ <putAttribute name="title" value="This is the title."/>
+ <putAttribute name="header" value="/header.jsp"/>
+ <putAttribute name="body" value="/classpath.jsp"/>
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=504553&r1=504552&r2=504553
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
(original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Wed
Feb 7 06:09:45 2007
@@ -37,42 +37,42 @@
<!-- Doc index page description -->
<definition name="test.inner.definition" template="/layout.jsp">
- <put name="title" value="This is a configured inner definition."/>
- <put name="header" value="/header.jsp"/>
- <put name="body" value="/body.jsp"/>
+ <putAttribute name="title" value="This is a configured inner
definition."/>
+ <putAttribute name="header" value="/header.jsp"/>
+ <putAttribute name="body" value="/body.jsp"/>
</definition>
<definition name="test.definition" template="/layout.jsp">
- <put name="title" value="This is the title."/>
- <put name="header" value="/header.jsp"/>
- <put name="body" value="/body.jsp"/>
+ <putAttribute name="title" value="This is the title."/>
+ <putAttribute name="header" value="/header.jsp"/>
+ <putAttribute name="body" value="/body.jsp"/>
</definition>
<definition name="test.composite.definition" template="/layout.jsp">
- <put name="title" value="This is a configured composite definition."/>
- <put name="header" value="/header.jsp"/>
- <put name="body" value="test.inner.definition"/>
+ <putAttribute name="title" value="This is a configured composite
definition."/>
+ <putAttribute name="header" value="/header.jsp"/>
+ <putAttribute name="body" value="test.inner.definition"/>
</definition>
<definition name="test.putAttributes" template="/putattributeslayout.jsp">
- <put name="stringTest" value="This is a string" type="string" />
- <putList name="list">
- <add value="valueOne" type="string" />
- <add value="valueTwo" type="string" />
- <add value="valueThree" type="string" />
- </putList>
+ <putAttribute name="stringTest" value="This is a string" type="string" />
+ <putListAttribute name="list">
+ <addAttribute value="valueOne" type="string" />
+ <addAttribute value="valueTwo" type="string" />
+ <addAttribute value="valueThree" type="string" />
+ </putListAttribute>
</definition>
<definition name="test.putAllAttributes"
template="/putallattributeslayout.jsp">
- <put name="one" value="There should be three more strings" type="string" />
- <put name="two" value="One" type="string" />
- <put name="three" value="Two" type="string" />
- <put name="four" value="Three" type="string" />
+ <putAttribute name="one" value="There should be three more strings"
type="string" />
+ <putAttribute name="two" value="One" type="string" />
+ <putAttribute name="three" value="Two" type="string" />
+ <putAttribute name="four" value="Three" type="string" />
</definition>
<definition name="preparer.definition" template="/layout.jsp">
- <put name="title" value="This is the title."/>
- <put name="header" value="/header.jsp"/>
+ <putAttribute name="title" value="This is the title."/>
+ <putAttribute name="header" value="/header.jsp"/>
</definition>
<definition name="testdispatchservlet" extends="test.definition"/>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testputlist.jsp
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testputlist.jsp?view=diff&rev=504553&r1=504552&r2=504553
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testputlist.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testputlist.jsp Wed Feb 7
06:09:45 2007
@@ -25,9 +25,9 @@
<tiles:insertTemplate template="/putattributeslayout.jsp">
<tiles:putAttribute name="stringTest" value="This is a string" type="string"
/>
- <tiles:putList name="list">
+ <tiles:putListAttribute name="list">
<tiles:putAttribute value="valueOne" type="string" />
<tiles:putAttribute value="valueTwo" type="string" />
<tiles:putAttribute value="valueThree" type="string" />
- </tiles:putList>
+ </tiles:putListAttribute>
</tiles:insertTemplate>
