You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/03/09 23:46:00 UTC
svn commit: r751891 [1/4] - in /tiles/sandbox/trunk/tiles-test-sandbox/src:
main/webapp/ main/webapp/WEB-INF/ main/webapp/velocity/ test/selenium/
test/selenium/velocity/
Author: apetrelli
Date: Mon Mar 9 22:45:57 2009
New Revision: 751891
URL: http://svn.apache.org/viewvc?rev=751891&view=rev
Log:
TILESSB-8
Fixed all tests.
Added Selenium tests.
Added:
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionELTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionReversedExplicitTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagExtendTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagListInheritTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagPreparerTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/DefinitionTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ImportAttributeTagAllTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ImportAttributeTagInheritTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/ImportAttributeTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/LocalizationTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutListCascadedTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutListTagInheritTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutListTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagCascadedTemplateTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagCascadedTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagFlushTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagNestedDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagReversedExplicitTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagReversedTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagWithELTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/PutTagWithServletTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/SetCurrentContainerTagTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/TilesDefinitionFilterTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/TilesDispatchServletTest.html (with props)
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/velocity/WelcomePageTest.html (with props)
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/testinitcontainer.jsp
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutOne.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutTwo.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_list.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_nobody.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_override.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_preparer.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_roles.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putallattributeslayout.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putattributeslayout.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/selectlocale.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_extend.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_list_inherit.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_preparer.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_all.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_inherit.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_db.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_old.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_template.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_overridden.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_template.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el_singleeval.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed_explicit.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_inherit.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm
tiles/sandbox/trunk/tiles-test-sandbox/src/test/selenium/TestSuite.html
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml Mon Mar 9 22:45:57 2009
@@ -73,6 +73,12 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>Tiles Decoration Filter</filter-name>
+ <url-pattern>/velocity/testdecorationfilter.vm</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>Security Wrapping Filter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
@@ -182,6 +188,14 @@
<param-value>freemarker.test.localized.definition</param-value>
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>selectLocaleServletVelocity</servlet-name>
+ <servlet-class>org.apache.tiles.test.servlet.SelectLocaleServlet</servlet-class>
+ <init-param>
+ <param-name>org.apache.tiles.test.servlet.ServletConfig.DEFINITION_NAME</param-name>
+ <param-value>velocity.test.localized.definition</param-value>
+ </init-param>
+ </servlet>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
@@ -210,6 +224,12 @@
<servlet-name>selectLocaleServletFreemarker</servlet-name>
<url-pattern>/freemarker/servlets/selectLocaleServlet</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>selectLocaleServletVelocity</servlet-name>
+ <url-pattern>/velocity/servlets/selectLocaleServlet</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>velocity</servlet-name>
<url-pattern>*.vm</url-pattern>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/testinitcontainer.jsp
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/testinitcontainer.jsp?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/testinitcontainer.jsp (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/testinitcontainer.jsp Mon Mar 9 22:45:57 2009
@@ -27,7 +27,7 @@
<tiles:destroyContainer/>
<tiles:initContainer containerFactory="org.apache.tiles.factory.TilesContainerFactory">
<tiles:putAttribute name="definitions-config"
- value="/WEB-INF/tiles-defs.xml,/WEB-INF/freemarker/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml,/org/apache/tiles/freemarker-classpath-defs.xml,/WEB-INF/tiles-defs-1.1.xml,/WEB-INF/freemarker/tiles-defs-1.1.xml"/>
+ value="/WEB-INF/tiles-defs.xml,/WEB-INF/freemarker/tiles-defs.xml,/WEB-INF/velocity/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml,/org/apache/tiles/freemarker-classpath-defs.xml,/org/apache/tiles/velocity-classpath-defs.xml,/WEB-INF/tiles-defs-1.1.xml,/WEB-INF/freemarker/tiles-defs-1.1.xml,/WEB-INF/velocity/tiles-defs-1.1.xml"/>
<tiles:putAttribute name="org.apache.tiles.context.AbstractTilesApplicationContextFactory"
value="org.apache.tiles.context.enhanced.EnhancedTilesApplicationContextFactory"/>
<tiles:putAttribute name="org.apache.tiles.factory.TilesContainerFactory.MUTABLE"
@@ -41,7 +41,7 @@
<tiles:putAttribute name="org.apache.tiles.evaluator.el.ExpressionFactoryFactory"
value="org.apache.tiles.test.evaluator.el.MultiversionExpressionFactoryFactory"/>
<tiles:putAttribute name="org.apache.tiles.context.ChainedTilesRequestContextFactory.FACTORY_CLASS_NAMES"
- value="org.apache.tiles.servlet.context.ServletTilesRequestContextFactory,org.apache.tiles.jsp.context.JspTilesRequestContextFactory,org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory"/>
+ value="org.apache.tiles.servlet.context.ServletTilesRequestContextFactory,org.apache.tiles.jsp.context.JspTilesRequestContextFactory,org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory,org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory"/>
</tiles:initContainer>
<tiles:insertDefinition name="test.definition" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutOne.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutOne.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutOne.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutOne.vm Mon Mar 9 22:45:57 2009
@@ -24,12 +24,12 @@
<td bgcolor="yellow">This is layout one.</td>
</tr>
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header"/></td>
+ <td>$tiles.insertAttribute({"name":"header"})</td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="body"/></td>
+ <td>$tiles.insertAttribute({"name":"body"})</td>
</tr>
</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutTwo.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutTwo.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutTwo.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layoutTwo.vm Mon Mar 9 22:45:57 2009
@@ -24,12 +24,12 @@
<td bgcolor="yellow">This is layout two.</td>
</tr>
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header"/></td>
+ <td>$tiles.insertAttribute({"name":"header"})</td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="body"/></td>
+ <td>$tiles.insertAttribute({"name":"body"})</td>
</tr>
</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_list.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_list.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_list.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_list.vm Mon Mar 9 22:45:57 2009
@@ -21,17 +21,17 @@
*#
<table border="2" width="300" bordercolor="Gray">
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header"/></td>
+ <td>$tiles.insertAttribute({"name":"header"})</td>
</tr>
<tr>
<td>
- $tiles.importAttribute name="list"/>
- <#list list as attribute>
- $tiles.insertAttribute value=attribute />
- </#list>
+ $tiles.importAttribute({"name":"list"})
+ #foreach($attribute in $list)
+ $tiles.insertAttribute({"value":$attribute})
+ #end
</td>
</tr>
-</table>
\ No newline at end of file
+</table>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_nobody.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_nobody.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_nobody.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_nobody.vm Mon Mar 9 22:45:57 2009
@@ -21,9 +21,9 @@
*#
<table border="2" width="300" bordercolor="Gray">
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header"/></td>
+ <td>$tiles.insertAttribute({"name":"header"})</td>
</tr>
-</table>
\ No newline at end of file
+</table>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_override.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_override.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_override.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_override.vm Mon Mar 9 22:45:57 2009
@@ -24,12 +24,12 @@
<td bgcolor="Green"><strong>This is the overridden template.</strong></td>
</tr>
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header"/></td>
+ <td>$tiles.insertAttribute({"name":"header"})</td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="body"/></td>
+ <td>$tiles.insertAttribute({"name":"body"})</td>
</tr>
</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_preparer.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_preparer.vm Mon Mar 9 22:45:57 2009
@@ -21,13 +21,13 @@
*#
<table border="2" width="300" bordercolor="Gray">
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header"/></td>
+ <td>$tiles.insertAttribute({"name":"header"})</td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="body"
- preparer="org.apache.tiles.test.preparer.AttributeViewPreparer"/></td>
+ <td>$tiles.insertAttribute({"name":"body",
+ "preparer":"org.apache.tiles.test.preparer.AttributeViewPreparer"})</td>
</tr>
-</table>
\ No newline at end of file
+</table>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_roles.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_roles.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_roles.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/layout_roles.vm Mon Mar 9 22:45:57 2009
@@ -21,12 +21,12 @@
*#
<table border="2" width="300" bordercolor="Gray">
<tr>
- <td bgcolor="Blue"><strong>$tiles.getAsString name="title"/></strong></td>
+ <td bgcolor="Blue"><strong>$tiles.getAsString({"name":"title"})</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="header" role="goodrole"/></td>
+ <td>$tiles.insertAttribute({"name":"header", "role":"goodrole"})</td>
</tr>
<tr>
- <td>$tiles.insertAttribute name="body" role="badrole"/></td>
+ <td>$tiles.insertAttribute({"name":"body", "role":"badrole"})</td>
</tr>
</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putallattributeslayout.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putallattributeslayout.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putallattributeslayout.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putallattributeslayout.vm Mon Mar 9 22:45:57 2009
@@ -19,7 +19,7 @@
* under the License.
*
*#
-$tiles.importAttribute/>
+$tiles.importAttribute({})
${one}
<ul>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putattributeslayout.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putattributeslayout.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putattributeslayout.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/putattributeslayout.vm Mon Mar 9 22:45:57 2009
@@ -24,7 +24,7 @@
Single attribute "stringTest" value: $esc.html($stringTest) <br/><br/>
The attribute "list" contains these values:
<ul>
-#foreach($item in $list))
-<li>$tiles.insertAttribute({"value":$item})></li>
+#foreach($item in $list)
+<li>$tiles.insertAttribute({"value":$item})</li>
#end
</ul>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/selectlocale.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/selectlocale.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/selectlocale.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/selectlocale.vm Mon Mar 9 22:45:57 2009
@@ -37,6 +37,6 @@
</select>
<input type="submit" value="Submit" />
</form>
-<div id="defaultLocaleMessage">Your default Locale is ${.locale}</div>
+<div id="defaultLocaleMessage">Your default Locale is ${request.locale}</div>
</body>
</html>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef.vm Mon Mar 9 22:45:57 2009
@@ -19,9 +19,9 @@
* under the License.
*
*#
-$tiles.definition name="templateDefinition" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title." />
- $tiles.putAttribute name="header" value="/velocity/header.vm" />
- $tiles.putAttribute name="body" value="/velocity/body.vm" />
-</...@tiles.definition>
-$tiles.insertDefinition name="templateDefinition" />
\ No newline at end of file
+$tiles.definition().start({"name":"templateDefinition", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"templateDefinition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_extend.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_extend.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_extend.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_extend.vm Mon Mar 9 22:45:57 2009
@@ -19,10 +19,10 @@
* under the License.
*
*#
-$tiles.definition name="test.definition.override.one" extends="velocity.test.definition">
- $tiles.putAttribute name="body" value="/velocity/override.vm" />
-</...@tiles.definition>
-$tiles.definition name="test.definition.override.two" extends="test.definition.override.one">
- $tiles.putAttribute name="title" value="This is an overridden title" />
-</...@tiles.definition>
-$tiles.insertDefinition name="test.definition.override.two" />
+$tiles.definition().start({"name":"test.definition.override.one", "extends":"velocity.test.definition"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/override.vm"})
+$tiles.definition().end()
+$tiles.definition().start({"name":"test.definition.override.two", "extends":"test.definition.override.one"})
+ $tiles.putAttribute({"name":"title", "value":"This is an overridden title"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.definition.override.two"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_list_inherit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_list_inherit.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_list_inherit.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_list_inherit.vm Mon Mar 9 22:45:57 2009
@@ -19,10 +19,10 @@
* under the License.
*
*#
-$tiles.definition name="templateDefinition" extends="test.putAttributes">
- $tiles.putAttribute name="stringTest" value="This is a string" type="string"/>
- $tiles.putListAttribute name="list" inherit=true>
- $tiles.addAttribute value="valueFour" type="string" />
- </...@tiles.putListAttribute>
-</...@tiles.definition>
-$tiles.insertDefinition name="templateDefinition" />
+$tiles.definition().start({"name":"templateDefinition", "extends":"test.putAttributes"})
+ $tiles.putAttribute({"name":"stringTest", "value":"This is a string", "type":"string"})
+ $tiles.putListAttribute().start({"name":"list", "inherit":true})
+ $tiles.addAttribute({"value":"valueFour", "type":"string"})
+ $tiles.putListAttribute().end()
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"templateDefinition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_preparer.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testdef_preparer.vm Mon Mar 9 22:45:57 2009
@@ -19,9 +19,9 @@
* under the License.
*
*#
-$tiles.definition name="templateDefinition" template="/velocity/layout.vm" preparer="org.apache.tiles.test.preparer.TestViewPreparer">
- $tiles.putAttribute name="title" value="This is the title." />
- $tiles.putAttribute name="header" value="/velocity/header.vm" />
- $tiles.putAttribute name="body" value="/velocity/body.vm" />
-</...@tiles.definition>
-$tiles.insertDefinition name="templateDefinition" />
\ No newline at end of file
+$tiles.definition().start({"name":"templateDefinition", "template":"/velocity/layout.vm", "preparer":"org.apache.tiles.test.preparer.TestViewPreparer"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"templateDefinition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.putAttributes" />
+$tiles.insertDefinition({"name":"velocity.test.putAttributes"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_all.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_all.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_all.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_all.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.putAllAttributes" />
\ No newline at end of file
+$tiles.insertDefinition({"name":"velocity.test.putAllAttributes"})
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_inherit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_inherit.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_inherit.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testimportattribute_inherit.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.putAttributes.inherit" />
+$tiles.insertDefinition({"name":"velocity.test.putAttributes.inherit"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition.attribute.preparer" />
+$tiles.insertDefinition({"name":"velocity.test.definition.attribute.preparer"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition.roles" />
+$tiles.insertDefinition({"name":"velocity.test.definition.roles"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition.roles.tags" />
+$tiles.insertDefinition({"name":"velocity.test.definition.roles.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.cascaded.definition" />
+$tiles.insertDefinition({"name":"velocity.test.cascaded.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.cascaded.list.definition" />
+$tiles.insertDefinition({"name":"velocity.test.cascaded.list.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.overridden.cascaded.definition" />
+$tiles.insertDefinition({"name":"velocity.test.overridden.cascaded.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.cascaded.template.definition" />
+$tiles.insertDefinition({"name":"velocity.test.cascaded.template.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm Mon Mar 9 22:45:57 2009
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$tiles.definition name="test.inner.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="/velocity/body.vm"/>
-</...@tiles.definition>
-$tiles.definition name="test.composite.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="test.inner.definition.tags" type="definition"/>
-</...@tiles.definition>
-$tiles.insertDefinition name="test.composite.definition.tags" />
+$tiles.definition().start({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is an inner definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.definition().end()
+$tiles.definition().start({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is a composite definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"test.inner.definition.tags", "type":"definition"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.composite.definition.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm Mon Mar 9 22:45:57 2009
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$tiles.definition name="test.inner.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="/velocity/body.vm"/>
-</...@tiles.definition>
-$tiles.definition name="test.composite.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="test.inner.definition" type="definition"/>
-</...@tiles.definition>
-$tiles.insertDefinition name="test.composite.definition.tags" />
+$tiles.definition().start({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is an inner definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.definition().end()
+$tiles.definition().start({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is a composite definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"test.inner.definition", "type":"definition"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.composite.definition.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm Mon Mar 9 22:45:57 2009
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$tiles.definition name="test.inner.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="/velocity/body.vm"/>
-</...@tiles.definition>
-$tiles.definition name="test.composite.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="test.inner.definition"/>
-</...@tiles.definition>
-$tiles.insertDefinition name="test.composite.definition.tags" />
+$tiles.definition().start({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is an inner definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.definition().end()
+$tiles.definition().start({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is a composite definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"test.inner.definition"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.composite.definition.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm Mon Mar 9 22:45:57 2009
@@ -8,7 +8,6 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
@@ -19,14 +18,14 @@
* under the License.
*
*#
-$tiles.definition name="test.inner.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="/velocity/body.vm"/>
-</...@tiles.definition>
-$tiles.definition name="test.composite.definition.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="test.inner.definition.tags"/>
-</...@tiles.definition>
-$tiles.insertDefinition name="test.composite.definition.tags" />
+$tiles.definition().start({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is an inner definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.definition().end()
+$tiles.definition().start({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is a composite definition with tags."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"test.inner.definition.tags"})
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.composite.definition.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_db.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_db.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_db.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_db.vm Mon Mar 9 22:45:57 2009
@@ -19,5 +19,5 @@
* under the License.
*
*#
-$tiles.setCurrentContainer containerKey="db"/>
-$tiles.insertDefinition name="test.definition" />
+$tiles.setCurrentContainer("db")
+$tiles.insertDefinition({"name":"test.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.defaultvalues.definition" />
+$tiles.insertDefinition({"name":"velocity.test.defaultvalues.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.composite.el.definition" />
+$tiles.insertDefinition({"name":"velocity.test.composite.el.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.composite.el.doNotShow.definition" />
+$tiles.insertDefinition({"name":"velocity.test.composite.el.doNotShow.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_extended_db.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_extended_db.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_extended_db.vm Mon Mar 9 22:45:57 2009
@@ -19,5 +19,5 @@
* under the License.
*
*#
-$tiles.setCurrentContainer containerKey="db"/>
-$tiles.insertDefinition name="test.definition.extended" />
+$tiles.setCurrentContainer("db")
+$tiles.insertDefinition({"name":"test.definition.extended"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_old.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_old.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_old.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_old.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition.old_format" />
+$tiles.insertDefinition({"name":"velocity.test.definition.old_format"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_template.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_template.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_template.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_template.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition" template="/velocity/layout_override.vm" />
+$tiles.insertDefinition({"name":"velocity.test.definition", "template":"/velocity/layout_override.vm"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.reversed.definition" />
+$tiles.insertDefinition({"name":"velocity.test.reversed.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.reversed.explicit.definition" />
+$tiles.insertDefinition({"name":"velocity.test.reversed.explicit.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role.vm Mon Mar 9 22:45:57 2009
@@ -19,5 +19,5 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition.appears.configured" />
-$tiles.insertDefinition name="velocity.test.definition.does_not_appear.configured" />
+$tiles.insertDefinition({"name":"velocity.test.definition.appears.configured"})
+$tiles.insertDefinition({"name":"velocity.test.definition.does_not_appear.configured"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role_tag.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role_tag.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_role_tag.vm Mon Mar 9 22:45:57 2009
@@ -19,5 +19,5 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.definition.appears" role="goodrole" />
-$tiles.insertDefinition name="velocity.test.definition.does_not_appear" role="badrole" />
+$tiles.insertDefinition({"name":"velocity.test.definition.appears", "role":"goodrole"})
+$tiles.insertDefinition({"name":"velocity.test.definition.does_not_appear", "role":"badrole"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_wildcard.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_wildcard.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_wildcard.vm Mon Mar 9 22:45:57 2009
@@ -19,6 +19,6 @@
* under the License.
*
*#
-$tiles.setCurrentContainer containerKey="alternate" />
-$tiles.insertDefinition name="velocity.test.definitionOne.messageHello" />
-$tiles.insertDefinition name="velocity.test.definitionTwo.messageBye" />
+$tiles.setCurrentContainer("alternate")
+$tiles.insertDefinition({"name":"velocity.test.definitionOne.messageHello"})
+$tiles.insertDefinition({"name":"velocity.test.definitionTwo.messageBye"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.nesting.definitions" />
+$tiles.insertDefinition({"name":"velocity.test.nesting.definitions"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm Mon Mar 9 22:45:57 2009
@@ -19,15 +19,15 @@
* under the License.
*
*#
-$tiles.definition name="test.nesting.definitions.tags" template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body">
- $tiles.definition template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is a nested definition."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="/velocity/body.vm"/>
- </...@tiles.definition>
- </...@tiles.putAttribute>
-</...@tiles.definition>
-$tiles.insertDefinition name="test.nesting.definitions.tags" />
+$tiles.definition().start({"name":"test.nesting.definitions.tags", "template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute().start({"name":"body"})
+ $tiles.definition().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is a nested definition."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+ $tiles.definition().end()
+ $tiles.putAttribute().end()
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.nesting.definitions.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition.vm Mon Mar 9 22:45:57 2009
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.nesting.list.definitions" />
+$tiles.insertDefinition({"name":"velocity.test.nesting.list.definitions"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm Mon Mar 9 22:45:57 2009
@@ -19,17 +19,17 @@
* under the License.
*
*#
-$tiles.definition name="test.nesting.definitions.tags" template="/velocity/layout_list.vm">
- $tiles.putAttribute name="title" value="This is the title."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putListAttribute name="list">
- $tiles.addAttribute>
- $tiles.definition template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is a nested definition."/>
- $tiles.putAttribute name="header" value="/velocity/header.vm"/>
- $tiles.putAttribute name="body" value="/velocity/body.vm"/>
- </...@tiles.definition>
- </...@tiles.addAttribute>
- </...@tiles.putListAttribute>
-</...@tiles.definition>
-$tiles.insertDefinition name="test.nesting.definitions.tags" />
+$tiles.definition().start({"name":"test.nesting.definitions.tags", "template":"/velocity/layout_list.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putListAttribute().start({"name":"list"})
+ $tiles.addAttribute().start({})
+ $tiles.definition().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is a nested definition."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+ $tiles.definition().end()
+ $tiles.addAttribute().end()
+ $tiles.putListAttribute().end()
+$tiles.definition().end()
+$tiles.insertDefinition({"name":"test.nesting.definitions.tags"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded.vm Mon Mar 9 22:45:57 2009
@@ -19,8 +19,8 @@
* under the License.
*
*#
-$tiles.insertTemplate template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title." cascade=true />
- $tiles.putAttribute name="header" value="/velocity/header.vm" cascade=true />
- $tiles.putAttribute name="body" value="test.inner.cascadable.definition" />
-</...@tiles.insertTemplate>
\ No newline at end of file
+$tiles.insertTemplate().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title.", "cascade":true})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm", "cascade":true})
+ $tiles.putAttribute({"name":"body", "value":"test.inner.cascadable.definition"})
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_overridden.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_overridden.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_overridden.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_overridden.vm Mon Mar 9 22:45:57 2009
@@ -19,8 +19,8 @@
* under the License.
*
*#
-$tiles.insertTemplate template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title." cascade=true />
- $tiles.putAttribute name="header" value="/velocity/alternate-header.vm" cascade=true />
- $tiles.putAttribute name="body" value="test.inner.definition" />
-</...@tiles.insertTemplate>
\ No newline at end of file
+$tiles.insertTemplate().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title.", "cascade":true})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/alternate-header.vm", "cascade":true})
+ $tiles.putAttribute({"name":"body", "value":"test.inner.definition"})
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_template.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_template.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_template.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_cascaded_template.vm Mon Mar 9 22:45:57 2009
@@ -19,8 +19,8 @@
* under the License.
*
*#
-$tiles.insertTemplate template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title." cascade=true />
- $tiles.putAttribute name="header" value="/velocity/header.vm" cascade=true />
- $tiles.putAttribute name="body" value="/velocity/layout_nobody.vm" />
-</...@tiles.insertTemplate>
\ No newline at end of file
+$tiles.insertTemplate().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title.", "cascade":true})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm", "cascade":true})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/layout_nobody.vm"})
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el_singleeval.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el_singleeval.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el_singleeval.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el_singleeval.vm Mon Mar 9 22:45:57 2009
@@ -19,11 +19,11 @@
* under the License.
*
*#
-<#assign doNotShowBody="$" + "{" + "requestScope.doNotShow}" />
-<#assign doNotShow="DO NOT SHOW!!!" />
+#set($doNotShowBody="$" + "{" + "requestScope.doNotShow}")
+#set($doNotShow="DO NOT SHOW!!!")
-$tiles.insertTemplate template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title." />
- $tiles.putAttribute name="header" value="/velocity/header.vm" />
- $tiles.putAttribute name="body" value=doNotShowBody />
-</...@tiles.insertTemplate>
\ No newline at end of file
+$tiles.insertTemplate().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":$doNotShowBody})
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed.vm Mon Mar 9 22:45:57 2009
@@ -19,8 +19,8 @@
* under the License.
*
*#
-$tiles.insertTemplate template="/velocity/layout_alt_title.vm">
- $tiles.putAttribute name="title" value="This is the title." type="reversed" />
- $tiles.putAttribute name="header" value="/velocity/header.vm" />
- $tiles.putAttribute name="body" value="/velocity/body.vm" />
-</...@tiles.insertTemplate>
\ No newline at end of file
+$tiles.insertTemplate().start({"template":"/velocity/layout_alt_title.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title.", "type":"reversed"})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed_explicit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed_explicit.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed_explicit.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_reversed_explicit.vm Mon Mar 9 22:45:57 2009
@@ -19,9 +19,9 @@
* under the License.
*
*#
-$tiles.insertTemplate template="/velocity/layout_alt_title.vm">
- $tiles.putAttribute name="title" value="This is the title."
- type="org.apache.tiles.test.renderer.ReverseStringAttributeRenderer" />
- $tiles.putAttribute name="header" value="/velocity/header.vm" />
- $tiles.putAttribute name="body" value="/velocity/body.vm" />
-</...@tiles.insertTemplate>
\ No newline at end of file
+$tiles.insertTemplate().start({"template":"/velocity/layout_alt_title.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title.",
+ "type":"org.apache.tiles.test.renderer.ReverseStringAttributeRenderer"})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm"})
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm Mon Mar 9 22:45:57 2009
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$tiles.insertTemplate template="/velocity/layout.vm">
- $tiles.putAttribute name="title" value="This is the title." />
- $tiles.putAttribute name="header" value="/velocity/header.vm" />
- $tiles.putAttribute name="body" value="/velocity/putattributeslayout.vm" />
- $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
+$tiles.insertTemplate().start({"template":"/velocity/layout.vm"})
+ $tiles.putAttribute({"name":"title", "value":"This is the title."})
+ $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/putattributeslayout.vm"})
+ $tiles.putAttribute({"name":"stringTest", "value":"This is a string", "type":"string", "cascade":true})
+ $tiles.putListAttribute().start({"name":"list", "cascade":true})
+ $tiles.addAttribute({"value":"valueOne", "type":"string"})
+ $tiles.addAttribute({"value":"valueTwo", "type":"string"})
+ $tiles.addAttribute({"value":"valueThree", "type":"string"})
+ $tiles.putListAttribute().end()
+$tiles.insertTemplate().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_inherit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_inherit.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_inherit.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_inherit.vm Mon Mar 9 22:45:57 2009
@@ -19,8 +19,8 @@
* under the License.
*
*#
-$tiles.insertDefinition name="velocity.test.putAttributes">
- $tiles.putListAttribute name="list" inherit=true>
- $tiles.addAttribute value="valueFour" type="string" />
- </...@tiles.putListAttribute>
-</...@tiles.insertDefinition>
+$tiles.insertDefinition().start({"name":"velocity.test.putAttributes"})
+ $tiles.putListAttribute().start({"name":"list", "inherit":true})
+ $tiles.addAttribute({"value":"valueFour", "type":"string"})
+ $tiles.putListAttribute().end()
+$tiles.insertDefinition().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm?rev=751891&r1=751890&r2=751891&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm Mon Mar 9 22:45:57 2009
@@ -19,7 +19,7 @@
* under the License.
*
*#
-$tiles.setCurrentContainer containerKey="alternate" />
-$tiles.insertDefinition name="velocity.test.definition" />
-$tiles.setCurrentContainer />
-$tiles.insertDefinition name="velocity.test.definition" />
+$tiles.setCurrentContainer("alternate")
+$tiles.insertDefinition({"name":"velocity.test.definition"})
+$tiles.setCurrentContainer(null)
+$tiles.insertDefinition({"name":"velocity.test.definition"})