Author: apetrelli
Date: Sun Dec  3 13:29:33 2006
New Revision: 481905

URL: http://svn.apache.org/viewvc?view=rev&rev=481905
Log:
SB-92
Ported Tiles configuration files to Tiles 2, with the exclusion of porting 
"controllerUrl".

Modified:
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml
    
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
 Sun Dec  3 13:29:33 2006
@@ -41,7 +41,7 @@
   <!-- =======================================================  -->
 
   <!-- Doc index page description  -->
-  <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+  <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
          <put name="title"  value="Tiles Library Documentation" />
          <put name="header" value="/common/header.jsp" />
          <put name="menu"   value="doc.menu.main" />
@@ -53,7 +53,7 @@
   <!-- Main page body definitions                                              
                        -->
   <!-- =======================================================  -->
 
-  <definition name="doc.portal.body" path="/layout/columnsLayout.jsp">
+  <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
     <put name="numCols" value="2" />
     <putList name="list0" >
       <add value="/doc/portal/welcome.jsp" />
@@ -76,7 +76,7 @@
   <!-- =======================================================  -->
 
   <!-- Menu bar definition -->
-<definition name="doc.menu.main" path="/layouts/vboxLayout.jsp" >
+<definition name="doc.menu.main" template="/layouts/vboxLayout.jsp" >
   <putList name="list" >
     <add value="common.menu.home" />
     <add value="common.menu.examples" />
@@ -86,7 +86,7 @@
 </definition>
 
   <!-- The home menu definition -->
-<definition name="common.menu.home" path="/layouts/menu.jsp" >
+<definition name="common.menu.home" template="/layouts/menu.jsp" >
   <put name="title" value="Tiles" />
   <putList name="items" >
     <item value="Tiles Home"     link="/index.jsp" />
@@ -94,7 +94,7 @@
 </definition>
 
   <!-- Printer friendly menu definition -->
-<definition name="common.menu.examples" path="/layouts/menu.jsp" >
+<definition name="common.menu.examples" template="/layouts/menu.jsp" >
   <put name="title" value="Examples" />
   <putList name="items" >
     <item value="Home"     link="/examples/index.jsp" />
@@ -102,7 +102,7 @@
 </definition>
 
   <!-- Documentation menu definition v1.1-->
-<definition name="common.menu.doc" path="/layouts/menu.jsp" >
+<definition name="common.menu.doc" template="/layouts/menu.jsp" >
   <put name="title" value="Documentation" />
     <putList name="items" >
       <item value="Home"           link="/doc/index.jsp"  />
@@ -125,7 +125,7 @@
 </definition>
 
   <!-- Printer friendly menu definition -->
-<definition name="common.menu.printer.friendly" path="/layouts/menu.jsp" >
+<definition name="common.menu.printer.friendly" template="/layouts/menu.jsp" >
   <put name="title" value="Printer Versions" />
   <putList name="items" >
     <item value="Quick Overview"     link="/test/testAll.jsp" />

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
 Sun Dec  3 13:29:33 2006
@@ -36,7 +36,7 @@
   <!-- =======================================================  -->
 
   <!-- Doc index page description  -->
-  <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+  <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
          <put name="title"  value="Tiles Library Documentation" />
          <put name="header" value="/common/header.jsp" />
          <put name="menu"   value="doc.menu.main" />
@@ -48,7 +48,7 @@
   <!-- Main page body definitions                                              
                        -->
   <!-- =======================================================  -->
 
-  <definition name="doc.portal.body" path="/layout/columnsLayout.jsp">
+  <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
     <put name="numCols" value="2" />
     <putList name="list0" >
       <add value="/doc/portal/welcome.jsp" />
@@ -71,7 +71,7 @@
   <!-- =======================================================  -->
 
   <!-- Menu bar definition -->
-<definition name="doc.menu.main" path="/layout/vboxLayout.jsp" >
+<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
   <putList name="componentsList" >
     <add value="doc.menu.links" />
     <add value="doc.menu.taglib.references" />
@@ -81,7 +81,7 @@
 </definition>
 
   <!-- Documentation menu definition v1.1-->
-<definition name="doc.menu.links" path="/layouts/menu.jsp" >
+<definition name="doc.menu.links" template="/layouts/menu.jsp" >
   <put name="title" value="Documentation" />
     <putList name="items" >
       <item value="Home"           link="/index.jsp"  />
