Author: apetrelli
Date: Sun Feb 8 22:43:19 2009
New Revision: 742191
URL: http://svn.apache.org/viewvc?rev=742191&view=rev
Log:
TILESSB-5
Fixed references to files in FTL templates.
Added a new classpath-stored definition file.
Added:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
(with props)
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale_db.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_closebody.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_default.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_ignore.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
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/testinsertdefinition_override.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
Sun Feb 8 22:43:19 2009
@@ -64,7 +64,7 @@
/**
* The number of URLs to load..
*/
- private static final int URL_COUNT = 6;
+ private static final int URL_COUNT = 7;
/** {...@inheritdoc} */
@Override
@@ -151,6 +151,8 @@
}
urls.add(applicationContext.getResource(
"classpath:/org/apache/tiles/classpath-defs.xml"));
+ urls.add(applicationContext.getResource(
+
"classpath:/org/apache/tiles/freemarker-classpath-defs.xml"));
} catch (IOException e) {
throw new DefinitionsFactoryException(
"Cannot load definition URLs", e);
Added:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml?rev=742191&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
(added)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
Sun Feb 8 22:43:19 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+<!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_2_0.dtd";>
+
+<!-- Definitions for Tiles documentation -->
+
+<tiles-definitions>
+ <definition name="freemarker.classpath.definition"
template="/freemarker/layout.ftl">
+ <put-attribute name="title" value="This is the title."/>
+ <put-attribute name="header" value="/freemarker/header.ftl"/>
+ <put-attribute name="body" value="/freemarker/classpath.ftl"/>
+ </definition>
+</tiles-definitions>
\ No newline at end of file
Propchange:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
Sun Feb 8 22:43:19 2009
@@ -24,4 +24,4 @@
<div align="center"><b><i>
<div id="defaultLocaleMessage">Your default Locale is
<%=request.getLocale().toString() %></div>
</i></b></div>
-<a href="../selectlocale.jsp">Select another locale</a>
\ No newline at end of file
+<a href="../selectlocale.ftl">Select another locale</a>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale_db.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale_db.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale_db.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale_db.ftl
Sun Feb 8 22:43:19 2009
@@ -24,4 +24,4 @@
<div align="center"><b><i>
<div id="defaultLocaleMessage">Your default Locale is
<%=request.getLocale().toString() %></div>
</i></b></div>
-<a href="../selectlocale_db.jsp">Select another locale</a>
\ No newline at end of file
+<a href="../selectlocale_db.ftl">Select another locale</a>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_closebody.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_closebody.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_closebody.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_closebody.ftl
Sun Feb 8 22:43:19 2009
@@ -32,8 +32,8 @@
<td>
<@tiles.insertAttribute name="body">
<@tiles.putAttribute name="title" value="This is a customized
context" />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.insertAttribute>
</td>
</tr>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_default.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_default.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_default.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_default.ftl
Sun Feb 8 22:43:19 2009
@@ -26,7 +26,7 @@
<td bgcolor="Blue"><strong><@tiles.insertAttribute name="title"
defaultValue="This is the default title."/></strong></td>
</tr>
<tr>
- <td><@tiles.insertAttribute name="header"
defaultValue="alternate-header.jsp" defaultValueType="template"/></td>
+ <td><@tiles.insertAttribute name="header"
defaultValue="alternate-header.ftl" defaultValueType="template"/></td>
</tr>
<tr>
<td><@tiles.insertAttribute name="body" defaultValue="This is the default
body in the tag."/></td>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_ignore.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_ignore.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_ignore.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/layout_ignore.ftl
Sun Feb 8 22:43:19 2009
@@ -26,7 +26,7 @@
<td bgcolor="Blue"><strong><@tiles.getAsString
name="title"/></strong></td>
</tr>
<tr>
- <td><@tiles.insertAttribute name="header" ignore="true"/></td>
+ <td><@tiles.insertAttribute name="header" ignore=true /></td>
</tr>
<tr>
<td><@tiles.insertAttribute name="body"/></td>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
Sun Feb 8 22:43:19 2009
@@ -21,9 +21,9 @@
*
*/
-->
-<@tiles.definition name="templateDefinition" template="/freemarker/layout.jsp">
+<@tiles.definition name="templateDefinition" template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@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
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=742191&r1=742190&r2=742191&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
Sun Feb 8 22:43:19 2009
@@ -22,7 +22,7 @@
*/
-->
<@tiles.definition name="test.definition.override.one"
extends="test.definition">
- <@tiles.putAttribute name="body" value="/freemarker/override.jsp" />
+ <@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" />
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=742191&r1=742190&r2=742191&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
Sun Feb 8 22:43:19 2009
@@ -21,9 +21,9 @@
*
*/
-->
-<@tiles.definition name="templateDefinition" template="/freemarker/layout.jsp"
preparer="org.apache.tiles.test.preparer.TestViewPreparer">
+<@tiles.definition name="templateDefinition" template="/freemarker/layout.ftl"
preparer="org.apache.tiles.test.preparer.TestViewPreparer">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@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
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=742191&r1=742190&r2=742191&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
Sun Feb 8 22:43:19 2009
@@ -21,14 +21,14 @@
*
*/
-->
-<@tiles.definition name="test.inner.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
</@tiles.definition>
-<@tiles.definition name="test.composite.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
+ <@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" />
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=742191&r1=742190&r2=742191&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
Sun Feb 8 22:43:19 2009
@@ -21,14 +21,14 @@
*
*/
-->
-<@tiles.definition name="test.inner.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
</@tiles.definition>
-<@tiles.definition name="test.composite.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
+ <@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" />
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=742191&r1=742190&r2=742191&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
Sun Feb 8 22:43:19 2009
@@ -21,14 +21,14 @@
*
*/
-->
-<@tiles.definition name="test.inner.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
</@tiles.definition>
-<@tiles.definition name="test.composite.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
+ <@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" />
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=742191&r1=742190&r2=742191&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
Sun Feb 8 22:43:19 2009
@@ -21,14 +21,14 @@
*
*/
-->
-<@tiles.definition name="test.inner.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
</@tiles.definition>
-<@tiles.definition name="test.composite.definition.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
+ <@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" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override.ftl
Sun Feb 8 22:43:19 2009
@@ -22,5 +22,5 @@
*/
-->
<@tiles.insertDefinition name="freemarker.test.definition">
- <@tiles.putAttribute name="body" value="/freemarker/override.jsp" />
+ <@tiles.putAttribute name="body" value="/freemarker/override.ftl" />
</@tiles.insertDefinition>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
Sun Feb 8 22:43:19 2009
@@ -23,7 +23,7 @@
-->
Overridden content:<br/>
<@tiles.insertDefinition name="freemarker.test.definition">
- <@tiles.putAttribute name="body" value="/freemarker/override.jsp" />
+ <@tiles.putAttribute name="body" value="/freemarker/override.ftl" />
</@tiles.insertDefinition>
<br/>
Not overridden content:<br/>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
Sun Feb 8 22:43:19 2009
@@ -21,4 +21,4 @@
*
*/
-->
-<@tiles.insertDefinition name="freemarker.test.definition"
template="/freemarker/layout_override.jsp" />
+<@tiles.insertDefinition name="freemarker.test.definition"
template="/freemarker/layout_override.ftl" />
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=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
Sun Feb 8 22:43:19 2009
@@ -21,14 +21,14 @@
*
*/
-->
-<@tiles.definition name="test.nesting.definitions.tags"
template="/freemarker/layout.jsp">
+<@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.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
<@tiles.putAttribute name="body">
- <@tiles.definition template="/freemarker/layout.jsp">
+ <@tiles.definition template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is a nested
definition."/>
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp"/>
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl"/>
</@tiles.definition>
</@tiles.putAttribute>
</@tiles.definition>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
Sun Feb 8 22:43:19 2009
@@ -21,15 +21,15 @@
*
*/
-->
-<@tiles.definition name="test.nesting.definitions.tags"
template="/freemarker/layout_list.jsp">
+<@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.jsp"/>
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"/>
<@tiles.putListAttribute name="list">
<@tiles.addAttribute>
- <@tiles.definition template="/freemarker/layout.jsp">
+ <@tiles.definition template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is a nested
definition."/>
- <@tiles.putAttribute name="header"
value="/freemarker/header.jsp"/>
- <@tiles.putAttribute name="body"
value="/freemarker/body.jsp"/>
+ <@tiles.putAttribute name="header"
value="/freemarker/header.ftl"/>
+ <@tiles.putAttribute name="body"
value="/freemarker/body.ftl"/>
</@tiles.definition>
</@tiles.addAttribute>
</@tiles.putListAttribute>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput.ftl
Sun Feb 8 22:43:19 2009
@@ -21,8 +21,8 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded.ftl
Sun Feb 8 22:43:19 2009
@@ -21,8 +21,8 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." cascade="true"
/>
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp"
cascade="true" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"
cascade="true" />
<@tiles.putAttribute name="body" value="test.inner.cascadable.definition"
/>
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
Sun Feb 8 22:43:19 2009
@@ -21,8 +21,8 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@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.jsp"
cascade="true" />
+ <@tiles.putAttribute name="header" value="/freemarker/alternate-header.ftl"
cascade="true" />
<@tiles.putAttribute name="body" value="test.inner.definition" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_cascaded_template.ftl
Sun Feb 8 22:43:19 2009
@@ -21,8 +21,8 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." cascade="true"
/>
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp"
cascade="true" />
- <@tiles.putAttribute name="body" value="/freemarker/layout_nobody.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl"
cascade="true" />
+ <@tiles.putAttribute name="body" value="/freemarker/layout_nobody.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
Sun Feb 8 22:43:19 2009
@@ -24,8 +24,8 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<c:set var="bodyContent" value="Body Content defined by and el" />
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
<@tiles.putAttribute name="body" value="${bodyContent}" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el_singleeval.ftl
Sun Feb 8 22:43:19 2009
@@ -25,8 +25,8 @@
<c:set var="doNotShowBody" value="${'${'}requestScope.doNotShow}" />
<c:set var="doNotShow" scope="request" value="DO NOT SHOW!!!" />
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
<@tiles.putAttribute name="body" value="${doNotShowBody}" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_flush.ftl
Sun Feb 8 22:43:19 2009
@@ -21,8 +21,8 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout.jsp" flush="true">
+<@tiles.insertTemplate template="/freemarker/layout.ftl" flush="true">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed.ftl
Sun Feb 8 22:43:19 2009
@@ -21,8 +21,8 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout_alt_title.jsp">
+<@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.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_reversed_explicit.ftl
Sun Feb 8 22:43:19 2009
@@ -21,9 +21,9 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout_alt_title.jsp">
+<@tiles.insertTemplate template="/freemarker/layout_alt_title.ftl">
<@tiles.putAttribute name="title" value="This is the title."
type="org.apache.tiles.test.renderer.ReverseStringAttributeRenderer" />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
Sun Feb 8 22:43:19 2009
@@ -23,6 +23,6 @@
-->
<@tiles.insertTemplate template="/freemarker/servlets/layoutServlet">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body" value="/freemarker/body.jsp" />
+ <@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
+ <@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist.ftl
Sun Feb 8 22:43:19 2009
@@ -21,7 +21,7 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/putattributeslayout.jsp">
+<@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" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl?rev=742191&r1=742190&r2=742191&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testputlist_cascaded.ftl
Sun Feb 8 22:43:19 2009
@@ -21,10 +21,10 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/layout.jsp">
+<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
- <@tiles.putAttribute name="header" value="/freemarker/header.jsp" />
- <@tiles.putAttribute name="body"
value="/freemarker/putattributeslayout.jsp" />
+ <@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" />
