You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2006/12/03 19:36:30 UTC
svn commit: r481855 [1/2] - in
/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp: ./ common/ doc/
examples/ examples/tiles/ examples/tiles/portal/ layout/ layouts/
layouts/skin1/ test/ tutorial/ tutorial/basic/ tutorial/common/
tutorial/common...
Author: apetrelli
Date: Sun Dec 3 10:36:24 2006
New Revision: 481855
URL: http://svn.apache.org/viewvc?view=rev&rev=481855
Log:
SB-92
Converted JSPs to use the new Tiles 2 tags.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/footer.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/submenu.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/download.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/index.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/installation.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/overview.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tilesTags.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tutorial.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/userGuide.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/index.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myMenuSettings.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortal.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortalSettings.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/portal.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/rssChannels.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/skinSettings.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/summariesTabs.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tabs.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/body.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSettings.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSummary.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalPrefs.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalSettings.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/mySkinSettings.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannelErrors.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannels.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/index.jsp
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/columnsLayout.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/test/menu.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/quickOverview.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testAll.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBackward.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBasic.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testController.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testDefinitions.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testIgnore.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testInclude.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testList.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testRole.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/footer.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/header.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuSrc.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBodyError.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/contentForm.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/useDefinitionConfig.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Channels.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Errors.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/index.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefTile.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefs.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/testChannels.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinition.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/firstDefinition.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/failureBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/successBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/frameset.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/index.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress2.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/lang/lang.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/columnsLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/search.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/strutsForward.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/header.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
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test2.jsp
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test3.jsp
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/footer.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/footer.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/footer.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/footer.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<div align="center">
<font color="#023264" size="-1">
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/submenu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/submenu.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/submenu.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/submenu.jsp Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%@ page import="java.util.Iterator" %>
@@ -81,7 +81,7 @@
</table>
<%-- Following are some code example using this submenu
-<tiles:insert page="/common/submenu.jsp" flush="true">
+<tiles:insertTemplate template="/common/submenu.jsp" flush="true">
<tiles:put name="title" value="Main Menu" />
<tiles:putList name="items" >
<tiles:add value="Home" />
@@ -93,9 +93,9 @@
<tiles:add value="invoice/index.jsp" />
<tiles:add value="invoice/index.jsp" />
</tiles:putList>
-</tiles:insert>
+</tiles:insertTemplate>
-<tiles:insert definition="mainSubMenu" flush="true">
+<tiles:insertDefinition name="mainSubMenu" flush="true">
<tiles:put name="selected" value="Home" />
-</tiles:insert>
+</tiles:insertDefinition>
--%>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp Sun Dec 3 10:36:24 2006
@@ -23,9 +23,9 @@
--%>
<%@ page language="java" %>
<%@ page errorPage="/common/viewSrcBodyError.jsp" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<%-- Include requested resource file.
If file is not found, Exception is thrown, and catched by the errorPage
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/download.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/download.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/download.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/download.jsp Sun Dec 3 10:36:24 2006
@@ -22,8 +22,8 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true">
+<tiles:insertDefinition name="doc.mainLayout" flush="true">
<tiles:put name="body" value="/doc/portal/download.jsp" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/extensionsTags.jsp Sun Dec 3 10:36:24 2006
@@ -22,8 +22,8 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true">
+<tiles:insertDefinition name="doc.mainLayout" flush="true">
<tiles:put name="body" value="/doc/extensionsTags.html" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/index.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/index.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/index.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true" />
+<tiles:insertDefinition name="doc.mainLayout" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/installation.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/installation.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/installation.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/installation.jsp Sun Dec 3 10:36:24 2006
@@ -22,8 +22,8 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true">
+<tiles:insertDefinition name="doc.mainLayout" flush="true">
<tiles:put name="body" value="/doc/installation.html" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/overview.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/overview.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/overview.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/overview.jsp Sun Dec 3 10:36:24 2006
@@ -22,8 +22,8 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true">
+<tiles:insertDefinition name="doc.mainLayout" flush="true">
<tiles:put name="body" value="/doc/overviewBody.html" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tilesTags.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tilesTags.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tilesTags.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tilesTags.jsp Sun Dec 3 10:36:24 2006
@@ -22,8 +22,8 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true">
+<tiles:insertDefinition name="doc.mainLayout" flush="true">
<tiles:put name="body" value="/doc/struts-tilesTags.html" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tutorial.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tutorial.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tutorial.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/tutorial.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="mainLayout" flush="true" />
+<tiles:insertDefinition name="mainLayout" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/userGuide.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/userGuide.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/userGuide.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/doc/userGuide.jsp Sun Dec 3 10:36:24 2006
@@ -22,8 +22,8 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true">
+<tiles:insertDefinition name="doc.mainLayout" flush="true">
<tiles:put name="body" value="/doc/userGuideBody.html" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/index.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/index.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/index.jsp Sun Dec 3 10:36:24 2006
@@ -22,5 +22,5 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<tiles:insert definition="examples.index.page" flush="true" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<tiles:insertDefinition name="examples.index.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myMenuSettings.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myMenuSettings.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myMenuSettings.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myMenuSettings.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.userMenu.settings.page" flush="true" />
+<tiles:insertDefinition name="examples.userMenu.settings.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortal.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortal.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortal.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortal.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.portal.page" flush="true" />
+<tiles:insertDefinition name="examples.portal.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortalSettings.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortalSettings.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortalSettings.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/myPortalSettings.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.portal.settings.page" flush="true" />
+<tiles:insertDefinition name="examples.portal.settings.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/portal.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/portal.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/portal.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/portal.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.portal.page" flush="true" />
+<tiles:insertDefinition name="examples.portal.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/rssChannels.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/rssChannels.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/rssChannels.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/rssChannels.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.rssChannels.page" flush="true" />
+<tiles:insertDefinition name="examples.rssChannels.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/skinSettings.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/skinSettings.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/skinSettings.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/skinSettings.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.skin.settings.page" flush="true" />
+<tiles:insertDefinition name="examples.skin.settings.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/summariesTabs.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/summariesTabs.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/summariesTabs.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/summariesTabs.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.tabs.summaries.page" flush="true" />
+<tiles:insertDefinition name="examples.tabs.summaries.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tabs.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tabs.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tabs.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tabs.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="examples.tabs.page" flush="true" />
+<tiles:insertDefinition name="examples.tabs.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/body.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/body.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/body.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/body.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<div align="center">
<font color="#023264" size="-1">
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSettings.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSettings.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSettings.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSettings.jsp Sun Dec 3 10:36:24 2006
@@ -21,8 +21,8 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%--
Render a page allowing user to customize its menu.
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSummary.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSummary.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSummary.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myMenuSummary.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<div align="center"><font size="+1"><b>
@@ -48,7 +48,7 @@
<li>Edit user menu entries :
<BR><a href="<%=request.getContextPath()%>/examples/myMenuSettings.jsp">my Menu</a></li>
<li>Actual user menu :
- <BR><tiles:insert name="examples.userMenu" flush="true" /></li>
+ <BR><tiles:insertDefinition name="examples.userMenu" flush="true" /></li>
</ul>
</TD>
</TR>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalPrefs.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalPrefs.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalPrefs.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalPrefs.jsp Sun Dec 3 10:36:24 2006
@@ -21,6 +21,6 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="myDynamicPortalPreferences" flush="true" />
+<tiles:insertDefinition name="myDynamicPortalPreferences" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalSettings.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalSettings.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalSettings.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/myPortalSettings.jsp Sun Dec 3 10:36:24 2006
@@ -21,8 +21,8 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<script language="javaScript1.2">
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/mySkinSettings.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/mySkinSettings.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/mySkinSettings.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/mySkinSettings.jsp Sun Dec 3 10:36:24 2006
@@ -21,8 +21,8 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<tiles:importAttribute name="catalog" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/portal/portalBody.jsp Sun Dec 3 10:36:24 2006
@@ -23,7 +23,7 @@
--%>
<%@ taglib uri="/WEB-INF/tiles.tld" prefix="tiles" %>
-<tiles:insert page="/layout/columnsLayout.jsp" flush="true">
+<tiles:insertTemplate template="layout/columnsLayout.jsp" flush="true">
<tiles:put name="numCols" value="2" />
<tiles:putList name="list0" >
<tiles:add value="/tutorial/portal/login.jsp" />
@@ -38,4 +38,4 @@
<tiles:add value="/tutorial/portal/personalLinks.jsp" />
<tiles:add value="/tutorial/portal/search.jsp" />
</tiles:putList>
-</tiles:insert>
\ No newline at end of file
+</tiles:insertTemplate>
\ No newline at end of file
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannelErrors.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannelErrors.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannelErrors.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannelErrors.jsp Sun Dec 3 10:36:24 2006
@@ -30,10 +30,10 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<TABLE border="0" cellspacing="2" cellpadding="4" width="300" align="center" >
<TR>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannels.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannels.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannels.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/examples/tiles/rssChannels.jsp Sun Dec 3 10:36:24 2006
@@ -31,9 +31,9 @@
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<div align="center"><font size="+1"><b>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/index.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/index.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/index.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="doc.mainLayout" flush="true" />
+<tiles:insertDefinition name="doc.mainLayout" flush="true" />
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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout component
parameters : title, header, menu, body, footer
@@ -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:insert attribute="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insert attribute='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:insert attribute='body' />
+ <tiles:insertAttribute name='body' />
</td>
</tr>
<tr>
@@ -51,7 +51,7 @@
</tr>
<tr>
<td colspan="2">
- <tiles:insert attribute="footer" />
+ <tiles:insertAttribute 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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -22,7 +22,7 @@
*/
--%>
<%@ page import="org.apache.struts.tiles.ComponentContext"%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout component
Render a list on severals columns
@@ -45,9 +45,9 @@
System.out.println( "list is null for " + i );
%>
<td valign="top">
- <tiles:insert page="/layout/vboxLayout.jsp" flush="true" >
- <tiles:put name="componentsList" beanName="list" beanScope="page" />
- </tiles:insert>
+ <tiles:insertTemplate template="/layout/vboxLayout.jsp" flush="true" >
+ <tiles:put name="componentsList" value="${pageContext.list}" />
+ </tiles:insertTemplate>
</td>
<%
} // end loop
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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -22,7 +22,7 @@
*/
--%>
<%@ page import="java.util.Iterator"%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout component
Render a list on severals columns
@@ -39,7 +39,7 @@
{
String comp=(String)i.next();
%>
-<tiles:insert name="<%=comp%>" flush="true" />
+<tiles:insertAttribute name="<%=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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Centered Layout Tiles
This layout render a header, left tile, right tile, body and footer.
@@ -35,22 +35,22 @@
<table border="0" width="100%" cellspacing="5">
<tr>
- <td colspan="3"><tiles:insert attribute="header" /></td>
+ <td colspan="3"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insert attribute=right ignore='true'/>
+ <tiles:insertAttribute name=right ignore='true'/>
</td>
<td valign="top" align="left">
- <tiles:insert attribute='body' />
+ <tiles:insertAttribute name='body' />
</td>
<td valign="top" align="left">
- <tiles:insert attribute='left' ignore='true'/>
+ <tiles:insertAttribute name='left' ignore='true'/>
</td>
</tr>
<tr>
<td colspan="3">
- <tiles:insert attribute="footer" />
+ <tiles:insertAttribute 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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout Tiles
This layout create a html page with <header> and <body> tags. It render
@@ -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:insert attribute="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td width="140" valign="top">
- <tiles:insert attribute='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
<td valign="top" align="left">
- <tiles:insert attribute='body' />
+ <tiles:insertAttribute name='body' />
</td>
</tr>
<tr>
<td colspan="2">
- <tiles:insert attribute="footer" />
+ <tiles:insertAttribute name="footer" />
</td>
</tr>
</table>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/layouts/columnsLayout.jsp Sun Dec 3 10:36:24 2006
@@ -22,7 +22,7 @@
*/
--%>
<%@ page import="org.apache.struts.tiles.ComponentContext"%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Multi-columns Layout
This layout render lists of tiles in multi-columns. Each column renders its tiles
@@ -53,9 +53,9 @@
System.out.println( "list is null for " + i );
%>
<td valign="top">
- <tiles:insert page="/layouts/vboxLayout.jsp" flush="true" >
- <tiles:put name="list" beanName="list" beanScope="page" />
- </tiles:insert>
+ <tiles:insertTemplate template="/layouts/vboxLayout.jsp" flush="true" >
+ <tiles:put name="list" value="${pageContext.list}" />
+ </tiles:insertTemplate>
</td>
<%
} // end loop
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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%@ page import="java.util.Iterator" %>
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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%--
Tabs Layout .
@@ -116,7 +116,7 @@
<tr>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
<td>
- <tiles:insert name="<%=selectedBody%>" flush="true" />
+ <tiles:insertAttribute 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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout Tiles
This layout create a html page with <header> and <body> tags. It render
@@ -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:insert attribute="header" /></td>
+ <td colspan="2"><tiles:insertAttribute name="header" /></td>
</tr>
<tr>
<td valign="top" align="left">
- <tiles:insert attribute='body' />
+ <tiles:insertAttribute name='body' />
</td>
<td width="140" valign="top">
- <tiles:insert attribute='menu'/>
+ <tiles:insertAttribute name='menu'/>
</td>
</tr>
<tr>
<td colspan="2">
- <tiles:insert attribute="footer" />
+ <tiles:insertAttribute 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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%--
Tabs Layout .
@@ -104,7 +104,7 @@
<tr>
<td width="10" bgcolor="<%=selectedColor%>"> </td>
<td>
- <tiles:insert name="<%=selectedBody%>" flush="true" />
+ <tiles:insertAttribute 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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -22,7 +22,7 @@
*/
--%>
<%@ page import="java.util.Iterator"%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout component
Render a list of tiles in a vertical column
@@ -43,7 +43,7 @@
{
String name= (String)i.next();
%>
-<tiles:insert name="<%=name%>" flush="true" />
+<tiles:insertAttribute name="<%=name%>" flush="true" />
<br>
<%
@@ -58,7 +58,7 @@
<%--
<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
<c:forEach var="name" items="${list}">
- <tiles:insert beanName="name" flush="true" />
+ <tiles:insertDefinition name="${name}" flush="true" />
<br>
</c:forEach>
--%>
@@ -67,9 +67,9 @@
Use struts <iterate> tag. Work on jsp1.2 and greater web container.
--%>
<%--
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<logic:iterate id="name" name="list" type="java.lang.String">
- <tiles:insert beanName="name" flush="false" />
+ <tiles:insertDefinition name="${name}" flush="false" />
<br>
</logic:iterate>
--%>
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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
@@ -35,9 +35,9 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title"/></strong></td>
</tr>
<tr>
-<td><tiles:insert attribute="header"/></td>
+<td><tiles:insertAttribute name="header"/></td>
</tr>
<tr>
-<td><tiles:insert attribute="body"/></td>
+<td><tiles:insertAttribute 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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
@@ -33,10 +33,10 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title" ignore="false" /></strong></td>
</tr>
<tr>
-<td><tiles:insert attribute="header" ignore="true"/></td>
+<td><tiles:insertAttribute name="header" ignore="true"/></td>
</tr>
<tr>
-<td><tiles:insert attribute="body" ignore="true"/>
+<td><tiles:insertAttribute name="body" ignore="true"/>
</td>
</tr>
</table>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/menu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/menu.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/menu.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/menu.jsp Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%@ page import="java.util.Iterator" %>
<%--
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/quickOverview.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/quickOverview.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/quickOverview.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/quickOverview.jsp Sun Dec 3 10:36:24 2006
@@ -22,6 +22,6 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="test.home.page" flush="true" />
+<tiles:insertDefinition name="test.home.page" flush="true" />
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testAll.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testAll.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testAll.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testAll.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
In the right column you can find some basic examples,
@@ -32,27 +32,27 @@
<td><strong>Sources</strong></td>
</tr>
<tr>
- <td valign="top"><tiles:insert page="testBasic.jsp" /></td>
+ <td valign="top"><tiles:insertTemplate template="testBasic.jsp" /></td>
<td valign="top">
- <tiles:insert page="/common/viewSrcBody.jsp">
+ <tiles:insertTemplate template="/common/viewSrcBody.jsp">
<tiles:put name="srcPath" value="/test/testBasic.jsp" />
- </tiles:insert>
+ </tiles:insertTemplate>
</td>
</tr>
<tr>
- <td valign="top"><tiles:insert page="testList.jsp" /></td>
+ <td valign="top"><tiles:insertTemplate template="testList.jsp" /></td>
<td valign="top">
- <tiles:insert page="/common/viewSrcBody.jsp">
+ <tiles:insertTemplate template="/common/viewSrcBody.jsp">
<tiles:put name="srcPath" value="/test/testList.jsp" />
- </tiles:insert>
+ </tiles:insertTemplate>
</td>
</tr>
<tr>
- <td valign="top"><tiles:insert page="testDefinitions.jsp" /></td>
+ <td valign="top"><tiles:insertTemplate template="testDefinitions.jsp" /></td>
<td valign="top">
- <tiles:insert page="/common/viewSrcBody.jsp">
+ <tiles:insertTemplate template="/common/viewSrcBody.jsp">
<tiles:put name="srcPath" value="/test/testDefinitions.jsp" />
- </tiles:insert>
+ </tiles:insertTemplate>
</td>
</tr>
</table>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBackward.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBackward.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBackward.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBackward.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test backward compatibility
--%>
@@ -29,10 +29,10 @@
<hr>
<strong>Check synonyms for include and put.</strong>
<br>
-<tiles:insert component="layout.jsp">
+<tiles:insertTemplate template="layout.jsp">
<tiles:put name="title" value="Test with a tag body" direct="true" />
<tiles:put name="header" value="header.jsp">
<strong>This is a header</strong>
</tiles:put>
<tiles:put name="body" value="body.jsp" direct="false" />
-</tiles:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBasic.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBasic.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBasic.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testBasic.jsp Sun Dec 3 10:36:24 2006
@@ -21,38 +21,38 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test tags basic behaviors
--%>
<hr>
<strong>Basic template usage</strong>
<br>
-<tiles:insert template="layout.jsp">
+<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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Specify attribute types</strong>
<br>
-<tiles:insert template="layout.jsp">
+<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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Set attribute value with tag body</strong>
<br>
-<tiles:insert template="layout.jsp">
+<tiles:insertTemplate template="layout.jsp">
<tiles:put name="title" value="Test with a tag body" />
<tiles:put name="header" type="string">
<strong>This header is inserted as body of tag</strong>
</tiles:put>
<tiles:put name="body" value="body.jsp"/>
-</tiles:insert>
+</tiles:insertTemplate>
<hr>
<strong>Use of definition</strong>
@@ -62,22 +62,22 @@
<tiles:put name="header" value="header.jsp" />
<tiles:put name="body" value="body.jsp" />
</tiles:definition>
-<tiles:insert beanName="templateDefinition" />
+<tiles:insertDefinition name="templateDefinition" />
<hr>
<strong>Use of definition, overload of parameters </strong>Title parameter
from previous definition is overloaded
<br>
-<tiles:insert beanName="templateDefinition" >
+<tiles:insertDefinition name="templateDefinition" >
<tiles:put name="title" value="Use of definition, overload of parameters" type="string" />
-</tiles:insert>
+</tiles:insertDefinition>
<hr>
<strong>Test ignore : body isn't defined </strong>(We use another layout)
<br>
-<tiles:insert template="layoutTestIgnore.jsp">
+<tiles:insertTemplate template="layoutTestIgnore.jsp">
<tiles:put name="title" value="Test ignore : body isn't defined" />
<tiles:put name="header" value="header.jsp" />
-</tiles:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testController.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testController.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testController.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testController.jsp Sun Dec 3 10:36:24 2006
@@ -21,33 +21,33 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test tiles Controller call
--%>
<hr>
<strong>Test controller set in definition from config file</strong>
<br>
-<tiles:insert definition="test.struts.controller" >
-</tiles:insert>
+<tiles:insertDefinition name="test.struts.controller" >
+</tiles:insertDefinition>
<hr>
<strong>Test controller set in insert</strong>
<br>
-<tiles:insert template="layout.jsp"
+<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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Test controller set in insert, and attribute from definition</strong>
<br>
-<tiles:insert definition="test.layout.test1"
+<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:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testDefinitions.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testDefinitions.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testDefinitions.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testDefinitions.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test template definitions (from factory)
--%>
@@ -34,26 +34,26 @@
</tiles:definition>
<br>
-<tiles:insert beanName="definition"/>
+<tiles:insertDefinition name="definition"/>
<hr>
<strong>Insert definition defined in factory</strong>
<br>
-<tiles:insert definition="test.layout.test1"/>
+<tiles:insertDefinition name="test.layout.test1"/>
<hr>
<strong>Insert definition defined in factory</strong>
<br>
-<tiles:insert definition="test.layout.test2"/>
+<tiles:insertDefinition name="test.layout.test2"/>
<hr>
<strong>Insert definition defined in factory</strong>
<br>
-<tiles:insert definition="test.layout.test3"/>
+<tiles:insertDefinition name="test.layout.test3"/>
<hr>
<strong>Insert definition defined in factory : Overload title attribute</strong>
<br>
-<tiles:insert definition="test.layout.test3">
+<tiles:insertDefinition name="test.layout.test3">
<tiles:put name="title" value="Test definition : overload attribute 'title'" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testIgnore.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testIgnore.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testIgnore.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testIgnore.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test 'ignore' attribute :
Insert components/templates with undefined attributes, or bad urls.
@@ -30,19 +30,19 @@
<hr>
<strong>Test ignore : body isn't defined</strong>
<br>
-<tiles:insert template="layoutTestIgnore.jsp">
+<tiles:insertTemplate template="layoutTestIgnore.jsp">
<tiles:put name="title" value="Test ignore : body isn't defined" />
<tiles:put name="header" value="header.jsp" />
-</tiles:insert>
+</tiles:insertTemplate>
<hr>
<strong>Test ignore : bad body definition name (exception must be shown)</strong>
<br>
-<tiles:insert template="layoutTestIgnore.jsp">
+<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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Test ignore : Definition not found (no errors, no insertion)</strong>
@@ -52,14 +52,14 @@
<tiles:put name="header" value="header.jsp" />
<tiles:put name="body" value="body.jsp" />
</tiles:definition>
-<tiles:insert beanName="badTemplateDefinitionName" ignore="true"/>
+<tiles:insertDefinition name="badTemplateDefinitionName" ignore="true"/>
<hr>
<strong>Test ignore : bad body urls (exception must be shown)</strong>
<br>
-<tiles:insert template="layoutTestIgnore.jsp">
+<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:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testInclude.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testInclude.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testInclude.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testInclude.jsp Sun Dec 3 10:36:24 2006
@@ -21,8 +21,8 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test jsp include in a BodyTag (<iterate>).
--%>
@@ -70,7 +70,7 @@
<br>
include number <%= position++ %>
<br>
- <tiles:insert definition="test.layout.test1" flush="false"/>
+ <tiles:insertDefinition name="test.layout.test1" flush="false"/>
</logic:iterate>
<strong>Done</strong>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testList.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testList.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testList.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testList.jsp Sun Dec 3 10:36:24 2006
@@ -21,13 +21,13 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<strong>Example of list usage</strong>
<%-- Insert a menu component.
Menu component require two lists : one of items, and one of links.
--%>
-<tiles:insert component="menu.jsp" >
+<tiles:insertTemplate template="menu.jsp" >
<tiles:put name="title" value="Test menu" />
<tiles:putList name="items">
<tiles:add value="home" />
@@ -41,4 +41,4 @@
<tiles:add value="/../struts-documentation"/>
<tiles:add value="/../comps-doc" type="string" />
</tiles:putList>
-</tiles:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testRole.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testRole.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testRole.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testRole.jsp Sun Dec 3 10:36:24 2006
@@ -21,25 +21,25 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test tags basic behaviors
--%>
<hr>
<strong>Show Component if 'tomcat' role is set</strong>
<br>
-<tiles:insert template="layout.jsp" role="tomcat">
+<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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Show Component if 'role1' role is set</strong>
<br>
-<tiles:insert template="layout.jsp" role="role1">
+<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:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/test/testStrutsAction.jsp Sun Dec 3 10:36:24 2006
@@ -21,39 +21,39 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test tiles and struts action integration (require factory)
--%>
<hr>
<strong>Test definition set in action, and action forward to another definition</strong>
<br>
-<tiles:insert page="/test/testAction.do" >
+<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" />
<%-- 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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Test overload parameter in action</strong>
<br>
-<tiles:insert page="/test/testAction.do" >
+<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" />
<%-- 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:insert>
+</tiles:insertTemplate>
<hr>
<strong>Test definition set in action, and action forward directly to jsp</strong>
<br>
-<tiles:insert page="/test/testActionForwardJsp.do" >
+<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:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Frameset Layout component
parameters : title, header, menu, body, footer
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=481855&r1=481854&r2=481855
==============================================================================
--- 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 Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%-- Layout component
parameters : title, header, menu, body, footer
@@ -36,12 +36,12 @@
<TABLE width="100%">
<TR>
- <TD colspan="2"><tiles:insert attribute="header" /></TD></TR>
+ <TD colspan="2"><tiles:insertAttribute name="header" /></TD></TR>
<TR>
- <TD width="120"><tiles:insert attribute="menu" /></TD>
- <TD><tiles:insert attribute="body" /></TD></TR>
+ <TD width="120"><tiles:insertAttribute name="menu" /></TD>
+ <TD><tiles:insertAttribute name="body" /></TD></TR>
<TR>
- <TD colspan="2"><tiles:insert attribute="footer" /></TD>
+ <TD colspan="2"><tiles:insertAttribute name="footer" /></TD>
</TR>
</TABLE>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicFramesetPage.jsp Sun Dec 3 10:36:24 2006
@@ -21,12 +21,12 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert template="/tutorial/basic/myFramesetLayout.jsp" >
+<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:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/basicPage.jsp Sun Dec 3 10:36:24 2006
@@ -21,12 +21,12 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert page="/tutorial/basic/myLayout.jsp" flush="true">
+<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:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/footer.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/footer.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/footer.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/footer.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<div align="center">
<font color="#023264" size="-1">
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/header.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/header.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/header.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/header.jsp Sun Dec 3 10:36:24 2006
@@ -21,7 +21,7 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<P>
<html:img page="/images/id_nav_outside.gif" align="left" border="0"/>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu.jsp Sun Dec 3 10:36:24 2006
@@ -21,12 +21,12 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert page="/layout/vboxLayout.jsp" flush="true" >
+<tiles:insertTemplate template="/layout/vboxLayout.jsp" flush="true" >
<tiles:putList name="componentsList" >
<tiles:add value="/tutorial/common/menu/menuLogo.jsp" />
<tiles:add value="/tutorial/common/menu/menuLinks.jsp" />
<tiles:add value="/tutorial/common/menu/menuSrc.jsp" />
</tiles:putList>
-</tiles:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuLinks.jsp Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert page="/common/submenu.jsp" flush="true">
+<tiles:insertTemplate template="/common/submenu.jsp" flush="true">
<tiles:put name="title" value="Main Menu" />
<tiles:putList name="items" >
<tiles:add value="Home" />
@@ -35,4 +35,4 @@
<tiles:add value="/tutorial/basicPage.jsp" />
<tiles:add value="/tutorial/portalPage.jsp" />
</tiles:putList>
-</tiles:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuSrc.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuSrc.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuSrc.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menu/menuSrc.jsp Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert page="/tutorial/common/menuViewSrc.jsp" flush="true" >
+<tiles:insertTemplate template="/tutorial/common/menuViewSrc.jsp" flush="true" >
<tiles:putList name="list" >
<tiles:add value="/tutorial/basicPage.jsp" />
<tiles:add value="/tutorial/portalPage.jsp" />
@@ -34,4 +34,4 @@
<tiles:add value="/layout/classicLayout.jsp" />
<tiles:add value="/layout/vboxLayout.jsp" />
</tiles:putList>
-</tiles:insert>
+</tiles:insertTemplate>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp Sun Dec 3 10:36:24 2006
@@ -22,9 +22,9 @@
*/
--%>
<%@ page import="java.util.Iterator"%>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%-- Menu of sources component
This component is a menu of sources. When a source is clicked, its
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp Sun Dec 3 10:36:24 2006
@@ -21,9 +21,9 @@
*
*/
--%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
<%@ page import="java.util.Iterator" %>
@@ -81,7 +81,7 @@
</table>
<%-- Following are some code example using this submenu
-<tiles:insert page="/common/submenu.jsp" flush="true">
+<tiles:insertTemplate template="/common/submenu.jsp" flush="true">
<tiles:put name="title" value="Main Menu" />
<tiles:putList name="items" >
<tiles:add value="Home" />
@@ -93,9 +93,9 @@
<tiles:add value="invoice/index.jsp" />
<tiles:add value="invoice/index.jsp" />
</tiles:putList>
-</tiles:insert>
+</tiles:insertTemplate>
-<tiles:insert definition="mainSubMenu" flush="true">
+<tiles:insertDefinition name="mainSubMenu" flush="true">
<tiles:put name="selected" value="Home" />
-</tiles:insert>
+</tiles:insertDefinition>
--%>
Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp?view=diff&rev=481855&r1=481854&r2=481855
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrc.jsp Sun Dec 3 10:36:24 2006
@@ -22,9 +22,9 @@
*/
--%>
<%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<tiles:insert definition="mainLayout" flush="true" >
+<tiles:insertDefinition name="mainLayout" flush="true" >
<tiles:put name="title" value="JSP Source Code" />
<tiles:put name="body" value="/tutorial/common/viewSrcBody.jsp" />
-</tiles:insert>
+</tiles:insertDefinition>