@@ -107,7 +107,7 @@
 </definition>
 
   <!-- Printer friendly menu definition -->
-<definition name="doc.menu.printer.friendly" path="/layouts/menu.jsp" >
+<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
   <put name="title" value="Printer Versions" />
   <putList name="items" >
     <item value="Quick Overview"     link="/test/testAll.jsp" />
@@ -118,7 +118,7 @@
 </definition>
 
   <!-- Taglib menu definition -->
-<definition name="doc.menu.taglib.references" path="/layouts/menu.jsp" >
+<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
   <put name="title" value="Tag Library Reference" />
     <putList name="items" >
       <item value="Tiles Tags"     link="/doc/tilesTags.jsp" />
@@ -127,7 +127,7 @@
 </definition>
 
   <!-- Oldies menu definition -->
-<definition name="doc.menu.old.documents" path="/layouts/menu.jsp" >
+<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
   <put name="title" value="Old Documents" />
   <putList name="items" >
     <item value="Overview (old)"     link="/doc/overview.jsp" />

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
 Sun Dec  3 13:29:33 2006
@@ -36,7 +36,7 @@
   <!-- =======================================================  -->
 
   <!-- Master layout and default tiles used by all pages -->
-  <definition name="examples.masterPage" path="/layouts/classicLayout.jsp">
+  <definition name="examples.masterPage" template="/layouts/classicLayout.jsp">
          <put name="title"  value="Tiles 1.1 Examples" />
          <put name="header" value="/examples/tiles/header.jsp" />
          <put name="menu"   value="examples.menu.bar" />
@@ -51,7 +51,7 @@
   <!-- =======================================================  -->
 
   <!-- Test nested list -->
-<definition name="test.nested.list" path="/layouts/vboxLayout.jsp" >
+<definition name="test.nested.list" template="/layouts/vboxLayout.jsp" >
   <putList name="list" >
     <item value="item1" link="/examples/tabs.jsp"/>
     <item value="item2" link="/examples/tabs.jsp"/>
@@ -77,7 +77,7 @@
 
   <!-- Menu bar definition -->
   <!-- Some definitions come from other definition files (ex : doc.menu.*) -->
-<definition name="examples.menu.bar" path="/layouts/vboxLayout.jsp" >
+<definition name="examples.menu.bar" template="/layouts/vboxLayout.jsp" >
   <putList name="list" >
     <add value="common.menu.home" />
     <add value="examples.userMenu" />
@@ -94,7 +94,7 @@
   It allows to define common attributes in one place.
        Actually, it only defines the layout used to render menus.
    -->
-<definition name="examples.menu.root" path="/layouts/menu.jsp"  >
+<definition name="examples.menu.root" template="/layouts/menu.jsp"  >
 </definition>
 
   <!--
@@ -103,7 +103,7 @@
   Definition only contains default items.
   -->
 <definition name="examples.userMenu" extends="examples.menu.root"
-            
controllerClass="org.apache.struts.webapp.tiles.portal.UserMenuAction"  >
+            preparer="org.apache.struts.webapp.tiles.portal.UserMenuAction"  >
   <put name="catalogSettings" value="examples.myMenu.catalog.settings"/>
   <put name="catalogName" value="examples.portal.menuCatalog"/>
   <put name="title" value="My Menu" />
@@ -169,7 +169,7 @@
   </definition>
 
     <!-- Portal Body declaration-->
-  <definition name="examples.index.portal.body" 
path="/layouts/columnsLayout.jsp" >
+  <definition name="examples.index.portal.body" 
template="/layouts/columnsLayout.jsp" >
          <put name="numCols" value="2" />
          <putList name="list0" >
            <add value="/examples/tiles/portalSummary.jsp" />
@@ -199,7 +199,7 @@
   </definition>
 
     <!-- Portal Body declaration-->
-  <definition name="examples.portal.body" path="/layouts/columnsLayout.jsp"
+  <definition name="examples.portal.body" template="/layouts/columnsLayout.jsp"
               controllerUrl="/examples/myPortal.do" >
          <put name="numCols" value="2" />
          <putList name="list0" >
@@ -243,7 +243,7 @@
     <!-- Portal settings Body declaration-->
        <!-- Extends portal body to provide the same default set of tiles -->
   <definition name="examples.portal.settings.body"
-              path="/examples/tiles/myPortalSettings.jsp"
+              template="/examples/tiles/myPortalSettings.jsp"
               extends="examples.portal.body"
                          
