Author: apetrelli
Date: Tue Feb 10 15:23:34 2009
New Revision: 742994
URL: http://svn.apache.org/viewvc?rev=742994&view=rev
Log:
TILESSB-5
Fixed some runtime definition tests.
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_extend.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_preparer.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_extend.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_extend.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_extend.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_extend.ftl
Tue Feb 10 15:23:34 2009
@@ -21,10 +21,10 @@
*
*/
-->
-<@tiles.definition name="test.definition.override.one"
extends="test.definition">
+<@tiles.definition name="test.definition.override.one"
extends="freemarker.test.definition">
<@tiles.putAttribute name="body" value="/freemarker/override.ftl" />
</@tiles.definition>
<@tiles.definition name="test.definition.override.two"
extends="test.definition.override.one">
<@tiles.putAttribute name="title" value="This is an overridden title" />
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.definition.override.two" />
+<@tiles.insertDefinition name="test.definition.override.two" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_preparer.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_preparer.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_preparer.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_preparer.ftl
Tue Feb 10 15:23:34 2009
@@ -26,4 +26,4 @@
<@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
<@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.templateDefinition" />
\ No newline at end of file
+<@tiles.insertDefinition name="templateDefinition" />
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
Tue Feb 10 15:23:34 2009
@@ -31,4 +31,4 @@
<@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
<@tiles.putAttribute name="body" value="test.inner.definition.tags"
type="definition"/>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.composite.definition.tags" />
+<@tiles.insertDefinition name="test.composite.definition.tags" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
Tue Feb 10 15:23:34 2009
@@ -31,4 +31,4 @@
<@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
<@tiles.putAttribute name="body" value="test.inner.definition"
type="definition"/>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.composite.definition.tags" />
+<@tiles.insertDefinition name="test.composite.definition.tags" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
Tue Feb 10 15:23:34 2009
@@ -31,4 +31,4 @@
<@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
<@tiles.putAttribute name="body" value="test.inner.definition"/>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.composite.definition.tags" />
+<@tiles.insertDefinition name="test.composite.definition.tags" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
Tue Feb 10 15:23:34 2009
@@ -31,4 +31,4 @@
<@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
<@tiles.putAttribute name="body" value="test.inner.definition.tags"/>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.composite.definition.tags" />
+<@tiles.insertDefinition name="test.composite.definition.tags" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl?rev=742994&r1=742993&r2=742994&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
Tue Feb 10 15:23:34 2009
@@ -32,4 +32,4 @@
</@tiles.definition>
</@tiles.putAttribute>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.test.nesting.definitions.tags" />
+<@tiles.insertDefinition name="test.nesting.definitions.tags" />
