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 2007/02/05 10:23:39 UTC
svn commit: r503599 - /tiles/framework/trunk/tiles-test/src/main/webapp/
Author: apetrelli
Date: Mon Feb 5 01:23:36 2007
New Revision: 503599
URL: http://svn.apache.org/viewvc?view=rev&rev=503599
Log:
TILES-98
Corrected taglibs references.
Modified:
tiles/framework/trunk/tiles-test/src/main/webapp/layout.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testdef.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testput.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testput_el.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testput_servlet.jsp
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/layout.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/layout.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/layout.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/layout.jsp Mon Feb 5 01:23:36 2007
@@ -28,9 +28,9 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title"/></strong></td>
</tr>
<tr>
- <td><tiles:attribute name="header"/></td>
+ <td><tiles:insertAttribute name="header"/></td>
</tr>
<tr>
- <td><tiles:attribute name="body"/></td>
+ <td><tiles:insertAttribute name="body"/></td>
</tr>
</table>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testdef.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testdef.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testdef.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testdef.jsp Mon Feb 5 01:23:36 2007
@@ -24,8 +24,8 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition name="templateDefinition" template="/layout.jsp">
- <tiles:put name="title" value="This is the title." />
- <tiles:put name="header" value="/header.jsp" />
- <tiles:put name="body" value="/body.jsp" />
+ <tiles:putAttribute name="title" value="This is the title." />
+ <tiles:putAttribute name="header" value="/header.jsp" />
+ <tiles:putAttribute name="body" value="/body.jsp" />
</tiles:definition>
<tiles:insertDefinition name="templateDefinition" />
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp Mon Feb 5 01:23:36 2007
@@ -25,10 +25,10 @@
<tiles:destroyContainer/>
<tiles:initContainer containerFactory="org.apache.tiles.factory.TilesContainerFactory">
- <tiles:put name="definitions-config" value="/WEB-INF/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml"/>
- <tiles:put name="org.apache.tiles.CONTEXT_FACTORY"
+ <tiles:putAttribute name="definitions-config" value="/WEB-INF/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml"/>
+ <tiles:putAttribute name="org.apache.tiles.CONTEXT_FACTORY"
value="org.apache.tiles.context.enhanced.EnhancedContextFactory"/>
- <tiles:put name="org.apache.tiles.CONTAINER_FACTORY.mutable"
+ <tiles:putAttribute name="org.apache.tiles.CONTAINER_FACTORY.mutable"
value="true"/>
</tiles:initContainer>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp Mon Feb 5 01:23:36 2007
@@ -24,13 +24,13 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is an inner definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="/body.jsp"/>
+ <tiles:putAttribute name="title" value="This is an inner definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="/body.jsp"/>
</tiles:definition>
<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is a composite definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="test.inner.definition.tags" type="definition"/>
+ <tiles:putAttribute name="title" value="This is a composite definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="test.inner.definition.tags" type="definition"/>
</tiles:definition>
<tiles:insertDefinition name="test.composite.definition.tags" />
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp Mon Feb 5 01:23:36 2007
@@ -24,13 +24,13 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is an inner definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="/body.jsp"/>
+ <tiles:putAttribute name="title" value="This is an inner definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="/body.jsp"/>
</tiles:definition>
<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is a composite definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="test.inner.definition" type="definition"/>
+ <tiles:putAttribute name="title" value="This is a composite definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="test.inner.definition" type="definition"/>
</tiles:definition>
<tiles:insertDefinition name="test.composite.definition.tags" />
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp Mon Feb 5 01:23:36 2007
@@ -24,13 +24,13 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is an inner definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="/body.jsp"/>
+ <tiles:putAttribute name="title" value="This is an inner definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="/body.jsp"/>
</tiles:definition>
<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is a composite definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="test.inner.definition"/>
+ <tiles:putAttribute name="title" value="This is a composite definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="test.inner.definition"/>
</tiles:definition>
<tiles:insertDefinition name="test.composite.definition.tags" />
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Mon Feb 5 01:23:36 2007
@@ -24,13 +24,13 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is an inner definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="/body.jsp"/>
+ <tiles:putAttribute name="title" value="This is an inner definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="/body.jsp"/>
</tiles:definition>
<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
- <tiles:put name="title" value="This is a composite definition with tags."/>
- <tiles:put name="header" value="/header.jsp"/>
- <tiles:put name="body" value="test.inner.definition.tags"/>
+ <tiles:putAttribute name="title" value="This is a composite definition with tags."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="test.inner.definition.tags"/>
</tiles:definition>
<tiles:insertDefinition name="test.composite.definition.tags" />
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp Mon Feb 5 01:23:36 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="test.definition">
- <tiles:put name="body">
+ <tiles:putAttribute name="body">
<div align="center"><b><i>This is an inline content</i></b></div>
</tiles:put>
</tiles:insertDefinition>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override.jsp Mon Feb 5 01:23:36 2007
@@ -24,5 +24,5 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="test.definition">
- <tiles:put name="body" value="/override.jsp" />
+ <tiles:putAttribute name="body" value="/override.jsp" />
</tiles:insertDefinition>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testput.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testput.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testput.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testput.jsp Mon Feb 5 01:23:36 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/layout.jsp">
- <tiles:put name="title" value="This is the title." />
- <tiles:put name="header" value="/header.jsp" />
- <tiles:put name="body" value="/body.jsp" />
+ <tiles:putAttribute name="title" value="This is the title." />
+ <tiles:putAttribute name="header" value="/header.jsp" />
+ <tiles:putAttribute name="body" value="/body.jsp" />
</tiles:insertTemplate>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testput_el.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testput_el.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testput_el.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testput_el.jsp Mon Feb 5 01:23:36 2007
@@ -27,7 +27,7 @@
<c:set var="bodyContent" value="Body Content defined by and el" />
<tiles:insertTemplate template="/layout.jsp">
- <tiles:put name="title" value="This is the title." />
- <tiles:put name="header" value="/header.jsp" />
- <tiles:put name="body" value="${bodyContent}" />
+ <tiles:putAttribute name="title" value="This is the title." />
+ <tiles:putAttribute name="header" value="/header.jsp" />
+ <tiles:putAttribute name="body" value="${bodyContent}" />
</tiles:insertTemplate>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testput_servlet.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testput_servlet.jsp?view=diff&rev=503599&r1=503598&r2=503599
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testput_servlet.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testput_servlet.jsp Mon Feb 5 01:23:36 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/servlets/layoutServlet">
- <tiles:put name="title" value="This is the title." />
- <tiles:put name="header" value="/header.jsp" />
- <tiles:put name="body" value="/body.jsp" />
+ <tiles:putAttribute name="title" value="This is the title." />
+ <tiles:putAttribute name="header" value="/header.jsp" />
+ <tiles:putAttribute name="body" value="/body.jsp" />
</tiles:insertTemplate>