controllerUrl="/examples/controller/myPortalSettings.do" >
   </definition>
@@ -261,7 +261,7 @@
     <!-- Portal settings Body declaration-->
        <!-- Extends user menu body to provide the same default parameters -->
   <definition name="examples.userMenu.settings.body"
-              path="/examples/tiles/myMenuSettings.jsp"
+              template="/examples/tiles/myMenuSettings.jsp"
               extends="examples.userMenu"
                          
controllerUrl="/examples/controller/myMenuSettings.do" >
          <putList name="defaultChoice" >
@@ -285,7 +285,7 @@
   </definition>
 
          <!-- body using tabs -->
-  <definition name="examples.tabs.body" path="/layouts/tabsLayout.jsp" >
+  <definition name="examples.tabs.body" template="/layouts/tabsLayout.jsp" >
        <put name="selectedIndex"  value="0" />
        <put name="parameterName"  value="selected" />
     <putList name="tabList" >
@@ -313,7 +313,7 @@
   </definition>
 
          <!-- body using tabs -->
-  <definition name="examples.tabs.summaries.body" 
path="/layouts/tabsLayout.jsp" >
+  <definition name="examples.tabs.summaries.body" 
template="/layouts/tabsLayout.jsp" >
        <put name="selectedIndex"  value="0" />
        <put name="parameterName"  value="selected" />
     <putList name="tabList" >
@@ -343,7 +343,7 @@
     <!-- Rss channel body declaration-->
        <!-- Example to use when connected (online)-->
   <definition name="examples.rssChannel.body"
-              path="/examples/tiles/rssChannels.jsp"
+              template="/examples/tiles/rssChannels.jsp"
                          controllerUrl="/examples/controller/rssChannel.do" >
     <putList name="urls" >
            <!--<add value="http://www.newsforge.com/newsforge.rss"; /> -->
@@ -355,7 +355,7 @@
     <!-- Rss channel body declaration-->
        <!-- Example whith local feeds (offline)-->
   <definition name="examples.rssChannel.offline.body"
-              path="/examples/tiles/rssChannels.jsp"
+              template="/examples/tiles/rssChannels.jsp"
                          controllerUrl="/examples/controller/rssChannel.do" >
       <putList name="urls" >
            <add value="/examples/rssFeed/rss-example.xml" />
@@ -375,7 +375,7 @@
 
     <!-- Skin body declaration-->
   <definition name="examples.skin.settings.body"
-              path="/examples/tiles/mySkinSettings.jsp"
+              template="/examples/tiles/mySkinSettings.jsp"
                          
controllerUrl="/examples/controller/mySkinSettings.do" >
          <put name="userSettingsName"   
value="tiles.examples.skin.user.settings" />
          <!--<put name="catalogName"   value="tiles.examples.skin.catalog" 
/>-->
@@ -394,7 +394,7 @@
           -->
        <definition name="examples.customizable.layouts.root"
                    extends="examples.masterPage"
-                               path="/examples/controller/layoutSwitch.do"   >
+                               template="/examples/controller/layoutSwitch.do" 
  >
          <put name="userSettingsName"   
value="tiles.examples.skin.user.settings" />
          <!--<put name="catalogName"   value="tiles.examples.skin.catalog" 
/>-->
          <put name="catalogSettings"   value="examples.available.skins" />

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
 Sun Dec  3 13:29:33 2006
@@ -38,7 +38,7 @@
 </definition>
 
   <!-- Test menu definition -->
-<definition name="test.menu.links" path="/layouts/menu.jsp" >
+<definition name="test.menu.links" template="/layouts/menu.jsp" >
   <put name="title" value="Tests" />
     <putList name="items" >
       <item value="All in one"     link="/test/index.jsp"  />
@@ -52,64 +52,64 @@
 </definition>
 
   <!-- Test instances -->
-<definition name="test.layout.test1" path="/test/layout.jsp" >
+<definition name="test.layout.test1" template="/test/layout.jsp" >
   <put name="title"  value="Test definition from factory : basic" />
   <put name="header" value="header.jsp" />
   <put name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test instances -->
-<definition name="test.layout.test2" path="/test/layout.jsp" >
+<definition name="test.layout.test2" template="/test/layout.jsp" >
   <put name="title"  value="Test definition from factory : specify types"   
type="string" />
-  <put name="header" value="header.jsp" type="page"   />
-  <put name="body"   value="body.jsp"   type="page"   />
+  <put name="header" value="header.jsp" type="template"   />
+  <put name="body"   value="body.jsp"   type="template"   />
 </definition>
 
   <!-- Test instances -->
