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/06 12:22:47 UTC
svn commit: r504081 - in /tiles/examples/trunk/tiles-showcase: ./
src/main/webapp/WEB-INF/ src/main/webapp/common/ src/main/webapp/doc/
src/main/webapp/examples/tiles/portal/ src/main/webapp/layout/
src/main/webapp/layouts/ src/main/webapp/layouts/skin...
Author: apetrelli
Date: Tue Feb 6 03:22:41 2007
New Revision: 504081
URL: http://svn.apache.org/viewvc?view=rev&rev=504081
Log:
TILES-11
Corrected <tiles:putAttribute> and <tiles:insertAttribute> tags.
Modified some attribute names to see if name clash works correctly.
Added dependency on struts-taglibs.
Modified:
tiles/examples/trunk/tiles-showcase/pom.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/download.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/installation.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/overview.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/tilesTags.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/userGuide.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/menu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testAll.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBackward.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBasic.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testDefinitions.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testList.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test2.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test3.jsp
Modified: tiles/examples/trunk/tiles-showcase/pom.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/pom.xml?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/pom.xml (original)
+++ tiles/examples/trunk/tiles-showcase/pom.xml Tue Feb 6 03:22:41 2007
@@ -85,6 +85,11 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <version>1.3.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
<artifactId>struts-tiles2</artifactId>
<version>1.3.7-SNAPSHOT</version>
</dependency>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml Tue Feb 6 03:22:41 2007
@@ -87,7 +87,7 @@
<!-- The home menu definition -->
<definition name="common.menu.home" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Tiles" />
+ <put name="title" value="Tiles" />
<putList name="items" >
<item value="Tiles Home" link="/index.jsp" />
</putList>
@@ -95,7 +95,7 @@
<!-- Printer friendly menu definition -->
<definition name="common.menu.examples" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Examples" />
+ <put name="title" value="Examples" />
<putList name="items" >
<item value="Home" link="/switch.do?prefix=/examples&page=/index.jsp" />
</putList>
@@ -103,7 +103,7 @@
<!-- Documentation menu definition v1.1-->
<definition name="common.menu.doc" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Documentation" />
+ <put name="title" value="Documentation" />
<putList name="items" >
<item value="Home" link="/doc/index.jsp" />
<item value="Live Examples" link="/examples/index.jsp" />
@@ -126,7 +126,7 @@
<!-- Printer friendly menu definition -->
<definition name="common.menu.printer.friendly" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Printer Versions" />
+ <put name="title" value="Printer Versions" />
<putList name="items" >
<item value="Quick Overview" link="/test/testAll.jsp" />
<item value="Tutorial" link="/doc/tutorialBody.html" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml Tue Feb 6 03:22:41 2007
@@ -82,7 +82,7 @@
<!-- Documentation menu definition v1.1-->
<definition name="doc.menu.links" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Documentation" />
+ <put name="title" value="Documentation" />
<putList name="items" >
<item value="Home" link="/index.jsp" />
<item value="Live Examples (new)" link="/examples/index.jsp" />
@@ -108,7 +108,7 @@
<!-- Printer friendly menu definition -->
<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Printer Versions" />
+ <put name="title" value="Printer Versions" />
<putList name="items" >
<item value="Quick Overview" link="/test/testAll.jsp" />
<item value="Tutorial" link="/doc/tutorialBody.html" />
@@ -119,7 +119,7 @@
<!-- Taglib menu definition -->
<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Tag Library Reference" />
+ <put name="title" value="Tag Library Reference" />
<putList name="items" >
<item value="Tiles Tags" link="/doc/tilesTags.jsp" />
<!-- <item value="Extension Tags (old)" link="/doc/extensionsTags.jsp" /> -->
@@ -128,7 +128,7 @@
<!-- Oldies menu definition -->
<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Old Documents" />
+ <put name="title" value="Old Documents" />
<putList name="items" >
<item value="Overview (old)" link="/doc/overview.jsp" />
</putList>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml Tue Feb 6 03:22:41 2007
@@ -39,7 +39,7 @@
<!-- Test menu definition -->
<definition name="test.menu.links" template="/layouts/menu.jsp" >
- <put name="sectionTitle" value="Tests" />
+ <put name="title" value="Tests" />
<putList name="items" >
<item value="All in one" link="/test/index.jsp" />
<item value="Basic" link="/test/testBasic.jsp" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp Tue Feb 6 03:22:41 2007
@@ -82,7 +82,7 @@
<%-- Following are some code example using this submenu
<tiles:insertTemplate template="/common/submenu.jsp" flush="true">
- <tiles:put name="title" value="Main Menu" />
+ <tiles:putAttribute name="title" value="Main Menu" />
<tiles:putList name="items" >
<tiles:add value="Home" />
<tiles:add value="Edit Customer" />
@@ -96,6 +96,6 @@
</tiles:insertTemplate>
<tiles:insertDefinition name="mainSubMenu" flush="true">
- <tiles:put name="selected" value="Home" />
+ <tiles:putAttribute name="selected" value="Home" />
</tiles:insertDefinition>
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/download.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/download.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/download.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/download.jsp Tue Feb 6 03:22:41 2007
@@ -25,5 +25,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="doc.mainLayout" flush="true">
- <tiles:put name="body" value="/doc/portal/download.jsp" />
+ <tiles:putAttribute name="body" value="/doc/portal/download.jsp" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp Tue Feb 6 03:22:41 2007
@@ -25,5 +25,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="doc.mainLayout" flush="true">
- <tiles:put name="body" value="/doc/extensionsTags.html" />
+ <tiles:putAttribute name="body" value="/doc/extensionsTags.html" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/installation.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/installation.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/installation.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/installation.jsp Tue Feb 6 03:22:41 2007
@@ -25,5 +25,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="doc.mainLayout" flush="true">
- <tiles:put name="body" value="/doc/installation.html" />
+ <tiles:putAttribute name="body" value="/doc/installation.html" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/overview.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/overview.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/overview.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/overview.jsp Tue Feb 6 03:22:41 2007
@@ -25,5 +25,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="doc.mainLayout" flush="true">
- <tiles:put name="body" value="/doc/overviewBody.html" />
+ <tiles:putAttribute name="body" value="/doc/overviewBody.html" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/tilesTags.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/tilesTags.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/tilesTags.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/tilesTags.jsp Tue Feb 6 03:22:41 2007
@@ -25,5 +25,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="doc.mainLayout" flush="true">
- <tiles:put name="body" value="/doc/struts-tilesTags.html" />
+ <tiles:putAttribute name="body" value="/doc/struts-tilesTags.html" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/userGuide.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/userGuide.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/userGuide.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/doc/userGuide.jsp Tue Feb 6 03:22:41 2007
@@ -25,5 +25,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="doc.mainLayout" flush="true">
- <tiles:put name="body" value="/doc/userGuideBody.html" />
+ <tiles:putAttribute name="body" value="/doc/userGuideBody.html" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp Tue Feb 6 03:22:41 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="/WEB-INF/tiles.tld" prefix="tiles" %>
<tiles:insertTemplate template="layout/columnsLayout.jsp" flush="true">
- <tiles:put name="numCols" value="2" />
+ <tiles:putAttribute name="numCols" value="2" />
<tiles:putList name="list0" >
<tiles:add value="/tutorial/portal/login.jsp" />
<tiles:add value="/tutorial/portal/messages.jsp" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp Tue Feb 6 03:22:41 2007
@@ -34,14 +34,14 @@
<body bgcolor="#ffffff" text="#000000" link="#023264" alink="#023264" vlink="#023264">
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="2"><tiles:attribute name="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:attribute name='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:attribute name='body' />
+ <tiles:insertAttribute name='body' />
</td>
</tr>
<tr>
@@ -51,7 +51,7 @@
</tr>
<tr>
<td colspan="2">
- <tiles:attribute name="footer" />
+ <tiles:insertAttribute name="footer" />
</td>
</tr>
</table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp Tue Feb 6 03:22:41 2007
@@ -41,7 +41,7 @@
<tiles:importAttribute toName="list" name="<%="list" + i %>"/>
<td valign="top">
<tiles:insertTemplate template="/layout/vboxLayout.jsp" flush="true" >
- <tiles:put name="componentsList" value="${pageScope.list}" />
+ <tiles:putAttribute name="componentsList" value="${pageScope.list}" />
</tiles:insertTemplate>
</td>
<%
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp Tue Feb 6 03:22:41 2007
@@ -23,6 +23,7 @@
--%>
<%@ page import="java.util.Iterator"%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%-- Layout component
Render a list on severals columns
@@ -33,16 +34,7 @@
<%-- Next will be a tag, as soon as tags allow include in iteration
Wait until jsp1.3 --%>
-<%
-Iterator i=list.iterator();
-while( i.hasNext() )
- {
- String comp=(String)i.next();
-%>
-<tiles:insertTemplate template="<%=comp%>" flush="true" />
+<c:forEach var="item" items="${list}">
+<tiles:insertAttribute value="${item}" flush="true" />
<br>
-
-<%
- } // end loop
-%>
-
+</c:forEach>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp Tue Feb 6 03:22:41 2007
@@ -35,22 +35,22 @@
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="3"><tiles:attribute name="header" /></td>
+ <td colspan="3"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:attribute name=right ignore='true'/>
+ <tiles:insertAttribute name=right ignore='true'/>
</td>
<td valign="top" align="left">
- <tiles:attribute name='body' />
+ <tiles:insertAttribute name='body' />
</td>
<td valign="top" align="left">
- <tiles:attribute name='left' ignore='true'/>
+ <tiles:insertAttribute name='left' ignore='true'/>
</td>
</tr>
<tr>
<td colspan="3">
- <tiles:attribute name="footer" />
+ <tiles:insertAttribute name="footer" />
</td>
</tr>
</table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp Tue Feb 6 03:22:41 2007
@@ -42,19 +42,19 @@
<body bgcolor="#ffffff" text="#000000" link="#023264" alink="#023264" vlink="#023264">
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="2"><tiles:attribute name="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:attribute name='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:attribute name='body' />
+ <tiles:insertAttribute name='body' />
</td>
</tr>
<tr>
<td colspan="2">
- <tiles:attribute name="footer" />
+ <tiles:insertAttribute name="footer" />
</td>
</tr>
</table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp Tue Feb 6 03:22:41 2007
@@ -49,7 +49,7 @@
<tiles:importAttribute toName="list" name="<%="list" + i %>"/>
<td valign="top">
<tiles:insertTemplate template="/layouts/vboxLayout.jsp" flush="true" >
- <tiles:put name="list" value="${pageScope.list}" />
+ <tiles:putAttribute name="list" value="${pageScope.list}" />
</tiles:insertTemplate>
</td>
<%
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/menu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/menu.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/menu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/menu.jsp Tue Feb 6 03:22:41 2007
@@ -41,10 +41,10 @@
<tiles:importAttribute />
<table>
-<logic:present name="sectionTitle">
+<logic:present name="title">
<tr>
<th colspan=2>
- <div align="left"><strong><tiles:getAsString name="sectionTitle"/></strong></div>
+ <div align="left"><strong><tiles:getAsString name="title"/></strong></div>
</th>
</tr>
</logic:present>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp Tue Feb 6 03:22:41 2007
@@ -116,7 +116,7 @@
<tr>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
<td>
- <tiles:attribute name="<%=selectedBody%>" flush="true" />
+ <tiles:insertAttribute name="<%=selectedBody%>" flush="true" />
</td>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
</tr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp Tue Feb 6 03:22:41 2007
@@ -42,19 +42,19 @@
<body bgcolor="#C0C0C0" text="#000000" link="#023264" alink="#023264" vlink="#023264">
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="2"><tiles:attribute name="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td valign="top" align="left">
- <tiles:attribute name='body' />
+ <tiles:insertAttribute name='body' />
</td>
<td width="140" valign="top">
- <tiles:attribute name='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
</tr>
<tr>
<td colspan="2">
- <tiles:attribute name="footer" />
+ <tiles:insertAttribute name="footer" />
</td>
</tr>
</table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp Tue Feb 6 03:22:41 2007
@@ -104,7 +104,7 @@
<tr>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
<td>
- <tiles:attribute name="<%=selectedBody%>" flush="true" />
+ <tiles:insertAttribute name="<%=selectedBody%>" flush="true" />
</td>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
</tr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp Tue Feb 6 03:22:41 2007
@@ -23,6 +23,7 @@
--%>
<%@ page import="java.util.Iterator"%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%-- Layout component
Render a list of tiles in a vertical column
@@ -37,31 +38,10 @@
<%-- Iterate over names.
We don't use <iterate> tag because it doesn't allow insert (in JSP1.1)
--%>
-<%
-Iterator i=list.iterator();
-while( i.hasNext() )
- {
- String name= (String)i.next();
- if (name.startsWith("/"))
- {
-%>
-<tiles:insertTemplate template="<%=name%>" flush="true" />
+<c:forEach var="item" items="${list}">
+<tiles:insertAttribute value="${item}" flush="true" />
<br>
-
-<%
- }
- else
- {
-%>
-<tiles:insertDefinition name="<%=name%>" flush="true" />
-<br>
-
-<%
- }
- } // end loop
-%>
-
-
+</c:forEach>
<%-- Iterate over names.
Use jstl <forEach> tag.
Require the jstl taglib.
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp Tue Feb 6 03:22:41 2007
@@ -35,9 +35,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/examples/trunk/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp Tue Feb 6 03:22:41 2007
@@ -33,10 +33,10 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title" ignore="false" /></strong></td>
</tr>
<tr>
-<td><tiles:attribute name="header" ignore="true"/></td>
+<td><tiles:insertAttribute name="header" ignore="true"/></td>
</tr>
<tr>
-<td><tiles:attribute name="body" ignore="true"/>
+<td><tiles:insertAttribute name="body" ignore="true"/>
</td>
</tr>
</table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testAll.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testAll.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testAll.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testAll.jsp Tue Feb 6 03:22:41 2007
@@ -35,7 +35,7 @@
<td valign="top"><tiles:insertTemplate template="testBasic.jsp" /></td>
<td valign="top">
<tiles:insertTemplate template="/common/viewSrcBody.jsp">
- <tiles:put name="srcPath" value="/test/testBasic.jsp" />
+ <tiles:putAttribute name="srcPath" value="/test/testBasic.jsp" />
</tiles:insertTemplate>
</td>
</tr>
@@ -43,7 +43,7 @@
<td valign="top"><tiles:insertTemplate template="testList.jsp" /></td>
<td valign="top">
<tiles:insertTemplate template="/common/viewSrcBody.jsp">
- <tiles:put name="srcPath" value="/test/testList.jsp" />
+ <tiles:putAttribute name="srcPath" value="/test/testList.jsp" />
</tiles:insertTemplate>
</td>
</tr>
@@ -51,7 +51,7 @@
<td valign="top"><tiles:insertTemplate template="testDefinitions.jsp" /></td>
<td valign="top">
<tiles:insertTemplate template="/common/viewSrcBody.jsp">
- <tiles:put name="srcPath" value="/test/testDefinitions.jsp" />
+ <tiles:putAttribute name="srcPath" value="/test/testDefinitions.jsp" />
</tiles:insertTemplate>
</td>
</tr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBackward.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBackward.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBackward.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBackward.jsp Tue Feb 6 03:22:41 2007
@@ -30,9 +30,9 @@
<strong>Check synonyms for include and put.</strong>
<br>
<tiles:insertTemplate template="layout.jsp">
- <tiles:put name="title" value="Test with a tag body" direct="true" />
- <tiles:put name="header" value="header.jsp">
+ <tiles:putAttribute name="title" value="Test with a tag body" direct="true" />
+ <tiles:putAttribute name="header" value="header.jsp">
<strong>This is a header</strong>
</tiles:put>
- <tiles:put name="body" value="body.jsp" direct="false" />
+ <tiles:putAttribute name="body" value="body.jsp" direct="false" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBasic.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBasic.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBasic.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testBasic.jsp Tue Feb 6 03:22:41 2007
@@ -29,38 +29,38 @@
<strong>Basic template usage</strong>
<br>
<tiles:insertTemplate template="layout.jsp">
- <tiles:put name="title" value="Test with default no types" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Test with default no types" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:insertTemplate>
<hr>
<strong>Specify attribute types</strong>
<br>
<tiles:insertTemplate template="layout.jsp">
- <tiles:put name="title" value="Test with specified types" type="string" />
- <tiles:put name="header" value="header.jsp" type="page" />
- <tiles:put name="body" value="body.jsp" type="page" />
+ <tiles:putAttribute name="title" value="Test with specified types" type="string" />
+ <tiles:putAttribute name="header" value="header.jsp" type="page" />
+ <tiles:putAttribute name="body" value="body.jsp" type="page" />
</tiles:insertTemplate>
<hr>
<strong>Set attribute value with tag body</strong>
<br>
<tiles:insertTemplate template="layout.jsp">
- <tiles:put name="title" value="Test with a tag body" />
- <tiles:put name="header" type="string">
+ <tiles:putAttribute name="title" value="Test with a tag body" />
+ <tiles:putAttribute name="header" type="string">
<strong>This header is inserted as body of tag</strong>
</tiles:put>
- <tiles:put name="body" value="body.jsp"/>
+ <tiles:putAttribute name="body" value="body.jsp"/>
</tiles:insertTemplate>
<hr>
<strong>Use of definition</strong>
<br>
<tiles:definition id="templateDefinition" template="layout.jsp">
- <tiles:put name="title" value="Use of definition" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Use of definition" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:definition>
<tiles:insertDefinition name="templateDefinition" />
@@ -69,15 +69,15 @@
from previous definition is overloaded
<br>
<tiles:insertDefinition name="templateDefinition" >
- <tiles:put name="title" value="Use of definition, overload of parameters" type="string" />
+ <tiles:putAttribute name="title" value="Use of definition, overload of parameters" type="string" />
</tiles:insertDefinition>
<hr>
<strong>Test ignore : body isn't defined </strong>(We use another layout)
<br>
<tiles:insertTemplate template="layoutTestIgnore.jsp">
- <tiles:put name="title" value="Test ignore : body isn't defined" />
- <tiles:put name="header" value="header.jsp" />
+ <tiles:putAttribute name="title" value="Test ignore : body isn't defined" />
+ <tiles:putAttribute name="header" value="header.jsp" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp Tue Feb 6 03:22:41 2007
@@ -36,9 +36,9 @@
<br>
<tiles:insertTemplate template="layout.jsp"
controllerClass="org.apache.struts.webapp.tiles.test.TestTileController" >
- <tiles:put name="title" value="Test controller set in insert" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Test controller set in insert" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:insertTemplate>
<hr>
@@ -46,7 +46,7 @@
<br>
<tiles:insertDefinition name="test.layout.test1"
controllerClass="org.apache.struts.webapp.tiles.test.TestTileController" >
- <tiles:put name="title" value="Test controller set in insert, and attribute from definition" />
+ <tiles:putAttribute name="title" value="Test controller set in insert, and attribute from definition" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testDefinitions.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testDefinitions.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testDefinitions.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testDefinitions.jsp Tue Feb 6 03:22:41 2007
@@ -28,9 +28,9 @@
<hr>
<strong>Insert definition defined directly in jsp page</strong>
<tiles:definition id="definition" template="/test/layout.jsp" >
- <tiles:put name="title" value="Test definition defined in jsp page" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Test definition defined in jsp page" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:definition>
<br>
@@ -55,5 +55,5 @@
<strong>Insert definition defined in factory : Overload title attribute</strong>
<br>
<tiles:insertDefinition name="test.layout.test3">
- <tiles:put name="title" value="Test definition : overload attribute 'title'" />
+ <tiles:putAttribute name="title" value="Test definition : overload attribute 'title'" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp Tue Feb 6 03:22:41 2007
@@ -31,26 +31,26 @@
<strong>Test ignore : body isn't defined</strong>
<br>
<tiles:insertTemplate template="layoutTestIgnore.jsp">
- <tiles:put name="title" value="Test ignore : body isn't defined" />
- <tiles:put name="header" value="header.jsp" />
+ <tiles:putAttribute name="title" value="Test ignore : body isn't defined" />
+ <tiles:putAttribute name="header" value="header.jsp" />
</tiles:insertTemplate>
<hr>
<strong>Test ignore : bad body definition name (exception must be shown)</strong>
<br>
<tiles:insertTemplate template="layoutTestIgnore.jsp">
- <tiles:put name="title" value="Test ignore : bad body definition name (exception must be shown)" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="badDefinitionName" type="definition" />
+ <tiles:putAttribute name="title" value="Test ignore : bad body definition name (exception must be shown)" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="badDefinitionName" type="definition" />
</tiles:insertTemplate>
<hr>
<strong>Test ignore : Definition not found (no errors, no insertion)</strong>
<br>
<tiles:definition id="templateDefinition" template="layout.jsp">
- <tiles:put name="title" value="Test ignore : Definition not found (no errors, no insertion)" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Test ignore : Definition not found (no errors, no insertion)" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:definition>
<tiles:insertDefinition name="badTemplateDefinitionName" ignore="true"/>
@@ -58,8 +58,8 @@
<strong>Test ignore : bad body urls (exception must be shown)</strong>
<br>
<tiles:insertTemplate template="layoutTestIgnore.jsp">
- <tiles:put name="title" value="Test ignore : bad body urls (exception must be shown)" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body2.jsp"/>
+ <tiles:putAttribute name="title" value="Test ignore : bad body urls (exception must be shown)" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body2.jsp"/>
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testList.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testList.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testList.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testList.jsp Tue Feb 6 03:22:41 2007
@@ -28,7 +28,7 @@
Menu component require two lists : one of items, and one of links.
--%>
<tiles:insertTemplate template="menu.jsp" >
- <tiles:put name="title" value="Test menu" />
+ <tiles:putAttribute name="title" value="Test menu" />
<tiles:putList name="items">
<tiles:add value="home" />
<tiles:add>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp Tue Feb 6 03:22:41 2007
@@ -29,17 +29,17 @@
<strong>Show Component if 'tomcat' role is set</strong>
<br>
<tiles:insertTemplate template="layout.jsp" role="tomcat">
- <tiles:put name="title" value="Tomcat role" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Tomcat role" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:insertTemplate>
<hr>
<strong>Show Component if 'role1' role is set</strong>
<br>
<tiles:insertTemplate template="layout.jsp" role="role1">
- <tiles:put name="title" value="role1 role" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="role1 role" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp Tue Feb 6 03:22:41 2007
@@ -29,31 +29,31 @@
<strong>Test definition set in action, and action forward to another definition</strong>
<br>
<tiles:insertTemplate template="/test/testAction.do" >
- <tiles:put name="title" value="Test definition set in action, and action forward to another definition. Title is overloaded from insert" />
+ <tiles:putAttribute name="title" value="Test definition set in action, and action forward to another definition. Title is overloaded from insert" />
<%-- header and body values come from definition used in action's forward --%>
<%-- name of definition to use in action --%>
- <tiles:put name="set-definition" value="test.layout.test1" />
+ <tiles:putAttribute name="set-definition" value="test.layout.test1" />
</tiles:insertTemplate>
<hr>
<strong>Test overload parameter in action</strong>
<br>
<tiles:insertTemplate template="/test/testAction.do" >
- <tiles:put name="title" value="Test overload parameter in action" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Test overload parameter in action" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
<%-- name and value of attribute to set in action --%>
- <tiles:put name="set-attribute" value="title" />
- <tiles:put name="set-attribute-value" value="Test overload parameter in action : Overloaded title" />
+ <tiles:putAttribute name="set-attribute" value="title" />
+ <tiles:putAttribute name="set-attribute-value" value="Test overload parameter in action : Overloaded title" />
</tiles:insertTemplate>
<hr>
<strong>Test definition set in action, and action forward directly to jsp</strong>
<br>
<tiles:insertTemplate template="/test/testActionForwardJsp.do" >
- <tiles:put name="title" value="Test definition set in action, and action forward directly to jsp" />
- <tiles:put name="header" value="header.jsp" />
- <tiles:put name="body" value="body.jsp" />
+ <tiles:putAttribute name="title" value="Test definition set in action, and action forward directly to jsp" />
+ <tiles:putAttribute name="header" value="header.jsp" />
+ <tiles:putAttribute name="body" value="body.jsp" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp Tue Feb 6 03:22:41 2007
@@ -36,12 +36,12 @@
<TABLE width="100%">
<TR>
- <TD colspan="2"><tiles:attribute name="header" /></TD></TR>
+ <TD colspan="2"><tiles:insertAttribute name="header" /></TD></TR>
<TR>
- <TD width="120"><tiles:attribute name="menu" /></TD>
- <TD><tiles:attribute name="body" /></TD></TR>
+ <TD width="120"><tiles:insertAttribute name="menu" /></TD>
+ <TD><tiles:insertAttribute name="body" /></TD></TR>
<TR>
- <TD colspan="2"><tiles:attribute name="footer" /></TD>
+ <TD colspan="2"><tiles:insertAttribute name="footer" /></TD>
</TR>
</TABLE>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp Tue Feb 6 03:22:41 2007
@@ -24,9 +24,9 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/tutorial/basic/myFramesetLayout.jsp" >
- <tiles:put name="title" content="My first frameset page" direct="true" />
- <tiles:put name="header" content="/tutorial/common/header.jsp" direct="true"/>
- <tiles:put name="footer" content="/tutorial/common/footer.jsp" direct="true"/>
- <tiles:put name="menu" content="/tutorial/basic/menu.jsp" direct="true"/>
- <tiles:put name="body" content="/tutorial/basic/helloBody.jsp" direct="true"/>
+ <tiles:putAttribute name="title" content="My first frameset page" direct="true" />
+ <tiles:putAttribute name="header" content="/tutorial/common/header.jsp" direct="true"/>
+ <tiles:putAttribute name="footer" content="/tutorial/common/footer.jsp" direct="true"/>
+ <tiles:putAttribute name="menu" content="/tutorial/basic/menu.jsp" direct="true"/>
+ <tiles:putAttribute name="body" content="/tutorial/basic/helloBody.jsp" direct="true"/>
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp Tue Feb 6 03:22:41 2007
@@ -24,9 +24,9 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/tutorial/basic/myLayout.jsp" flush="true">
- <tiles:put name="title" value="My first page" />
- <tiles:put name="header" value="/tutorial/common/header.jsp" />
- <tiles:put name="footer" value="/common/footer.jsp" />
- <tiles:put name="menu" value="/tutorial/basic/menu.jsp" />
- <tiles:put name="body" value="/tutorial/basic/helloBody.jsp" />
+ <tiles:putAttribute name="title" value="My first page" />
+ <tiles:putAttribute name="header" value="/tutorial/common/header.jsp" />
+ <tiles:putAttribute name="footer" value="/common/footer.jsp" />
+ <tiles:putAttribute name="menu" value="/tutorial/basic/menu.jsp" />
+ <tiles:putAttribute name="body" value="/tutorial/basic/helloBody.jsp" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp Tue Feb 6 03:22:41 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/common/submenu.jsp" flush="true">
- <tiles:put name="title" value="Main Menu" />
+ <tiles:putAttribute name="title" value="Main Menu" />
<tiles:putList name="items" >
<tiles:add value="Home" />
<tiles:add value="Basic Page" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp Tue Feb 6 03:22:41 2007
@@ -82,7 +82,7 @@
<%-- Following are some code example using this submenu
<tiles:insertTemplate template="/common/submenu.jsp" flush="true">
- <tiles:put name="title" value="Main Menu" />
+ <tiles:putAttribute name="title" value="Main Menu" />
<tiles:putList name="items" >
<tiles:add value="Home" />
<tiles:add value="Edit Customer" />
@@ -96,6 +96,6 @@
</tiles:insertTemplate>
<tiles:insertDefinition name="mainSubMenu" flush="true">
- <tiles:put name="selected" value="Home" />
+ <tiles:putAttribute name="selected" value="Home" />
</tiles:insertDefinition>
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp Tue Feb 6 03:22:41 2007
@@ -25,6 +25,6 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="mainLayout" flush="true" >
- <tiles:put name="title" value="JSP Source Code" />
- <tiles:put name="body" value="/tutorial/common/viewSrcBody.jsp" />
+ <tiles:putAttribute name="title" value="JSP Source Code" />
+ <tiles:putAttribute name="body" value="/tutorial/common/viewSrcBody.jsp" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp Tue Feb 6 03:22:41 2007
@@ -24,11 +24,11 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition id="definitionName" template="/tutorial/basic/myLayout.jsp" >
- <tiles:put name="title" value="My first page" />
- <tiles:put name="header" value="/tutorial/common/header.jsp" />
- <tiles:put name="footer" value="/tutorial/common/footer.jsp" />
- <tiles:put name="menu" value="/tutorial/basic/menu.jsp" />
- <tiles:put name="body" value="/tutorial/basic/helloBody.jsp" />
+ <tiles:putAttribute name="title" value="My first page" />
+ <tiles:putAttribute name="header" value="/tutorial/common/header.jsp" />
+ <tiles:putAttribute name="footer" value="/tutorial/common/footer.jsp" />
+ <tiles:putAttribute name="menu" value="/tutorial/basic/menu.jsp" />
+ <tiles:putAttribute name="body" value="/tutorial/basic/helloBody.jsp" />
</tiles:definition>
<tiles:insertDefinition name="definitionName" flush="true" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp Tue Feb 6 03:22:41 2007
@@ -35,16 +35,16 @@
<%-- Master layout definition --%>
<tiles:definition id="masterLayout" page="/layouts/classicLayout.jsp" scope="request" >
- <tiles:put name="title" value="My First Definition Page" />
- <tiles:put name="header" value="/tutorial/common/header.jsp" />
- <tiles:put name="footer" value="/tutorial/common/footer.jsp" />
- <tiles:put name="menu" value="/tutorial/common/menu.jsp" />
- <tiles:put name="body" value="/tutorial/basic/helloBody.jsp" />
+ <tiles:putAttribute name="title" value="My First Definition Page" />
+ <tiles:putAttribute name="header" value="/tutorial/common/header.jsp" />
+ <tiles:putAttribute name="footer" value="/tutorial/common/footer.jsp" />
+ <tiles:putAttribute name="menu" value="/tutorial/common/menu.jsp" />
+ <tiles:putAttribute name="body" value="/tutorial/basic/helloBody.jsp" />
</tiles:definition>
<%-- portal definition --%>
<tiles:definition id="portalExample" page="/layout/columnsLayout.jsp" scope="request">
- <tiles:put name="numCols" value="2" />
+ <tiles:putAttribute name="numCols" value="2" />
<tiles:putList name="list0" >
<tiles:add value="/portal/login.jsp" />
<tiles:add value="/portal/messages.jsp" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp Tue Feb 6 03:22:41 2007
@@ -24,5 +24,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="myFirstDefinition" flush="true" >
- <tiles:put name="title" value="My first Definition Page" />
+ <tiles:putAttribute name="title" value="My first Definition Page" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp Tue Feb 6 03:22:41 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/layout/columnsLayout.jsp" flush="true">
- <tiles:put name="numCols" value="2" />
+ <tiles:putAttribute name="numCols" value="2" />
<tiles:putList name="list0" >
<tiles:add value="/portal/login.jsp" />
<tiles:add value="/portal/messages.jsp" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp Tue Feb 6 03:22:41 2007
@@ -25,9 +25,9 @@
<tiles:insertDefinition template="/tutorial/basic/myFramesetLayout.jsp" definition="templateDefinition" >
<%-- Uncomment lines to overload parameters --%>
- <%-- <tiles:put name="title" content="My first frameset page" direct="true" /> --%>
- <%-- <tiles:put name="header" content="/tutorial/common/header.jsp" direct="true"/> --%>
- <%-- <tiles:put name="footer" content="/tutorial/common/footer.jsp" direct="true"/> --%>
- <%-- <tiles:put name="menu" content="/tutorial/basic/menu.jsp" direct="true"/> --%>
- <%-- <tiles:put name="body" content="/tutorial/basic/helloBody.jsp" direct="true"/> --%>
+ <%-- <tiles:putAttribute name="title" content="My first frameset page" direct="true" /> --%>
+ <%-- <tiles:putAttribute name="header" content="/tutorial/common/header.jsp" direct="true"/> --%>
+ <%-- <tiles:putAttribute name="footer" content="/tutorial/common/footer.jsp" direct="true"/> --%>
+ <%-- <tiles:putAttribute name="menu" content="/tutorial/basic/menu.jsp" direct="true"/> --%>
+ <%-- <tiles:putAttribute name="body" content="/tutorial/basic/helloBody.jsp" direct="true"/> --%>
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp Tue Feb 6 03:22:41 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:definition id="definitionName" extends="myFirstDefinition" >
- <tiles:put name="title" value="My first extended definition tag page" />
+ <tiles:putAttribute name="title" value="My first extended definition tag page" />
</tiles:definition>
<tiles:insertDefinition name="definitionName" flush="true" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp Tue Feb 6 03:22:41 2007
@@ -67,8 +67,8 @@
<%-- Pass the component name and component value as parameter --%>
<%-- Value comes from the form bean --%>
<tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" >
- <tiles:put name="property" value="shippingAddress" />
- <tiles:put name="bean" value="${invoiceForm}" />
+ <tiles:putAttribute name="property" value="shippingAddress" />
+ <tiles:putAttribute name="bean" value="${invoiceForm}" />
</tiles:insertTemplate>
</td>
</tr>
@@ -84,8 +84,8 @@
<tr>
<td align="center" colspan="2">
<tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" >
- <tiles:put name="property" value="billAddress" />
- <tiles:put name="bean" value="${invoiceForm}" />
+ <tiles:putAttribute name="property" value="billAddress" />
+ <tiles:putAttribute name="bean" value="${invoiceForm}" />
</tiles:insertTemplate>
</td>
</tr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp Tue Feb 6 03:22:41 2007
@@ -67,8 +67,8 @@
<%-- Pass the component name and component value as parameter --%>
<%-- Value comes from the form bean --%>
<tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" >
- <tiles:put name="compName" value="shippingAddress" />
- <tiles:put name="address" name="${invoiceForm.shippingAddress}" />
+ <tiles:putAttribute name="compName" value="shippingAddress" />
+ <tiles:putAttribute name="address" name="${invoiceForm.shippingAddress}" />
</tiles:insertTemplate>
</td>
</tr>
@@ -84,8 +84,8 @@
<tr>
<td align="center" colspan="2">
<tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" >
- <tiles:put name="compName" value="billAddress" />
- <tiles:put name="address" value="${invoiceForm.billAddress}" />
+ <tiles:putAttribute name="compName" value="billAddress" />
+ <tiles:putAttribute name="address" value="${invoiceForm.billAddress}" />
</tiles:insertTemplate>
</td>
</tr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp Tue Feb 6 03:22:41 2007
@@ -25,7 +25,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="mainLayout" flush="true">
- <tiles:put name="body" value="/tutorial/invoice/editInvoice.jsp" />
- <%-- <tiles:put name="body" value="/tutorial/invoice/editInvoice2.jsp" /> --%>
+ <tiles:putAttribute name="body" value="/tutorial/invoice/editInvoice.jsp" />
+ <%-- <tiles:putAttribute name="body" value="/tutorial/invoice/editInvoice2.jsp" /> --%>
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp Tue Feb 6 03:22:41 2007
@@ -42,14 +42,14 @@
<body bgcolor="#ffffff" text="#000000" link="#023264" alink="#023264" vlink="#023264">
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="2"><tiles:attribute name="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:attribute name='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:attribute name='body' />
+ <tiles:insertAttribute name='body' />
</td>
</tr>
<tr>
@@ -59,7 +59,7 @@
</tr>
<tr>
<td colspan="2">
- <tiles:attribute name="footer" />
+ <tiles:insertAttribute name="footer" />
</td>
</tr>
</table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp Tue Feb 6 03:22:41 2007
@@ -46,7 +46,7 @@
%>
<td valign="top">
<tiles:insertTemplate template="/layout/vboxLayout.jsp" flush="true" >
- <tiles:put name="componentsList" value="${pageContext.list}" />
+ <tiles:putAttribute name="componentsList" value="${pageContext.list}" />
</tiles:insertTemplate>
</td>
<%
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp Tue Feb 6 03:22:41 2007
@@ -38,7 +38,7 @@
Wait until jsp1.3
<logic:iterate id="comp" name="list" type="String" >
- <tiles:attribute name="<%=comp%>" flush="false" />
+ <tiles:insertAttribute name="<%=comp%>" flush="false" />
<br>
</logic:iterate>
--%>
@@ -50,7 +50,7 @@
{
String comp=(String)i.next();
%>
-<tiles:attribute name="<%=comp%>" flush="true" />
+<tiles:insertAttribute name="<%=comp%>" flush="true" />
<br>
<%
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp Tue Feb 6 03:22:41 2007
@@ -24,5 +24,5 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertDefinition name="myFirstDefinition" flush="true" >
- <tiles:put name="title" value="My First Definition Page With Overloaded Title" />
+ <tiles:putAttribute name="title" value="My First Definition Page With Overloaded Title" />
</tiles:insertDefinition>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp Tue Feb 6 03:22:41 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/layout/columnsLayout.jsp" flush="true">
- <tiles:put name="numCols" value="2" />
+ <tiles:putAttribute name="numCols" value="2" />
<tiles:putList name="list0" >
<tiles:add value="/tutorial/portal/login.jsp" />
<tiles:add value="/tutorial/portal/messages.jsp" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp Tue Feb 6 03:22:41 2007
@@ -24,10 +24,10 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/tutorial/layout/classicLayout.jsp" flush="true">
- <tiles:put name="title" value="My First Portal Page" />
- <tiles:put name="header" value="/tutorial/common/header.jsp" />
- <tiles:put name="footer" value="/tutorial/common/footer.jsp" />
- <tiles:put name="menu" value="/tutorial/basic/menu.jsp" />
- <%-- <tiles:put name="menu" value="/tutorial/common/menu.jsp" /> --%>
- <tiles:put name="body" value="/tutorial/portal/portalBody.jsp" />
+ <tiles:putAttribute name="title" value="My First Portal Page" />
+ <tiles:putAttribute name="header" value="/tutorial/common/header.jsp" />
+ <tiles:putAttribute name="footer" value="/tutorial/common/footer.jsp" />
+ <tiles:putAttribute name="menu" value="/tutorial/basic/menu.jsp" />
+ <%-- <tiles:putAttribute name="menu" value="/tutorial/common/menu.jsp" /> --%>
+ <tiles:putAttribute name="body" value="/tutorial/portal/portalBody.jsp" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test.jsp Tue Feb 6 03:22:41 2007
@@ -34,8 +34,8 @@
<bean:write name='xout2' filter='true'/>
<tiles:insertTemplate template="/forwardExampleAction.do">
- <tiles:put name="label" content="Text:" direct="true"/>
- <tiles:put name="property" content="contentForm" direct="true"/>
+ <tiles:putAttribute name="label" content="Text:" direct="true"/>
+ <tiles:putAttribute name="property" content="contentForm" direct="true"/>
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp Tue Feb 6 03:22:41 2007
@@ -38,21 +38,21 @@
<TR>
<TD colspan="2">
- <tiles:attribute name="header" >
+ <tiles:insertAttribute name="header" >
<%-- FIXME It had beanScope="template", check if the definition is taken
from componentContext--%>
- <tiles:put name="body" value="${body}" />
- </tiles:attribute>
+ <tiles:putAttribute name="body" value="${body}" />
+ </tiles:insertAttribute>
</TD></TR>
<TR>
- <TD width="120"><tiles:attribute name="menu" /></TD>
+ <TD width="120"><tiles:insertAttribute name="menu" /></TD>
<TD>
<tiles:useAttribute name="body" classname="java.lang.String"/>
<bean:insert id="bodyStr" page="<%=body%>" />
<bean:write name="bodyStr" filter="false"/>
</TD></TR>
<TR>
- <TD colspan="2"><tiles:attribute name="footer" /></TD>
+ <TD colspan="2"><tiles:insertAttribute name="footer" /></TD>
</TR>
</TABLE>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp Tue Feb 6 03:22:41 2007
@@ -41,7 +41,7 @@
<TR>
<TD width="120"><tiles:get name="menu" /></TD>
<TD>
- **<tiles:attribute name="body" flush='true'/>**
+ **<tiles:insertAttribute name="body" flush='true'/>**
</TD></TR>
<TR>
<TD colspan="2"><tiles:get name="footer" /></TD>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test2.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test2.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test2.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test2.jsp Tue Feb 6 03:22:41 2007
@@ -24,9 +24,9 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<tiles:insertTemplate template="/test/myLayout.jsp" flush="true">
- <tiles:put name="title" value="My first page" />
- <tiles:put name="header" value="/test/header.jsp" />
- <tiles:put name="footer" value="/common/footer.jsp" />
- <tiles:put name="menu" value="/basic/menu.jsp" />
- <tiles:put name="body" value="/forwardExampleAction.do" />
+ <tiles:putAttribute name="title" value="My first page" />
+ <tiles:putAttribute name="header" value="/test/header.jsp" />
+ <tiles:putAttribute name="footer" value="/common/footer.jsp" />
+ <tiles:putAttribute name="menu" value="/basic/menu.jsp" />
+ <tiles:putAttribute name="body" value="/forwardExampleAction.do" />
</tiles:insertTemplate>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test3.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test3.jsp?view=diff&rev=504081&r1=504080&r2=504081
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test3.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test3.jsp Tue Feb 6 03:22:41 2007
@@ -25,16 +25,16 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<tiles:insertTemplate template='/test/templateLayout.jsp'>
- <tiles:put name="title" content="My first page" direct="true"/>
- <tiles:put name="header" content="/common/header.jsp" direct="true"/>
- <tiles:put name="footer" content="/common/footer.jsp" />
- <tiles:put name="menu" content="/basic/menu.jsp" direct="true"/>
- <tiles:put name="body" content='/testAction.do' type="page"/>
+ <tiles:putAttribute name="title" content="My first page" direct="true"/>
+ <tiles:putAttribute name="header" content="/common/header.jsp" direct="true"/>
+ <tiles:putAttribute name="footer" content="/common/footer.jsp" />
+ <tiles:putAttribute name="menu" content="/basic/menu.jsp" direct="true"/>
+ <tiles:putAttribute name="body" content='/testAction.do' type="page"/>
</tiles:insertTemplate>
<%--
- <tiles:put name="body" content='/testAction2.do'/>
- <tiles:put name="body" direct='true'>
+ <tiles:putAttribute name="body" content='/testAction2.do'/>
+ <tiles:putAttribute name="body" direct='true'>
<bean:insert id='xout2' page='/forwardExampleAction.do'/>
<bean:write name='xout2' filter='false'/>
</tiles:put>