Author: apetrelli
Date: Mon Jan 8 05:08:13 2007
New Revision: 494054
URL: http://svn.apache.org/viewvc?view=rev&rev=494054
Log:
SB-92
Fixed showcase a bit, now the homepage shows correctly.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-doc-config.xml
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/menu.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
Mon Jan 8 05:08:13 2007
@@ -167,7 +167,7 @@
* If a key isn't recognize, it is disguarded from the returned list.
* If a key correspond to a special key, appropriate 'definition' is
created.
* Returned list contains tiles URL, definition name and definitions
suitable
- * as attribute of <tiles:insertAttribute >.
+ * as attribute of <tiles:attribute >.
*
* @keys array of keys to add to list.
*/
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-config.xml
Mon Jan 8 05:08:13 2007
@@ -66,7 +66,7 @@
<!-- ========== TilesPlugin settings ===================================== -->
<!-- You should declare this plugin if you want to use Tiles with an XML
definition file. -->
- <plug-in className="org.apache.struts.tiles.TilesPlugin" >
+ <plug-in className="org.apache.struts.tiles2.TilesPlugin" >
<!-- Path to XML definition file -->
<set-property property="definitions-config"
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-doc-config.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-doc-config.xml?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-doc-config.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-doc-config.xml
Mon Jan 8 05:08:13 2007
@@ -59,7 +59,7 @@
<message-resources
parameter="org.apache.tiles.showcase.dev1-1.ApplicationResources" null="false"
/>
- <plug-in className="org.apache.struts.tiles.TilesPlugin" >
+ <plug-in className="org.apache.struts.tiles2.TilesPlugin" >
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml,
/WEB-INF/tiles-doc-defs.xml" />
<set-property property="moduleAware" value="true" />
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
Mon Jan 8 05:08:13 2007
@@ -149,7 +149,7 @@
<!-- ========== TilesPlugin settings ===================================== -->
<!-- You should declare this plugin if you want to use Tiles with an XML
definition file. -->
- <plug-in className="org.apache.struts.tiles.TilesPlugin" >
+ <plug-in className="org.apache.struts.tiles2.TilesPlugin" >
<!-- Path to XML definition files -->
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml,/WEB-INF/tiles-examples-defs.xml"/>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
Mon Jan 8 05:08:13 2007
@@ -105,7 +105,7 @@
<message-resources
parameter="org.apache.tiles.showcase.dev1-1.ApplicationResources" null="false"
/>
- <plug-in className="org.apache.struts.tiles.TilesPlugin" >
+ <plug-in className="org.apache.struts.tiles2.TilesPlugin" >
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml,
/WEB-INF/tiles-tests-defs.xml" />
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
Mon Jan 8 05:08:13 2007
@@ -160,7 +160,7 @@
<!-- ========== TilesPlugin settings ===================================== -->
<!-- You should declare this plugin if you want to use Tiles with an XML
definition file. -->
- <plug-in className="org.apache.struts.tiles.TilesPlugin" >
+ <plug-in className="org.apache.struts.tiles2.TilesPlugin" >
<!-- Path to XML definition files -->
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml,
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/web.xml
Mon Jan 8 05:08:13 2007
@@ -23,11 +23,10 @@
*/
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.4//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_4.dtd";>
-
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+ version="2.4">
<display-name>Struts Tiles Documentation</display-name>
<!-- Action Servlet Configuration -->
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/classicLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
Mon Jan 8 05:08:13 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:insertAttribute name="header" /></td>
+ <td colspan="2"><tiles:attribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insertAttribute name='menu'/>
+ <tiles:attribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:insertAttribute name='body' />
+ <tiles:attribute name='body' />
</td>
</tr>
<tr>
@@ -51,7 +51,7 @@
</tr>
<tr>
<td colspan="2">
- <tiles:insertAttribute name="footer" />
+ <tiles:attribute name="footer" />
</td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -21,7 +21,6 @@
*
*/
--%>
-<%@ page import="org.apache.struts.tiles.ComponentContext"%>
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
<%-- Layout component
@@ -36,17 +35,18 @@
<tr>
<%
int numCols = Integer.parseInt(numColsStr);
-ComponentContext context = ComponentContext.getContext( request );
+//ComponentContext context = ComponentContext.getContext( request );
for( int i=0; i<numCols; i++ )
{
- java.util.List list=(java.util.List)context.getAttribute( "list" + i );
- pageContext.setAttribute("list", list );
- if(list==null)
- System.out.println( "list is null for " + i );
+// java.util.List list=(java.util.List)context.getAttribute( "list" + i );
+// pageContext.setAttribute("list", list );
+// if(list==null)
+// System.out.println( "list is null for " + i );
%>
+<tiles:importAttribute toName="list" name="<%="list" + i %>"/>
<td valign="top">
<tiles:insertTemplate template="/layout/vboxLayout.jsp" flush="true" >
- <tiles:put name="componentsList" value="${pageContext.list}" />
+ <tiles:put name="componentsList" value="${pageScope.list}" />
</tiles:insertTemplate>
</td>
<%
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -39,7 +39,7 @@
{
String comp=(String)i.next();
%>
-<tiles:insertAttribute name="<%=comp%>" flush="true" />
+<tiles:insertTemplate template="<%=comp%>" flush="true" />
<br>
<%
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/centerLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -35,22 +35,22 @@
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="3"><tiles:insertAttribute name="header" /></td>
+ <td colspan="3"><tiles:attribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insertAttribute name=right ignore='true'/>
+ <tiles:attribute name=right ignore='true'/>
</td>
<td valign="top" align="left">
- <tiles:insertAttribute name='body' />
+ <tiles:attribute name='body' />
</td>
<td valign="top" align="left">
- <tiles:insertAttribute name='left' ignore='true'/>
+ <tiles:attribute name='left' ignore='true'/>
</td>
</tr>
<tr>
<td colspan="3">
- <tiles:insertAttribute name="footer" />
+ <tiles:attribute name="footer" />
</td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/classicLayout.jsp
Mon Jan 8 05:08:13 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:insertAttribute name="header" /></td>
+ <td colspan="2"><tiles:attribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insertAttribute name='menu'/>
+ <tiles:attribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:insertAttribute name='body' />
+ <tiles:attribute name='body' />
</td>
</tr>
<tr>
<td colspan="2">
- <tiles:insertAttribute name="footer" />
+ <tiles:attribute name="footer" />
</td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/menu.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/menu.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/menu.jsp
(original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/menu.jsp
Mon Jan 8 05:08:13 2007
@@ -50,7 +50,7 @@
</logic:present>
<%-- iterate on items list --%>
-<logic:iterate id="item" name="items"
type="org.apache.struts.tiles.beans.MenuItem" >
+<logic:iterate id="item" name="items" type="org.apache.tiles.beans.MenuItem" >
<% // Add site url if link start with "/"
String link = item.getLink();
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/nestedTabsLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -116,7 +116,7 @@
<tr>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
<td>
- <tiles:insertAttribute name="<%=selectedBody%>" flush="true" />
+ <tiles:attribute name="<%=selectedBody%>" flush="true" />
</td>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
</tr>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/skin1/menuLeftLayout.jsp
Mon Jan 8 05:08:13 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:insertAttribute name="header" /></td>
+ <td colspan="2"><tiles:attribute name="header" /></td>
</tr>
<tr>
<td valign="top" align="left">
- <tiles:insertAttribute name='body' />
+ <tiles:attribute name='body' />
</td>
<td width="140" valign="top">
- <tiles:insertAttribute name='menu'/>
+ <tiles:attribute name='menu'/>
</td>
</tr>
<tr>
<td colspan="2">
- <tiles:insertAttribute name="footer" />
+ <tiles:attribute name="footer" />
</td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/tabsLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -104,7 +104,7 @@
<tr>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
<td>
- <tiles:insertAttribute name="<%=selectedBody%>" flush="true" />
+ <tiles:attribute name="<%=selectedBody%>" flush="true" />
</td>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
</tr>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -43,7 +43,7 @@
{
String name= (String)i.next();
%>
-<tiles:insertAttribute name="<%=name%>" flush="true" />
+<tiles:insertDefinition name="<%=name%>" flush="true" />
<br>
<%
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layout.jsp
(original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layout.jsp
Mon Jan 8 05:08:13 2007
@@ -35,9 +35,9 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title"/></strong></td>
</tr>
<tr>
-<td><tiles:insertAttribute name="header"/></td>
+<td><tiles:attribute name="header"/></td>
</tr>
<tr>
-<td><tiles:insertAttribute name="body"/></td>
+<td><tiles:attribute name="body"/></td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/layoutTestIgnore.jsp
Mon Jan 8 05:08:13 2007
@@ -33,10 +33,10 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title" ignore="false"
/></strong></td>
</tr>
<tr>
-<td><tiles:insertAttribute name="header" ignore="true"/></td>
+<td><tiles:attribute name="header" ignore="true"/></td>
</tr>
<tr>
-<td><tiles:insertAttribute name="body" ignore="true"/>
+<td><tiles:attribute name="body" ignore="true"/>
</td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -36,12 +36,12 @@
<TABLE width="100%">
<TR>
- <TD colspan="2"><tiles:insertAttribute name="header" /></TD></TR>
+ <TD colspan="2"><tiles:attribute name="header" /></TD></TR>
<TR>
- <TD width="120"><tiles:insertAttribute name="menu" /></TD>
- <TD><tiles:insertAttribute name="body" /></TD></TR>
+ <TD width="120"><tiles:attribute name="menu" /></TD>
+ <TD><tiles:attribute name="body" /></TD></TR>
<TR>
- <TD colspan="2"><tiles:insertAttribute name="footer" /></TD>
+ <TD colspan="2"><tiles:attribute name="footer" /></TD>
</TR>
</TABLE>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/classicLayout.jsp
Mon Jan 8 05:08:13 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:insertAttribute name="header" /></td>
+ <td colspan="2"><tiles:attribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insertAttribute name='menu'/>
+ <tiles:attribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:insertAttribute name='body' />
+ <tiles:attribute name='body' />
</td>
</tr>
<tr>
@@ -59,7 +59,7 @@
</tr>
<tr>
<td colspan="2">
- <tiles:insertAttribute name="footer" />
+ <tiles:attribute name="footer" />
</td>
</tr>
</table>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -38,7 +38,7 @@
Wait until jsp1.3
<logic:iterate id="comp" name="list" type="String" >
- <tiles:insertAttribute name="<%=comp%>" flush="false" />
+ <tiles:attribute name="<%=comp%>" flush="false" />
<br>
</logic:iterate>
--%>
@@ -50,7 +50,7 @@
{
String comp=(String)i.next();
%>
-<tiles:insertAttribute name="<%=comp%>" flush="true" />
+<tiles:attribute name="<%=comp%>" flush="true" />
<br>
<%
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -38,21 +38,21 @@
<TR>
<TD colspan="2">
- <tiles:insertAttribute name="header" >
+ <tiles:attribute name="header" >
<%-- FIXME It had beanScope="template", check if the definition is
taken
from componentContext--%>
<tiles:put name="body" value="${body}" />
- </tiles:insertAttribute>
+ </tiles:attribute>
</TD></TR>
<TR>
- <TD width="120"><tiles:insertAttribute name="menu" /></TD>
+ <TD width="120"><tiles:attribute 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:insertAttribute name="footer" /></TD>
+ <TD colspan="2"><tiles:attribute name="footer" /></TD>
</TR>
</TABLE>
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp?view=diff&rev=494054&r1=494053&r2=494054
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
Mon Jan 8 05:08:13 2007
@@ -41,7 +41,7 @@
<TR>
<TD width="120"><tiles:get name="menu" /></TD>
<TD>
- **<tiles:insertAttribute name="body" flush='true'/>**
+ **<tiles:attribute name="body" flush='true'/>**
</TD></TR>
<TR>
<TD colspan="2"><tiles:get name="footer" /></TD>
