Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl Sun Feb 8 14:43:29 2009 @@ -21,15 +21,15 @@ * */ --> -<tiles:definition name="test.nesting.definitions.tags" template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title."/> - <tiles:putAttribute name="header" value="/header.jsp"/> - <tiles:putAttribute name="body"> - <tiles:definition template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is a nested definition."/> - <tiles:putAttribute name="header" value="/header.jsp"/> - <tiles:putAttribute name="body" value="/body.jsp"/> +<@tiles.definition name="test.nesting.definitions.tags" template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title."/> + <@tiles.putAttribute name="header" value="/header.jsp"/> + <@tiles.putAttribute name="body"> + <@tiles.definition template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is a nested definition."/> + <@tiles.putAttribute name="header" value="/header.jsp"/> + <@tiles.putAttribute name="body" value="/body.jsp"/> </tiles:definition> </tiles:putAttribute> </tiles:definition> -<tiles:insertDefinition name="test.nesting.definitions.tags" /> +<@tiles.insertDefinition name="test.nesting.definitions.tags" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl Sun Feb 8 14:43:29 2009 @@ -21,4 +21,4 @@ * */ --> -<tiles:insertDefinition name="test.nesting.list.definitions" /> +<@tiles.insertDefinition name="test.nesting.list.definitions" /> 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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -21,17 +21,17 @@ * */ --> -<tiles:definition name="test.nesting.definitions.tags" template="/layout_list.jsp"> - <tiles:putAttribute name="title" value="This is the title."/> - <tiles:putAttribute name="header" value="/header.jsp"/> - <tiles:putListAttribute name="list"> - <tiles:addAttribute> - <tiles:definition template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is a nested definition."/> - <tiles:putAttribute name="header" value="/header.jsp"/> - <tiles:putAttribute name="body" value="/body.jsp"/> +<@tiles.definition name="test.nesting.definitions.tags" template="/layout_list.jsp"> + <@tiles.putAttribute name="title" value="This is the title."/> + <@tiles.putAttribute name="header" value="/header.jsp"/> + <@tiles.putListAttribute name="list"> + <@tiles.addAttribute> + <@tiles.definition template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is a nested definition."/> + <@tiles.putAttribute name="header" value="/header.jsp"/> + <@tiles.putAttribute name="body" value="/body.jsp"/> </tiles:definition> </tiles:addAttribute> </tiles:putListAttribute> </tiles:definition> -<tiles:insertDefinition name="test.nesting.definitions.tags" /> +<@tiles.insertDefinition name="test.nesting.definitions.tags" /> Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="/body.jsp" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="/body.jsp" /> </tiles:insertTemplate> \ No newline at end of file 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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." cascade="true" /> - <tiles:putAttribute name="header" value="/header.jsp" cascade="true" /> - <tiles:putAttribute name="body" value="test.inner.cascadable.definition" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." cascade="true" /> + <@tiles.putAttribute name="header" value="/header.jsp" 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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." cascade="true" /> - <tiles:putAttribute name="header" value="/alternate-header.jsp" cascade="true" /> - <tiles:putAttribute name="body" value="test.inner.definition" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." cascade="true" /> + <@tiles.putAttribute name="header" value="/alternate-header.jsp" 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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." cascade="true" /> - <tiles:putAttribute name="header" value="/header.jsp" cascade="true" /> - <tiles:putAttribute name="body" value="/layout_nobody.jsp" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." cascade="true" /> + <@tiles.putAttribute name="header" value="/header.jsp" cascade="true" /> + <@tiles.putAttribute name="body" value="/layout_nobody.jsp" /> </tiles:insertTemplate> \ No newline at end of file Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl Sun Feb 8 14:43:29 2009 @@ -24,8 +24,8 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> <c:set var="bodyContent" value="Body Content defined by and el" /> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="${bodyContent}" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="${bodyContent}" /> </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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -25,8 +25,8 @@ <c:set var="doNotShowBody" value="${'${'}requestScope.doNotShow}" /> <c:set var="doNotShow" scope="request" value="DO NOT SHOW!!!" /> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="${doNotShowBody}" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@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/testput_flush.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/layout.jsp" flush="true"> - <tiles:putAttribute name="title" value="This is the title." /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="/body.jsp" /> +<@tiles.insertTemplate template="/layout.jsp" flush="true"> + <@tiles.putAttribute name="title" value="This is the title." /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="/body.jsp" /> </tiles:insertTemplate> \ No newline at end of file Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/layout_alt_title.jsp"> - <tiles:putAttribute name="title" value="This is the title." type="reversed" /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="/body.jsp" /> +<@tiles.insertTemplate template="/layout_alt_title.jsp"> + <@tiles.putAttribute name="title" value="This is the title." type="reversed" /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="/body.jsp" /> </tiles:insertTemplate> \ No newline at end of file Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl Sun Feb 8 14:43:29 2009 @@ -21,9 +21,9 @@ * */ --> -<tiles:insertTemplate template="/layout_alt_title.jsp"> - <tiles:putAttribute name="title" value="This is the title." +<@tiles.insertTemplate template="/layout_alt_title.jsp"> + <@tiles.putAttribute name="title" value="This is the title." type="org.apache.tiles.test.renderer.ReverseStringAttributeRenderer" /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="/body.jsp" /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="/body.jsp" /> </tiles:insertTemplate> \ No newline at end of file Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertTemplate template="/servlets/layoutServlet"> - <tiles:putAttribute name="title" value="This is the title." /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="/body.jsp" /> +<@tiles.insertTemplate template="/servlets/layoutServlet"> + <@tiles.putAttribute name="title" value="This is the title." /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="/body.jsp" /> </tiles:insertTemplate> \ No newline at end of file Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl Sun Feb 8 14:43:29 2009 @@ -21,11 +21,11 @@ * */ --> -<tiles:insertTemplate template="/putattributeslayout.jsp"> - <tiles:putAttribute name="stringTest" value="This is a string" type="string" /> - <tiles:putListAttribute name="list"> - <tiles:addAttribute value="valueOne" type="string" /> - <tiles:addAttribute value="valueTwo" type="string" /> - <tiles:addAttribute value="valueThree" type="string" /> +<@tiles.insertTemplate template="/putattributeslayout.jsp"> + <@tiles.putAttribute name="stringTest" value="This is a string" type="string" /> + <@tiles.putListAttribute name="list"> + <@tiles.addAttribute value="valueOne" type="string" /> + <@tiles.addAttribute value="valueTwo" type="string" /> + <@tiles.addAttribute value="valueThree" type="string" /> </tiles:putListAttribute> </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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -21,14 +21,14 @@ * */ --> -<tiles:insertTemplate template="/layout.jsp"> - <tiles:putAttribute name="title" value="This is the title." /> - <tiles:putAttribute name="header" value="/header.jsp" /> - <tiles:putAttribute name="body" value="/putattributeslayout.jsp" /> - <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" /> +<@tiles.insertTemplate template="/layout.jsp"> + <@tiles.putAttribute name="title" value="This is the title." /> + <@tiles.putAttribute name="header" value="/header.jsp" /> + <@tiles.putAttribute name="body" value="/putattributeslayout.jsp" /> + <@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" /> </tiles:putListAttribute> </tiles:insertTemplate> \ No newline at end of file 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=742111&r1=742110&r2=742111&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 Sun Feb 8 14:43:29 2009 @@ -21,8 +21,8 @@ * */ --> -<tiles:insertDefinition name="test.putAttributes"> - <tiles:putListAttribute name="list" inherit="true"> - <tiles:addAttribute value="valueFour" type="string" /> +<@tiles.insertDefinition name="test.putAttributes"> + <@tiles.putListAttribute name="list" inherit="true"> + <@tiles.addAttribute value="valueFour" type="string" /> </tiles:putListAttribute> </tiles:insertDefinition> Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testsetcurrentcontainer.ftl URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testsetcurrentcontainer.ftl?rev=742111&r1=742110&r2=742111&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testsetcurrentcontainer.ftl (original) +++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testsetcurrentcontainer.ftl Sun Feb 8 14:43:29 2009 @@ -21,7 +21,7 @@ * */ --> -<tiles:setCurrentContainer containerKey="alternate" /> -<tiles:insertDefinition name="test.definition" /> -<tiles:setCurrentContainer /> -<tiles:insertDefinition name="test.definition" /> +<@tiles.setCurrentContainer containerKey="alternate" /> +<@tiles.insertDefinition name="test.definition" /> +<@tiles.setCurrentContainer /> +<@tiles.insertDefinition name="test.definition" />
