Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/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/tutorial/common/viewSrcBodyError.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBodyError.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBodyError.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBodyError.jsp Sun Dec 3 10:36:24 2006 @@ -23,9 +23,9 @@ --%> <%@ page language="java" %> <%@ page isErrorPage="true" %> -<%@ 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" %> <logic:present parameter="src" > Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/contentForm.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/contentForm.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/contentForm.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/contentForm.jsp Sun Dec 3 10:36:24 2006 @@ -21,8 +21,8 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitionTag.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitionTag.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" %> <tiles:definition id="definitionName" template="/tutorial/basic/myLayout.jsp" > <tiles:put name="title" value="My first page" /> @@ -31,4 +31,4 @@ <tiles:put name="body" value="/tutorial/basic/helloBody.jsp" /> </tiles:definition> -<tiles:insert beanName="definitionName" flush="true" /> +<tiles:insertDefinition name="definitionName" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/definitionsConfig.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" %> <%-- Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/firstDefinitionPage.jsp Sun Dec 3 10:36:24 2006 @@ -21,8 +21,8 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> -<tiles:insert definition="myFirstDefinition" flush="true" > +<tiles:insertDefinition name="myFirstDefinition" flush="true" > <tiles:put name="title" value="My first Definition Page" /> -</tiles:insert> +</tiles:insertDefinition> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/simpleBody.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="/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="/portal/login.jsp" /> @@ -38,4 +38,4 @@ <tiles:add value="/portal/personalLinks.jsp" /> <tiles:add value="/portal/search.jsp" /> </tiles:putList> -</tiles:insert> +</tiles:insertTemplate> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/useDefinitionConfig.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/useDefinitionConfig.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/useDefinitionConfig.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/definitions/useDefinitionConfig.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" %> <%-- @@ -32,5 +32,5 @@ <%@ include file="definitionsConfig.jsp" %> -<tiles:insert beanName="masterLayout" beanScope="request" /> +<tiles:insertDefinition name="${requestScope.masterLayout}" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynFramesetPage.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" %> -<tiles:insert template="/tutorial/basic/myFramesetLayout.jsp" beanName="templateDefinition" > +<tiles:insertDefinition template="/tutorial/basic/myFramesetLayout.jsp" definition="templateDefinition" > <%-- Uncomment lines to overload parameters --%> <%-- <tiles:put name="title" content="My first frameset page" direct="true" /> --%> <%-- <tiles:put name="header" content="/tutorial/common/header.jsp" direct="true"/> --%> <%-- <tiles:put name="footer" content="/tutorial/common/footer.jsp" direct="true"/> --%> <%-- <tiles:put name="menu" content="/tutorial/basic/menu.jsp" direct="true"/> --%> <%-- <tiles:put name="body" content="/tutorial/basic/helloBody.jsp" direct="true"/> --%> -</tiles:insert> +</tiles:insertDefinition> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Channels.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Channels.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Channels.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Channels.jsp Sun Dec 3 10:36:24 2006 @@ -30,9 +30,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" %> <tiles:importAttribute name="CHANNELS" scope="page"/> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Errors.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Errors.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Errors.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/Errors.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/tutorial/dynPortal/index.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/index.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/index.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="myDynamicPortal" flush="true" /> +<tiles:insertDefinition name="myDynamicPortal" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefTile.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefTile.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefTile.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefTile.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/tutorial/dynPortal/myPortalPrefs.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefs.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/myPortalPrefs.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/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/tutorial/dynPortal/testChannels.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/testChannels.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/testChannels.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/dynPortal/testChannels.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="test.rssChannel.page" flush="true" /> +<tiles:insertDefinition name="test.rssChannel.page" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinition.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinition.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinition.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinition.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="extended.definition.example" flush="true" /> +<tiles:insertDefinition name="extended.definition.example" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/extendedDefinitionTag.jsp Sun Dec 3 10:36:24 2006 @@ -21,10 +21,10 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> <tiles:definition id="definitionName" extends="myFirstDefinition" > <tiles:put name="title" value="My first extended definition tag page" /> </tiles:definition> -<tiles:insert beanName="definitionName" flush="true" /> +<tiles:insertDefinition name="definitionName" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/firstDefinition.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/firstDefinition.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/firstDefinition.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/firstDefinition.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="myFirstDefinition" flush="true" /> +<tiles:insertDefinition name="myFirstDefinition" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/failureBody.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/failureBody.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/failureBody.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/failureBody.jsp Sun Dec 3 10:36:24 2006 @@ -21,8 +21,8 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> Struts forward to 'failure'. <br> -<tiles:insert page="/tutorial/forward/forwardBody.jsp" flush="true" /> +<tiles:insertTemplate template="/tutorial/forward/forwardBody.jsp" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/successBody.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/successBody.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/successBody.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/forward/successBody.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" %> Struts forward to 'success'. <br> -<tiles:insert page="/tutorial/forward/forwardBody.jsp" flush="true" /> +<tiles:insertTemplate template="/tutorial/forward/forwardBody.jsp" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/frameset.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/frameset.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/frameset.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/frameset.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 Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/index.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/index.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/index.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="mainLayout" flush="true" /> +<tiles:insertDefinition name="mainLayout" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp Sun Dec 3 10:36:24 2006 @@ -21,9 +21,9 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ 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-html"; prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <%-- Edit an Address object @param bean An address object to edit. Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress2.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress2.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress2.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress2.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" %> <%@ taglib uri="/WEB-INF/extensions.tld" prefix="ext" %> -<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <%-- Edit an Address object @param address An address object to edit. Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.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="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ 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-html"; prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <html:errors/> @@ -66,10 +66,10 @@ <%-- Include an "address editor" component. --%> <%-- Pass the component name and component value as parameter --%> <%-- Value comes from the form bean --%> - <tiles:insert page="/tutorial/invoice/editAddress.jsp" > + <tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" > <tiles:put name="property" value="shippingAddress" /> - <tiles:put name="bean" beanName="invoiceForm" /> - </tiles:insert> + <tiles:put name="bean" value="${invoiceForm}" /> + </tiles:insertTemplate> </td> </tr> @@ -83,10 +83,10 @@ </tr> <tr> <td align="center" colspan="2"> - <tiles:insert page="/tutorial/invoice/editAddress.jsp" > + <tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" > <tiles:put name="property" value="billAddress" /> - <tiles:put name="bean" beanName="invoiceForm" /> - </tiles:insert> + <tiles:put name="bean" value="${invoiceForm}" /> + </tiles:insertTemplate> </td> </tr> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.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="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ 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-html"; prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <html:errors/> @@ -66,10 +66,10 @@ <%-- Include an "address editor" component. --%> <%-- Pass the component name and component value as parameter --%> <%-- Value comes from the form bean --%> - <tiles:insert page="/tutorial/invoice/editAddress.jsp" > + <tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" > <tiles:put name="compName" value="shippingAddress" /> - <tiles:put name="address" beanName="invoiceForm" beanProperty="shippingAddress" /> - </tiles:insert> + <tiles:put name="address" name="${invoiceForm.shippingAddress}" /> + </tiles:insertTemplate> </td> </tr> @@ -83,10 +83,10 @@ </tr> <tr> <td align="center" colspan="2"> - <tiles:insert page="/tutorial/invoice/editAddress.jsp" > + <tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" > <tiles:put name="compName" value="billAddress" /> - <tiles:put name="address" beanName="invoiceForm" beanProperty="billAddress" /> - </tiles:insert> + <tiles:put name="address" value="${invoiceForm.billAddress}" /> + </tiles:insertTemplate> </td> </tr> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/invoice/index.jsp Sun Dec 3 10:36:24 2006 @@ -22,10 +22,10 @@ */ --%> <%@ 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="body" value="/tutorial/invoice/editInvoice.jsp" /> <%-- <tiles:put name="body" value="/tutorial/invoice/editInvoice2.jsp" /> --%> -</tiles:insert> +</tiles:insertDefinition> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/lang/lang.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/lang/lang.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/lang/lang.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/lang/lang.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" %> <a href="tutorial/lang.do?language=FR">Francais</a> <br> 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=481855&r1=481854&r2=481855 ============================================================================== --- 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 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 render a header, left menu, body and footer. @@ -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: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> @@ -59,7 +59,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/tutorial/layout/columnsLayout.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/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 in 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/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=481855&r1=481854&r2=481855 ============================================================================== --- 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 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 @@ -38,7 +38,7 @@ Wait until jsp1.3 <logic:iterate id="comp" name="list" type="String" > - <tiles:insert name="<%=comp%>" flush="false" /> + <tiles:insertAttribute name="<%=comp%>" flush="false" /> <br> </logic:iterate> --%> @@ -50,7 +50,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/tutorial/overloadDefinitionParameters.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/overloadDefinitionParameters.jsp Sun Dec 3 10:36:24 2006 @@ -21,8 +21,8 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> -<tiles:insert definition="myFirstDefinition" flush="true" > +<tiles:insertDefinition name="myFirstDefinition" flush="true" > <tiles:put name="title" value="My First Definition Page With Overloaded Title" /> -</tiles:insert> +</tiles:insertDefinition> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/portalBody.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="/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> +</tiles:insertTemplate> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/search.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/search.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/search.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portal/search.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-bean.tld" prefix="bean" %> +<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <div align="center"><font size="+1"><b> <TABLE border=0 cellPadding=2 cellSpacing=0 width=190> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portalPage.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/portalPage.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" %> -<tiles:insert page="/tutorial/layout/classicLayout.jsp" flush="true"> +<tiles:insertTemplate template="/tutorial/layout/classicLayout.jsp" flush="true"> <tiles:put name="title" value="My First Portal Page" /> <tiles:put name="header" value="/tutorial/common/header.jsp" /> <tiles:put name="footer" value="/tutorial/common/footer.jsp" /> <tiles:put name="menu" value="/tutorial/basic/menu.jsp" /> <%-- <tiles:put name="menu" value="/tutorial/common/menu.jsp" /> --%> <tiles:put name="body" value="/tutorial/portal/portalBody.jsp" /> -</tiles:insert> +</tiles:insertTemplate> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/strutsForward.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/strutsForward.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/strutsForward.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/strutsForward.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="forward.example.choice.page" flush="true" /> +<tiles:insertDefinition name="forward.example.choice.page" flush="true" /> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test.jsp Sun Dec 3 10:36:24 2006 @@ -21,8 +21,8 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> <html:html> <head> @@ -33,10 +33,10 @@ <bean:insert id='xout2' page='/testAction.do'/> <bean:write name='xout2' filter='true'/> - <tiles:insert template="/forwardExampleAction.do"> + <tiles:insertTemplate template="/forwardExampleAction.do"> <tiles:put name="label" content="Text:" direct="true"/> <tiles:put name="property" content="contentForm" direct="true"/> - </tiles:insert> + </tiles:insertTemplate> </body> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/header.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/header.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/header.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test/header.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-bean.tld" prefix="bean" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <P><img src="<%=request.getContextPath()%>/images/id_nav_outside.gif" align="left" border="0"> 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=481855&r1=481854&r2=481855 ============================================================================== --- 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 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-bean.tld" prefix="bean" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <%-- Layout component parameters : title, header, menu, body, footer @@ -38,19 +38,21 @@ <TR> <TD colspan="2"> - <tiles:insert attribute="header" > - <tiles:put name="body" beanName="body" beanScope="template" /> - </tiles:insert> + <tiles:insertAttribute name="header" > + <%-- FIXME It had beanScope="template", check if the definition is taken + from componentContext--%> + <tiles:put name="body" value="${body}" /> + </tiles:insertAttribute> </TD></TR> <TR> - <TD width="120"><tiles:insert attribute="menu" /></TD> + <TD width="120"><tiles:insertAttribute name="menu" /></TD> <TD> <tiles:useAttribute name="body" classname="java.lang.String"/> <bean:insert id="bodyStr" page="<%=body%>" /> <bean:write name="bodyStr" filter="false"/> </TD></TR> <TR> - <TD colspan="2"><tiles: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/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=481855&r1=481854&r2=481855 ============================================================================== --- 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 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-bean.tld" prefix="bean" %> +<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %> +<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> <%-- Layout component parameters : title, header, menu, body, footer @@ -41,7 +41,7 @@ <TR> <TD width="120"><tiles:get name="menu" /></TD> <TD> - **<tiles:insert name="body" flush='true'/>** + **<tiles:insertAttribute name="body" flush='true'/>** </TD></TR> <TR> <TD colspan="2"><tiles:get name="footer" /></TD> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test2.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test2.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test2.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test2.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="/test/myLayout.jsp" flush="true"> +<tiles:insertTemplate template="/test/myLayout.jsp" flush="true"> <tiles:put name="title" value="My first page" /> <tiles:put name="header" value="/test/header.jsp" /> <tiles:put name="footer" value="/common/footer.jsp" /> <tiles:put name="menu" value="/basic/menu.jsp" /> <tiles:put name="body" value="/forwardExampleAction.do" /> -</tiles:insert> +</tiles:insertTemplate> Modified: struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test3.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test3.jsp?view=diff&rev=481855&r1=481854&r2=481855 ============================================================================== --- struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test3.jsp (original) +++ struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/tutorial/test3.jsp Sun Dec 3 10:36:24 2006 @@ -21,16 +21,16 @@ * */ --%> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> -<%@ 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-bean"; prefix="bean" %> -<tiles:insert template='/test/templateLayout.jsp'> +<tiles:insertTemplate template='/test/templateLayout.jsp'> <tiles:put name="title" content="My first page" direct="true"/> <tiles:put name="header" content="/common/header.jsp" direct="true"/> <tiles:put name="footer" content="/common/footer.jsp" /> <tiles:put name="menu" content="/basic/menu.jsp" direct="true"/> <tiles:put name="body" content='/testAction.do' type="page"/> -</tiles:insert> +</tiles:insertTemplate> <%-- <tiles:put name="body" content='/testAction2.do'/>
