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 2010/01/26 22:05:52 UTC
svn commit: r903417 [1/3] - in /tiles/sandbox/trunk/tiles3: ./
src/site/apt/tutorial/integration/
tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/
tiles-test-pom/tiles-test/ tiles-test-pom/tiles-test/src/main/webapp/...
Author: apetrelli
Date: Tue Jan 26 21:05:34 2010
New Revision: 903417
URL: http://svn.apache.org/viewvc?rev=903417&view=rev
Log:
TILES-490
Merge from trunk to sandboxed Tiles 3.
Added:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BlockDirective.java
- copied unchanged from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BlockDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyBlockDirective.java
- copied unchanged from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyBlockDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/resources/META-INF/
- copied from r902966, tiles/framework/trunk/tiles-velocity/src/main/resources/META-INF/
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/resources/META-INF/velocity.properties
- copied unchanged from r902966, tiles/framework/trunk/tiles-velocity/src/main/resources/META-INF/velocity.properties
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BlockDirectiveTest.java
- copied unchanged from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BlockDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java
- copied unchanged from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java
- copied, changed from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java
Removed:
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_freemarker.vm
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed_explicit.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_overridden.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_template.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el_singleeval.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_flush.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_reversed.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_reversed_explicit.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_servlet.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_cascaded.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_inherit.vm
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testsetcurrentcontainer.vm
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Tiles2Tool.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/TilesVelocityRepository.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 21:05:34 2010
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966
Modified: tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt Tue Jan 26 21:05:34 2010
@@ -35,6 +35,21 @@
* Add <<<tiles-template-x.x.x.jar>>> and <<<tiles-velocity-x.x.x.jar>>> files
to your application.
+ * Add this code in you <<<velocity.properties>>> file:
+
+----------------------------------
+userdirective=org.apache.tiles.velocity.template.AddAttributeDirective,\
+ org.apache.tiles.velocity.template.AddListAttributeDirective,\
+ org.apache.tiles.velocity.template.DefinitionDirective,\
+ org.apache.tiles.velocity.template.GetAsStringDirective,\
+ org.apache.tiles.velocity.template.ImportAttributeDirective,\
+ org.apache.tiles.velocity.template.InsertAttributeDirective,\
+ org.apache.tiles.velocity.template.InsertDefinitionDirective,\
+ org.apache.tiles.velocity.template.InsertTemplateDirective,\
+ org.apache.tiles.velocity.template.PutAttributeDirective,\
+ org.apache.tiles.velocity.template.PutListAttributeDirective
+----------------------------------
+
* To access ".vm" files from HTTP requests, add this piece of configuration in <<<web.xml>>>
(the parameters can be modified as needed).
@@ -87,9 +102,9 @@
* Usage in Velocity templates
- There are two Velocity tools that will be available to your application:
+ There are two ways to use Tiles-Velocity integration:
- * the <<<tilesAlt>>> tool, that is a Velocity-style tool:
+ * the <<<tiles>>> tool, that is a Velocity-style tool:
----------------------------------
$tilesAlt.startAttributeContext()
@@ -113,14 +128,14 @@
$tilesAlt.endAttributeContext()
----------------------------------
- * the <<<tiles>>> tool, that has both Velocity-style methods and directive oriented methods.
+ * the <<<tiles>>> directives, that have a tag-like meaning.
----------------------------------
-$tiles.insertTemplate.start({"template":"/page/myTemplate.vm"})
- $tiles.putAttribute({"name":"title", "value":"This is the title."})
- $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$tiles.insertTemplate().end()
+#tiles_insertTemplate({"template":"/page/myTemplate.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is the title."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
----------------------------------
- For details about directives see the {{{../../apidocs/index.html}Javadocs}}.
+ For details about the tool and directives see the {{{../../apidocs/index.html}Javadocs}}.
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 21:05:34 2010
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm Tue Jan 26 21:05:34 2010
@@ -20,4 +20,4 @@
*
*#
$tiles.setCurrentContainer("alternate")
-$tiles.insertDefinition({"name" : "velocity.test.definition.alt"})
+#tiles_insertDefinition({"name" : "velocity.test.definition.alt"})#end
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 26 21:05:34 2010
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties Tue Jan 26 21:05:34 2010
@@ -116,3 +116,14 @@
# ----------------------------------------------------------------------------
resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl
resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl
+
+userdirective=org.apache.tiles.velocity.template.AddAttributeDirective,\
+ org.apache.tiles.velocity.template.AddListAttributeDirective,\
+ org.apache.tiles.velocity.template.DefinitionDirective,\
+ org.apache.tiles.velocity.template.GetAsStringDirective,\
+ org.apache.tiles.velocity.template.ImportAttributeDirective,\
+ org.apache.tiles.velocity.template.InsertAttributeDirective,\
+ org.apache.tiles.velocity.template.InsertDefinitionDirective,\
+ org.apache.tiles.velocity.template.InsertTemplateDirective,\
+ org.apache.tiles.velocity.template.PutAttributeDirective,\
+ org.apache.tiles.velocity.template.PutListAttributeDirective
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body"})</td>
+ <td>#tiles_insertAttribute({"name":"body"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body"})</td>
+ <td>#tiles_insertAttribute({"name":"body"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body"})</td>
+ <td>#tiles_insertAttribute({"name":"body"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm Tue Jan 26 21:05:34 2010
@@ -21,12 +21,12 @@
*#
<table border="2" width="300" bordercolor="Gray">
<tr>
- <td bgcolor="Blue"><strong>$tiles.insertAttribute({"name":"title"})</strong></td>
+ <td bgcolor="Blue"><strong>#tiles_insertAttribute({"name":"title"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body"})</td>
+ <td>#tiles_insertAttribute({"name":"body"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm Tue Jan 26 21:05:34 2010
@@ -21,18 +21,18 @@
*#
<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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
<td>
- $tiles.insertAttribute().start({"name":"body"})
- $tiles.putAttribute({"name":"title", "value":"This is a customized context"})
- $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
- $tiles.insertAttribute().end()
+ #tiles_insertAttribute({"name":"body"})
+ #tiles_putAttribute({"name":"title", "value":"This is a customized context"})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+ #end
</td>
</tr>
</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm Tue Jan 26 21:05:34 2010
@@ -21,12 +21,12 @@
*#
<table border="2" width="300" bordercolor="Gray">
<tr>
- <td bgcolor="Blue"><strong>$tiles.insertAttribute({"name":"title", "defaultValue":"This is the default title."})</strong></td>
+ <td bgcolor="Blue"><strong>#tiles_insertAttribute({"name":"title", "defaultValue":"This is the default title."})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header", "defaultValue":"alternate-header.vm", "defaultValueType":"template"})</td>
+ <td>#tiles_insertAttribute({"name":"header", "defaultValue":"alternate-header.vm", "defaultValueType":"template"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body", "defaultValue":"This is the default body in the tag."})</td>
+ <td>#tiles_insertAttribute({"name":"body", "defaultValue":"This is the default body in the tag."})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header", "flush":"true"})</td>
+ <td>#tiles_insertAttribute({"name":"header", "flush":"true"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body", "flush":"true"})</td>
+ <td>#tiles_insertAttribute({"name":"body", "flush":"true"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header", "ignore":true})</td>
+ <td>#tiles_insertAttribute({"name":"header", "ignore":true})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body"})</td>
+ <td>#tiles_insertAttribute({"name":"body"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm Tue Jan 26 21:05:34 2010
@@ -21,16 +21,16 @@
*#
<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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
<td>
- $tiles.importAttribute({"name":"list"})
+ #tiles_importAttribute({"name":"list"})
#foreach($attribute in $list)
- $tiles.insertAttribute({"value":$attribute})
+ #tiles_insertAttribute({"value":$attribute})#end
#end
</td>
</tr>
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
</table>
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body"})</td>
+ <td>#tiles_insertAttribute({"name":"body"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header"})</td>
+ <td>#tiles_insertAttribute({"name":"header"})#end</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"})#end</td>
</tr>
</table>
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end</strong></td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"header", "role":"goodrole"})</td>
+ <td>#tiles_insertAttribute({"name":"header", "role":"goodrole"})#end</td>
</tr>
<tr>
- <td>$tiles.insertAttribute({"name":"body", "role":"badrole"})</td>
+ <td>#tiles_insertAttribute({"name":"body", "role":"badrole"})#end</td>
</tr>
-</table>
\ No newline at end of file
+</table>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm Tue Jan 26 21:05:34 2010
@@ -19,7 +19,7 @@
* under the License.
*
*#
-$tiles.importAttribute({})
+#tiles_importAttribute({})
${one}
<ul>
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm Tue Jan 26 21:05:34 2010
@@ -19,12 +19,12 @@
* under the License.
*
*#
-$tiles.importAttribute({"name":"stringTest"})
-$tiles.importAttribute({"name":"list"})
+#tiles_importAttribute({"name":"stringTest"})
+#tiles_importAttribute({"name":"list"})
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>
+<li>#tiles_insertAttribute({"value":$item})#end</li>
#end
</ul>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm Tue Jan 26 21:05:34 2010
@@ -19,9 +19,9 @@
* under the License.
*
*#
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$tiles.definition().end()
-$tiles.insertDefinition({"name":"templateDefinition"})
+#tiles_definition({"name":"templateDefinition", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is the title."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
+#tiles_insertDefinition({"name":"templateDefinition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm Tue Jan 26 21:05:34 2010
@@ -19,10 +19,10 @@
* under the License.
*
*#
-$tiles.definition().start({"name":"test.definition.override.one", "extends":"velocity.test.definition"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/override.vm", "type":"velocity"})
-$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"})
+#tiles_definition({"name":"test.definition.override.one", "extends":"velocity.test.definition"})
+ #tiles_putAttribute({"name":"body", "value":"/velocity/override.vm", "type":"velocity"})#end
+#end
+#tiles_definition({"name":"test.definition.override.two", "extends":"test.definition.override.one"})
+ #tiles_putAttribute({"name":"title", "value":"This is an overridden title"})#end
+#end
+#tiles_insertDefinition({"name":"test.definition.override.two"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm Tue Jan 26 21:05:34 2010
@@ -19,10 +19,10 @@
* under the License.
*
*#
-$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"})
+#tiles_definition({"name":"templateDefinition", "extends":"test.putAttributes"})
+ #tiles_putAttribute({"name":"stringTest", "value":"This is a string", "type":"string"})#end
+ #tiles_putListAttribute({"name":"list", "inherit":true})
+ #tiles_addAttribute({"value":"valueFour", "type":"string"})#end
+ #end
+#end
+#tiles_insertDefinition({"name":"templateDefinition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm Tue Jan 26 21:05:34 2010
@@ -19,9 +19,9 @@
* under the License.
*
*#
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$tiles.definition().end()
-$tiles.insertDefinition({"name":"templateDefinition"})
+#tiles_definition({"name":"templateDefinition", "template":"/velocity/layout.vm", "preparer":"org.apache.tiles.test.preparer.TestViewPreparer"})
+ #tiles_putAttribute({"name":"title", "value":"This is the title."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
+#tiles_insertDefinition({"name":"templateDefinition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.putAttributes"})
+#tiles_insertDefinition({"name":"velocity.test.putAttributes"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.putAttributes.inherit"})
+#tiles_insertDefinition({"name":"velocity.test.putAttributes.inherit"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name" : "velocity.test.definition"})
+#tiles_insertDefinition({"name" : "velocity.test.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.attribute.preparer"})
+#tiles_insertDefinition({"name":"velocity.test.definition.attribute.preparer"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.roles"})
+#tiles_insertDefinition({"name":"velocity.test.definition.roles"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.roles.tags"})
+#tiles_insertDefinition({"name":"velocity.test.definition.roles.tags"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.cascaded.definition"})
+#tiles_insertDefinition({"name":"velocity.test.cascaded.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.cascaded.list.definition"})
+#tiles_insertDefinition({"name":"velocity.test.cascaded.list.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.overridden.cascaded.definition"})
+#tiles_insertDefinition({"name":"velocity.test.overridden.cascaded.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.cascaded.template.definition"})
+#tiles_insertDefinition({"name":"velocity.test.cascaded.template.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.classpath.definition"})
+#tiles_insertDefinition({"name":"velocity.classpath.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.composite.definition"})
+#tiles_insertDefinition({"name":"velocity.test.composite.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm Tue Jan 26 21:05:34 2010
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"test.inner.definition.tags", "type":"definition"})
-$tiles.definition().end()
-$tiles.insertDefinition({"name":"test.composite.definition.tags"})
+#tiles_definition({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is an inner definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
+#tiles_definition({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is a composite definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"test.inner.definition.tags", "type":"definition"})#end
+#end
+#tiles_insertDefinition({"name":"test.composite.definition.tags"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm Tue Jan 26 21:05:34 2010
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"test.inner.definition", "type":"definition"})
-$tiles.definition().end()
-$tiles.insertDefinition({"name":"test.composite.definition.tags"})
+#tiles_definition({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is an inner definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
+#tiles_definition({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is a composite definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"test.inner.definition", "type":"definition"})#end
+#end
+#tiles_insertDefinition({"name":"test.composite.definition.tags"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm Tue Jan 26 21:05:34 2010
@@ -19,14 +19,14 @@
* under the License.
*
*#
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"test.inner.definition"})
-$tiles.definition().end()
-$tiles.insertDefinition({"name":"test.composite.definition.tags"})
+#tiles_definition({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is an inner definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
+#tiles_definition({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is a composite definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"test.inner.definition"})#end
+#end
+#tiles_insertDefinition({"name":"test.composite.definition.tags"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm Tue Jan 26 21:05:34 2010
@@ -18,14 +18,14 @@
* under the License.
*
*#
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})
-$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", "type":"velocity"})
- $tiles.putAttribute({"name":"body", "value":"test.inner.definition.tags"})
-$tiles.definition().end()
-$tiles.insertDefinition({"name":"test.composite.definition.tags"})
+#tiles_definition({"name":"test.inner.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is an inner definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end
+#end
+#tiles_definition({"name":"test.composite.definition.tags", "template":"/velocity/layout.vm"})
+ #tiles_putAttribute({"name":"title", "value":"This is a composite definition with tags."})#end
+ #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end
+ #tiles_putAttribute({"name":"body", "value":"test.inner.definition.tags"})#end
+#end
+#tiles_insertDefinition({"name":"test.composite.definition.tags"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm Tue Jan 26 21:05:34 2010
@@ -20,4 +20,4 @@
*
*#
$tiles.setCurrentContainer("db")
-$tiles.insertDefinition({"name":"test.definition"})
+#tiles_insertDefinition({"name":"test.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.defaultvalues.definition"})
+#tiles_insertDefinition({"name":"velocity.test.defaultvalues.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.composite.el.definition"})
+#tiles_insertDefinition({"name":"velocity.test.composite.el.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.exception"})
+#tiles_insertDefinition({"name":"velocity.test.definition.exception"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm Tue Jan 26 21:05:34 2010
@@ -20,4 +20,4 @@
*
*#
$tiles.setCurrentContainer("db")
-$tiles.insertDefinition({"name":"test.definition.extended"})
+#tiles_insertDefinition({"name":"test.definition.extended"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.flush", "flush":"true"})
+#tiles_insertDefinition({"name":"velocity.test.definition.flush", "flush":"true"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.ignore"})
+#tiles_insertDefinition({"name":"velocity.test.definition.ignore"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm Tue Jan 26 21:05:34 2010
@@ -19,9 +19,8 @@
* under the License.
*
*#
-#define($inlineContent)
+#tiles_insertDefinition({"name":"velocity.test.definition"})
+#tiles_putAttribute({"name":"body", "value":$inlineContent.toString()})
<div align="center"><b><i>This is an inline content</i></b></div>
#end
-$tiles.insertDefinition().start({"name":"velocity.test.definition"})
- $tiles.putAttribute({"name":"body", "value":$inlineContent.toString()})
-$tiles.insertDefinition().end()
+#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.composite.mvel.definition"})
+#tiles_insertDefinition({"name":"velocity.test.composite.mvel.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.composite.ognl.definition"})
+#tiles_insertDefinition({"name":"velocity.test.composite.ognl.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.definition.old_format"})
+#tiles_insertDefinition({"name":"velocity.test.definition.old_format"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.test.openbody.definition"})
+#tiles_insertDefinition({"name":"velocity.test.openbody.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm Tue Jan 26 21:05:34 2010
@@ -19,6 +19,6 @@
* under the License.
*
*#
-$tiles.insertDefinition().start({"name":"velocity.test.definition"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/override.vm", "type":"velocity"})
-$tiles.insertDefinition().end()
+#tiles_insertDefinition({"name":"velocity.test.definition"})
+ #tiles_putAttribute({"name":"body", "value":"/velocity/override.vm", "type":"velocity"})#end
+#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm Tue Jan 26 21:05:34 2010
@@ -20,9 +20,9 @@
*
*#
Overridden content:<br/>
-$tiles.insertDefinition().start({"name":"velocity.test.definition"})
- $tiles.putAttribute({"name":"body", "value":"/velocity/override.vm", "type":"velocity"})
-$tiles.insertDefinition().end()
+#tiles_insertDefinition({"name":"velocity.test.definition"})
+ #tiles_putAttribute({"name":"body", "value":"/velocity/override.vm", "type":"velocity"})#end
+#end
<br/>
Not overridden content:<br/>
-$tiles.insertDefinition({"name":"velocity.test.definition"})
+#tiles_insertDefinition({"name":"velocity.test.definition"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm Tue Jan 26 21:05:34 2010
@@ -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"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.preparer.definition", "preparer":"org.apache.tiles.test.preparer.TestViewPreparer"})
+#tiles_insertDefinition({"name":"velocity.preparer.definition", "preparer":"org.apache.tiles.test.preparer.TestViewPreparer"})#end
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm?rev=903417&r1=903416&r2=903417&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm Tue Jan 26 21:05:34 2010
@@ -19,4 +19,4 @@
* under the License.
*
*#
-$tiles.insertDefinition({"name":"velocity.preparer.definition.configured"})
+#tiles_insertDefinition({"name":"velocity.preparer.definition.configured"})#end