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/04 14:00:39 UTC
svn commit: r749995 [2/2] - in
/tiles/sandbox/trunk/tiles-test-sandbox/src/main:
java/org/apache/tiles/test/factory/ java/org/apache/tiles/test/velocity/
resources/org/apache/tiles/ webapp/ webapp/WEB-INF/
webapp/WEB-INF/velocity/ webapp/velocity/
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testimportattribute_inherit.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testimportattribute_inherit.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.putAttributes.inherit" />
+$tiles.insertDefinition name="velocity.test.putAttributes.inherit" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_attribute_preparer.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_attribute_preparer.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_attribute_roles.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_attribute_roles.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_attribute_roles_tags.ftl 747725 2009-02-25 10:22:04Z apetrelli $
+ * $Id: testinsertdefinition_attribute_roles_tags.vm 747725 2009-02-25 10:22:04Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_cascaded.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_cascaded.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_cascaded_list.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_cascaded_list.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_cascaded_overridden.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_cascaded_overridden.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_cascaded_template.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_cascaded_template.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.cascaded.template.definition" />
+$tiles.insertDefinition name="velocity.test.cascaded.template.definition" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_classpath.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_classpath.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_classpath.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_classpath.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_classpath.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_classpath.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.classpath.definition" />
+$tiles.insertDefinition({"name":"velocity.classpath.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_composite.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_composite.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_composite.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.composite.definition" />
+$tiles.insertDefinition({"name":"velocity.test.composite.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_composite_tags.ftl 742994 2009-02-10 15:23:34Z apetrelli $
+ * $Id: testinsertdefinition_composite_tags.vm 742994 2009-02-10 15:23:34Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,14 +19,14 @@
* under the License.
*
*#
-<@tiles.definition name="test.inner.definition.tags" template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
+$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="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="test.inner.definition.tags" type="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.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_composite_tags_includes_configured.ftl 742994 2009-02-10 15:23:34Z apetrelli $
+ * $Id: testinsertdefinition_composite_tags_includes_configured.vm 742994 2009-02-10 15:23:34Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,14 +19,14 @@
* under the License.
*
*#
-<@tiles.definition name="test.inner.definition.tags" template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
+$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="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="test.inner.definition" type="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.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_composite_tags_includes_configured_notype.ftl 742994 2009-02-10 15:23:34Z apetrelli $
+ * $Id: testinsertdefinition_composite_tags_includes_configured_notype.vm 742994 2009-02-10 15:23:34Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,14 +19,14 @@
* under the License.
*
*#
-<@tiles.definition name="test.inner.definition.tags" template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
+$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="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="test.inner.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.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_composite_tags_notype.ftl 742994 2009-02-10 15:23:34Z apetrelli $
+ * $Id: testinsertdefinition_composite_tags_notype.vm 742994 2009-02-10 15:23:34Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,14 +19,14 @@
* under the License.
*
*#
-<@tiles.definition name="test.inner.definition.tags" template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is an inner definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
+$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="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is a composite definition with tags."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="test.inner.definition.tags"/>
+$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.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_db.ftl 744100 2009-02-13 12:37:06Z apetrelli $
+ * $Id: testinsertdefinition_db.vm 744100 2009-02-13 12:37:06Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,5 +19,5 @@
* under the License.
*
*#
-<@tiles.setCurrentContainer containerKey="db"/>
-<@tiles.insertDefinition name="test.definition" />
+$tiles.setCurrentContainer containerKey="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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_defaultvalues.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_defaultvalues.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_el.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_el.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_el_singleeval.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_el_singleeval.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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_exception.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_exception.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_exception.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_exception.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_exception.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_exception.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.exception" />
+$tiles.insertDefinition({"name":"velocity.test.definition.exception"})
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_extended_db.ftl 744100 2009-02-13 12:37:06Z apetrelli $
+ * $Id: testinsertdefinition_extended_db.vm 744100 2009-02-13 12:37:06Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,5 +19,5 @@
* under the License.
*
*#
-<@tiles.setCurrentContainer containerKey="db"/>
-<@tiles.insertDefinition name="test.definition.extended" />
+$tiles.setCurrentContainer containerKey="db"/>
+$tiles.insertDefinition name="test.definition.extended" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_flush.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_flush.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_flush.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_flush.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_flush.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_flush.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.flush" flush="true"/>
+$tiles.insertDefinition({"name":"velocity.test.definition.flush", "flush":"true"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_freemarker.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_freemarker.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_freemarker.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_freemarker.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_freemarker.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_velocity.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.freemarker" />
+$tiles.insertDefinition name="velocity.test.definition.velocity" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_ignore.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_ignore.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_ignore.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_ignore.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_ignore.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_ignore.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.ignore" />
+$tiles.insertDefinition({"name":"velocity.test.definition.ignore"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_inline.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_inline.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_inline.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_inline.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_inline.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_inline.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,9 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition">
- <@tiles.putAttribute name="body">
+#define($inlineContent)
<div align="center"><b><i>This is an inline content</i></b></div>
- </...@tiles.putAttribute>
-</...@tiles.insertDefinition>
+#end
+$tiles.insertDefinition().start({"name":"velocity.test.definition"})
+ $tiles.putAttribute({"name":"body", "value":$inlineContent.toString()})
+$tiles.insertDefinition().end()
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_old.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_old.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.old_format" />
+$tiles.insertDefinition name="velocity.test.definition.old_format" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_openbody.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_openbody.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_openbody.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_openbody.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_openbody.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_openbody.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.openbody.definition" />
+$tiles.insertDefinition({"name":"velocity.test.openbody.definition"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_override.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testinsertdefinition_override.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,6 +19,6 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition">
- <@tiles.putAttribute name="body" value="/freemarker/override.ftl" />
-</...@tiles.insertDefinition>
+$tiles.insertDefinition().start({"name":"velocity.test.definition"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/override.vm"})
+$tiles.insertDefinition().end()
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_override_and_not.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testinsertdefinition_override_and_not.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,9 +20,9 @@
*
*#
Overridden content:<br/>
-<@tiles.insertDefinition name="freemarker.test.definition">
- <@tiles.putAttribute name="body" value="/freemarker/override.ftl" />
-</...@tiles.insertDefinition>
+$tiles.insertDefinition().start({"name":"velocity.test.definition"})
+ $tiles.putAttribute({"name":"body", "value":"/velocity/override.vm"})
+$tiles.insertDefinition().end()
<br/>
Not overridden content:<br/>
-<@tiles.insertDefinition name="freemarker.test.definition" />
+$tiles.insertDefinition({"name":"velocity.test.definition"})
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_override_template.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testinsertdefinition_override_template.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition" template="/freemarker/layout_override.ftl" />
+$tiles.insertDefinition name="velocity.test.definition" template="/velocity/layout_override.vm" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_preparer.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_preparer.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.preparer.definition" preparer="org.apache.tiles.test.preparer.TestViewPreparer" />
+$tiles.insertDefinition({"name":"velocity.preparer.definition", "preparer":"org.apache.tiles.test.preparer.TestViewPreparer"})
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_preparer_configured.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_preparer_configured.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.preparer.definition.configured"/>
+$tiles.insertDefinition({"name":"velocity.preparer.definition.configured"})
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_reversed.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_reversed.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_reversed_explicit.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_reversed_explicit.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_role.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_role.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,5 +19,5 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.appears.configured" />
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_role_tag.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_role_tag.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,5 +19,5 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.definition.appears" role="goodrole" />
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertdefinition_wildcard.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertdefinition_wildcard.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,6 +19,6 @@
* under the License.
*
*#
-<@tiles.setCurrentContainer containerKey="alternate" />
-<@tiles.insertDefinition name="freemarker.test.definitionOne.messageHello" />
-<@tiles.insertDefinition name="freemarker.test.definitionTwo.messageBye" />
+$tiles.setCurrentContainer containerKey="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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertnesteddefinition.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertnesteddefinition.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertnesteddefinition_tags.ftl 742994 2009-02-10 15:23:34Z apetrelli $
+ * $Id: testinsertnesteddefinition_tags.vm 742994 2009-02-10 15:23:34Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,15 +19,15 @@
* under the License.
*
*#
-<@tiles.definition name="test.nesting.definitions.tags" template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body">
- <@tiles.definition template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is a nested definition."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
+$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.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertnestedlistdefinition.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testinsertnestedlistdefinition.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,4 +19,4 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testinsertnestedlistdefinition_tags.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testinsertnestedlistdefinition_tags.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,17 +19,17 @@
* under the License.
*
*#
-<@tiles.definition name="test.nesting.definitions.tags" template="/freemarker/layout_list.ftl">
- <@tiles.putAttribute name="title" value="This is the title."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putListAttribute name="list">
- <@tiles.addAttribute>
- <@tiles.definition template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is a nested definition."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
+$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.insertDefinition name="test.nesting.definitions.tags" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testput.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
+$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/body.vm" />
</...@tiles.insertTemplate>
\ No newline at end of file
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_cascaded.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testput_cascaded.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." cascade=true />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" cascade=true />
- <@tiles.putAttribute name="body" value="test.inner.cascadable.definition" />
+$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
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_cascaded_overridden.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testput_cascaded_overridden.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." cascade=true />
- <@tiles.putAttribute name="header" value="/freemarker/alternate-header.ftl" cascade=true />
- <@tiles.putAttribute name="body" value="test.inner.definition" />
+$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
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_cascaded_template.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testput_cascaded_template.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." cascade=true />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" cascade=true />
- <@tiles.putAttribute name="body" value="/freemarker/layout_nobody.ftl" />
+$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
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_el.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_el.ftl 742199 2009-02-08 23:05:44Z apetrelli $
+ * $Id: testput_el.vm 742199 2009-02-08 23:05:44Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,8 +21,8 @@
*#
<#assign bodyContent="Body Content defined by and el" />
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value=bodyContent />
+$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=bodyContent />
</...@tiles.insertTemplate>
\ No newline at end of file
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_el_singleeval.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testput_el_singleeval.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,8 +22,8 @@
<#assign doNotShowBody="$" + "{" + "requestScope.doNotShow}" />
<#assign doNotShow="DO NOT SHOW!!!" />
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value=doNotShowBody />
+$tiles.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
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_flush.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_flush.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_flush.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_flush.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_flush.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testput_flush.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout.ftl" flush="true">
- <@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
+$tiles.insertTemplate template="/velocity/layout.vm" flush="true">
+ $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.insertTemplate>
\ No newline at end of file
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_reversed.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testput_reversed.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout_alt_title.ftl">
- <@tiles.putAttribute name="title" value="This is the title." type="reversed" />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
+$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
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_reversed_explicit.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testput_reversed_explicit.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,9 +19,9 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout_alt_title.ftl">
- <@tiles.putAttribute name="title" value="This is the title."
+$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="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
+ $tiles.putAttribute name="header" value="/velocity/header.vm" />
+ $tiles.putAttribute name="body" value="/velocity/body.vm" />
</...@tiles.insertTemplate>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_servlet.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_servlet.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_servlet.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testput_servlet.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testput_servlet.ftl 742199 2009-02-08 23:05:44Z apetrelli $
+ * $Id: testput_servlet.vm 742199 2009-02-08 23:05:44Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/servlets/layoutServlet">
- <@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
+$tiles.insertTemplate template="/servlets/layoutServlet">
+ $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.insertTemplate>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist.vm?rev=749995&r1=749994&r2=749995&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist.vm (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist.vm Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testputlist.ftl 742191 2009-02-08 22:43:19Z apetrelli $
+ * $Id: testputlist.vm 742191 2009-02-08 22:43:19Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,11 +19,11 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/putattributeslayout.ftl">
- <@tiles.putAttribute name="stringTest" value="This is a string" type="string" />
- <@tiles.putListAttribute name="list">
- <@tiles.addAttribute value="valueOne" type="string" />
- <@tiles.addAttribute value="valueTwo" type="string" />
- <@tiles.addAttribute value="valueThree" type="string" />
+$tiles.insertTemplate template="/velocity/putattributeslayout.vm">
+ $tiles.putAttribute name="stringTest" value="This is a string" type="string" />
+ $tiles.putListAttribute name="list">
+ $tiles.addAttribute value="valueOne" type="string" />
+ $tiles.addAttribute value="valueTwo" type="string" />
+ $tiles.addAttribute value="valueThree" type="string" />
</...@tiles.putListAttribute>
</...@tiles.insertTemplate>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testputlist_cascaded.vm?rev=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testputlist_cascaded.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testputlist_cascaded.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,14 +19,14 @@
* under the License.
*
*#
-<@tiles.insertTemplate template="/freemarker/layout.ftl">
- <@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="/freemarker/putattributeslayout.ftl" />
- <@tiles.putAttribute name="stringTest" value="This is a string" type="string" cascade=true />
- <@tiles.putListAttribute name="list" cascade=true>
- <@tiles.addAttribute value="valueOne" type="string" />
- <@tiles.addAttribute value="valueTwo" type="string" />
- <@tiles.addAttribute value="valueThree" type="string" />
+$tiles.insertTemplate template="/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
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=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testputlist_inherit.ftl 743333 2009-02-11 13:22:57Z apetrelli $
+ * $Id: testputlist_inherit.vm 743333 2009-02-11 13:22:57Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
* under the License.
*
*#
-<@tiles.insertDefinition name="freemarker.test.putAttributes">
- <@tiles.putListAttribute name="list" inherit=true>
- <@tiles.addAttribute value="valueFour" type="string" />
+$tiles.insertDefinition name="velocity.test.putAttributes">
+ $tiles.putListAttribute name="list" inherit=true>
+ $tiles.addAttribute value="valueFour" type="string" />
</...@tiles.putListAttribute>
</...@tiles.insertDefinition>
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/velocity/testsetcurrentcontainer.vm?rev=749995&r1=749994&r2=749995&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 Wed Mar 4 13:00:36 2009
@@ -1,5 +1,5 @@
#*
- * $Id: testsetcurrentcontainer.ftl 742115 2009-02-08 14:57:41Z apetrelli $
+ * $Id: testsetcurrentcontainer.vm 742115 2009-02-08 14:57:41Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
* under the License.
*
*#
-<@tiles.setCurrentContainer containerKey="alternate" />
-<@tiles.insertDefinition name="freemarker.test.definition" />
-<@tiles.setCurrentContainer />
-<@tiles.insertDefinition name="freemarker.test.definition" />
+$tiles.setCurrentContainer containerKey="alternate" />
+$tiles.insertDefinition name="velocity.test.definition" />
+$tiles.setCurrentContainer />
+$tiles.insertDefinition name="velocity.test.definition" />