Author: apetrelli
Date: Wed Feb 11 13:22:57 2009
New Revision: 743333
URL: http://svn.apache.org/viewvc?rev=743333&view=rev
Log:
TILESSB-5
Fixed some 2.1.x tests.
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_list.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_inherit.ftl
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
Wed Feb 11 13:22:57 2009
@@ -85,19 +85,7 @@
</put-list-attribute>
</definition>
- <definition name="freemarker.test.putAttributes.inherit"
extends="test.putAttributes">
- <put-list-attribute name="list" inherit="true">
- <add-attribute value="valueFour" type="string" />
- </put-list-attribute>
- </definition>
-
- <definition name="freemarker.test.putAttributes.inherit"
extends="test.putAttributes">
- <put-list-attribute name="list" inherit="true">
- <add-attribute value="valueFour" type="string" />
- </put-list-attribute>
- </definition>
-
- <definition name="freemarker.test.putAttributes.inherit"
extends="test.putAttributes">
+ <definition name="freemarker.test.putAttributes.inherit"
extends="freemarker.test.putAttributes">
<put-list-attribute name="list" inherit="true">
<add-attribute value="valueFour" type="string" />
</put-list-attribute>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_list.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_list.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_list.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_list.ftl
Wed Feb 11 13:22:57 2009
@@ -21,8 +21,6 @@
*
*/
-->
-<%@ taglib uri="http://java.sun.com/jstl/core_rt"; prefix="c" %>
-
<table border="2" width="300" bordercolor="Gray">
<tr>
<td bgcolor="Blue"><strong><@tiles.getAsString
name="title"/></strong></td>
@@ -33,9 +31,9 @@
<tr>
<td>
<@tiles.importAttribute name="list"/>
- <c:forEach var="attribute" items="${list}">
- <@tiles.insertAttribute value="${attribute}" />
- </c:forEach>
+ <#list list as attribute>
+ <@tiles.insertAttribute value=attribute />
+ </#list>
</td>
</tr>
</table>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
Wed Feb 11 13:22:57 2009
@@ -34,4 +34,4 @@
</@tiles.addAttribute>
</@tiles.putListAttribute>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.nesting.definitions.tags" />
+<@tiles.insertDefinition name="test.nesting.definitions.tags" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
Wed Feb 11 13:22:57 2009
@@ -22,7 +22,7 @@
*/
-->
<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." cascade="true"
/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"
cascade="true" />
+ <@tiles.putAttribute name="title" value="This is the title." cascade=true />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"
cascade=true />
<@tiles.putAttribute name="body" value="test.inner.cascadable.definition"
/>
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
Wed Feb 11 13:22:57 2009
@@ -22,7 +22,7 @@
*/
-->
<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." cascade="true"
/>
- <@tiles.putAttribute name="header" value="/freemarker/alternate-header.ftl"
cascade="true" />
+ <@tiles.putAttribute name="title" value="This is the title." cascade=true />
+ <@tiles.putAttribute name="header" value="/freemarker/alternate-header.ftl"
cascade=true />
<@tiles.putAttribute name="body" value="test.inner.definition" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
Wed Feb 11 13:22:57 2009
@@ -22,7 +22,7 @@
*/
-->
<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." cascade="true"
/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"
cascade="true" />
+ <@tiles.putAttribute name="title" value="This is the title." cascade=true />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"
cascade=true />
<@tiles.putAttribute name="body" value="/freemarker/layout_nobody.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
Wed Feb 11 13:22:57 2009
@@ -21,12 +21,11 @@
*
*/
-->
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<c:set var="doNotShowBody" value="${'${'}requestScope.doNotShow}" />
-<c:set var="doNotShow" scope="request" value="DO NOT SHOW!!!" />
+<#assign doNotShowBody="$" + "{" + "requestScope.doNotShow}" />
+<#assign doNotShow="DO NOT SHOW!!!" />
<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
<@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="${doNotShowBody}" />
+ <@tiles.putAttribute name="body" value=doNotShowBody />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
Wed Feb 11 13:22:57 2009
@@ -25,8 +25,8 @@
<@tiles.putAttribute name="title" value="This is the title." />
<@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
<@tiles.putAttribute name="body"
value="/freemarker/putattributeslayout.ftl" />
- <@tiles.putAttribute name="stringTest" value="This is a string"
type="string" cascade="true" />
- <@tiles.putListAttribute name="list" cascade="true">
+ <@tiles.putAttribute name="stringTest" value="This is a string"
type="string" cascade=true />
+ <@tiles.putListAttribute name="list" cascade=true>
<@tiles.addAttribute value="valueOne" type="string" />
<@tiles.addAttribute value="valueTwo" type="string" />
<@tiles.addAttribute value="valueThree" type="string" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_inherit.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_inherit.ftl?rev=743333&r1=743332&r2=743333&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_inherit.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_inherit.ftl
Wed Feb 11 13:22:57 2009
@@ -22,7 +22,7 @@
*/
-->
<@tiles.insertDefinition name="freemarker.test.putAttributes">
- <@tiles.putListAttribute name="list" inherit="true">
+ <@tiles.putListAttribute name="list" inherit=true>
<@tiles.addAttribute value="valueFour" type="string" />
</@tiles.putListAttribute>
</@tiles.insertDefinition>