-<definition name="test.layout.test3" path="/test/layout.jsp" >
+<definition name="test.layout.test3" template="/test/layout.jsp" >
   <put name="title"  value="Test definition from factory : Test with a tag 
body (to do)" />
-  <put name="header" value="This is a header" direct="true"/>
+  <put name="header" value="This is a header" type="string"/>
   <put name="body"   value="body.jsp"/>
 </definition>
 
   <!-- Test backward compatibility -->
-<definition name="test.layout.test4" path="/test/layout.jsp" >
+<definition name="test.layout.test4" template="/test/layout.jsp" >
     <put name="title"  value="Test definition from factory: backward 
compatibility"
-         direct="true"/>
+         type="string"/>
   <put name="header" value="header.jsp"/>
-  <put name="body"   value="body.jsp" direct="false" />
+  <put name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test Struts Action and Tiles integration -->
-<definition name="test.struts.action" path="/test/layout.jsp" >
+<definition name="test.struts.action" template="/test/layout.jsp" >
     <put name="title"  value="Test Struts Action and Tiles integration: 
default title"
-         direct="true"/>
+         type="string"/>
   <put name="header" value="header.jsp"/>
-  <put name="body"   value="body.jsp" direct="false" />
+  <put name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test Struts Action and Tiles integration -->
-<definition name="test.struts.action.fail" path="/test/failpage.jsp" >
-  <put name="title"  value="Test fail" direct="true" />
+<definition name="test.struts.action.fail" template="/test/failpage.jsp" >
+  <put name="title"  value="Test fail" type="string" />
 </definition>
 
   <!-- Test Tiles Controller -->
   <definition name="test.struts.controller"
-              path="/test/layout.jsp"
-      controllerClass="org.apache.struts.webapp.tiles.test.TestTileController" 
>
+              template="/test/layout.jsp"
+      preparer="org.apache.struts.webapp.tiles.test.TestTileController" >
   <put name="title"  value="Test Tile Controller : call to Controller" />
   <put name="header" value="header.jsp"/>
   <put name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test body for put tag -->
-<definition name="test.body" path="/test/failpage.jsp" >
-  <put name="title"  direct="true">first body : title</put>
-  <put name="body"  direct="true">second body : body</put>
+<definition name="test.body" template="/test/failpage.jsp" >
+  <put name="title"  type="string">first body : title</put>
+  <put name="body"  type="string">second body : body</put>
 </definition>
 
   <!-- Test instances -->
-<definition name="test.action.noforward" path="/test/layout.jsp" >
+<definition name="test.action.noforward" template="/test/layout.jsp" >
   <put name="title"  value="Test Action with No Forward" />
   <put name="header" value="header.jsp" />
   <put name="body"   value="showRequestUri.jsp" />

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml
 Sun Dec  3 13:29:33 2006
@@ -32,7 +32,7 @@
 <tiles-definitions>
 
   <!-- Definition description  -->
-  <definition name="myFirstDefinition" 
path="/tutorial/layout/classicLayout.jsp">
+  <definition name="myFirstDefinition" 
template="/tutorial/layout/classicLayout.jsp">
          <put name="title"  value="My First Definition Page" />
          <!-- <put name="title" >My First Definition Page</put> -->
          <put name="header" value="/tutorial/common/header.jsp" />
@@ -42,7 +42,7 @@
   </definition>
 
   <!-- Main Layout Definition description  -->
-  <definition name="mainLayout" path="/tutorial/layout/classicLayout.jsp">
+  <definition name="mainLayout" template="/tutorial/layout/classicLayout.jsp">
          <put name="title"  value="World Financial Online" />
          <put name="header" value="/tutorial/common/header.jsp" />
          <put name="footer" value="/tutorial/common/footer.jsp" />
@@ -51,7 +51,7 @@
   </definition>
   
     <!-- Portal Body declaration-->
-  <definition name="main.portal.body" path="/layout/columnsLayout.jsp">
+  <definition name="main.portal.body" template="/layout/columnsLayout.jsp">
          <put name="numCols" value="2" />
          <putList name="list0" >
            <add value="/tutorial/portal/login.jsp" />
@@ -69,7 +69,7 @@
   </definition>
 
   <!-- Main menu definition -->
-<definition name="menu.main" path="/layout/vboxLayout.jsp" >
+<definition name="menu.main" template="/layout/vboxLayout.jsp" >
   <putList name="componentsList" >
     <add value="menu.logo" />
     <add value="menu.documentation" />
@@ -80,11 +80,11 @@
 </definition>
 
   <!-- menu logo definition -->
-<definition name="menu.logo" path="/tutorial/common/menu/menuLogo.jsp" />
+<definition name="menu.logo" template="/tutorial/common/menu/menuLogo.jsp" />
   
   <!-- Documentation menu -->
   <!-- Old style menu. Check module 'examples' for new style -->
-<definition name="menu.documentation" path="/common/submenu.jsp" >
+<definition name="menu.documentation" template="/common/submenu.jsp" >
   <put name="title" value="Tiles" />
   <putList name="items" >
     <add value="Home" />
@@ -95,7 +95,7 @@
 </definition>
 
   <!-- menu logo definition -->
-<definition name="menu.links" path="/common/submenu.jsp" >
+<definition name="menu.links" template="/common/submenu.jsp" >
   <put name="title" value="Tutorial" />
   <putList name="items" >
     <add value="Home" />
@@ -132,7 +132,7 @@
 </definition>
 
   <!-- Menu sources definition -->
-<definition name="menu.src" path="/tutorial/common/menuViewSrc.jsp" >
+<definition name="menu.src" template="/tutorial/common/menuViewSrc.jsp" >
   <putList name="list" >
     <add value="/tutorial/index.jsp" />
     <add value="/tutorial/basicPage.jsp" />
@@ -172,7 +172,7 @@
 </definition>
 
   <!-- select language menu -->
-<definition name="menu.lang" path="/common/submenu.jsp" >
+<definition name="menu.lang" template="/common/submenu.jsp" >
   <put name="title" value="Language" />
   <putList name="items" >
     <add value="Français" />
@@ -215,7 +215,7 @@
   <!-- =======================================================  -->
 
   <!-- Dynamic portal main page (uses common layout) -->
-<definition name="rssChannelTile" path="/tutorial/actions/rssChannel.do" >
+<definition name="rssChannelTile" template="/tutorial/actions/rssChannel.do" >
       <putList name="urls" >
   <!-- 
            <add value="http://www.newsforge.com/newsforge.rss"; />
@@ -226,7 +226,7 @@
 </definition>
 
   <!-- Dynamic portal main page (uses common layout) -->
-<definition name="rssLocalChannelTile"  path="/tutorial/actions/rssChannel.do" 
>
+<definition name="rssLocalChannelTile"  
template="/tutorial/actions/rssChannel.do" >
       <putList name="urls" >
            <add value="/examples/rssFeed/rss-example.xml" />
            <add value="/examples/rssFeed/apacheweek-headlines.xml" />
@@ -245,7 +245,7 @@
   <!-- =======================================================  -->
   
     <!-- Dynamic portal body (Define default list) -->
-<definition name="dynamic.portal.body" path="/tutorial/actions/myPortal.do" >
+<definition name="dynamic.portal.body" 
template="/tutorial/actions/myPortal.do" >
          <put name="numCols" value="2" />
          <putList name="list0" >
            <add value="/tutorial/portal/login.jsp" />
@@ -278,7 +278,7 @@
 
     <!-- Dynamic portal preferences body (extends portal.body to inherit 
default list) -->
   <definition name="dynamic.portal.prefs.body"
-              path="/tutorial/actions/myPortalPrefs.tile.do"
+              template="/tutorial/actions/myPortalPrefs.tile.do"
               extends="dynamic.portal.body">
 </definition>
 

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml
 Sun Dec  3 13:29:33 2006
@@ -41,7 +41,7 @@
   </definition>
   
   <!-- select language menu -->
-<definition name="menu.lang" path="/common/submenu.jsp" >
+<definition name="menu.lang" template="/common/submenu.jsp" >
   <put name="title" value="Sprache" />
   <putList name="items" >
     <add value="Englisch" />

Modified: 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml?view=diff&rev=481905&r1=481904&r2=481905
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml
 Sun Dec  3 13:29:33 2006
@@ -41,7 +41,7 @@
   </definition>
   
   <!-- select language menu -->
-<definition name="menu.lang" path="/common/submenu.jsp" >
+<definition name="menu.lang" template="/common/submenu.jsp" >
   <put name="title" value="Langue" />
   <putList name="items" >
     <add value="English" />


Reply via email to