You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/02/14 16:22:35 UTC

svn commit: r507573 - in /tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF: tiles-defs.xml tiles-doc-defs.xml tiles-examples-defs.xml tiles-tests-defs.xml tiles-tutorial-defs.xml tiles-tutorial-defs_de.xml tiles-tutorial-defs_fr.xml

Author: apetrelli
Date: Wed Feb 14 07:22:34 2007
New Revision: 507573

URL: http://svn.apache.org/viewvc?view=rev&rev=507573
Log:
Converted "camel case" attributes to be dash-separated for the showcase application.

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

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-defs.xml Wed Feb 14 07:22:34 2007
@@ -42,11 +42,11 @@
 
   <!-- Doc index page description  -->
   <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
-	  <putAttribute name="title"  value="Tiles Library Documentation" />
-	  <putAttribute name="header" value="/common/header.jsp" />
-	  <putAttribute name="menu"   value="doc.menu.main" />
-	  <putAttribute name="footer" value="/common/footer.jsp" />
-	  <putAttribute name="body"   value="doc.portal.body" />
+	  <put-attribute name="title"  value="Tiles Library Documentation" />
+	  <put-attribute name="header" value="/common/header.jsp" />
+	  <put-attribute name="menu"   value="doc.menu.main" />
+	  <put-attribute name="footer" value="/common/footer.jsp" />
+	  <put-attribute name="body"   value="doc.portal.body" />
   </definition>
 
   <!-- =======================================================  -->
@@ -54,21 +54,21 @@
   <!-- =======================================================  -->
 
   <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
-    <putAttribute name="numCols" value="2" />
-    <putListAttribute name="list0" >
-      <addAttribute value="/doc/portal/welcome.jsp" />
-      <addAttribute value="/doc/portal/features.jsp" />
-      <!--<addAttribute value="/doc/portal/todo.jsp" /> -->
-      <addAttribute value="/doc/portal/documentation.jsp" />
-    </putListAttribute>
-    <putListAttribute name="list1" >
-      <addAttribute value="/doc/portal/news.jsp" />
-      <addAttribute value="/doc/portal/download.jsp" />
-      <addAttribute value="/doc/portal/tilesCompsTemplates.jsp" />
-      <addAttribute value="/doc/portal/strutsIntegration.jsp" />
-      <addAttribute value="/doc/portal/comments.jsp" />
-      <addAttribute value="/doc/portal/revisions.jsp" />
-    </putListAttribute>
+    <put-attribute name="numCols" value="2" />
+    <put-list-attribute name="list0" >
+      <add-attribute value="/doc/portal/welcome.jsp" />
+      <add-attribute value="/doc/portal/features.jsp" />
+      <!--<add-attribute value="/doc/portal/todo.jsp" /> -->
+      <add-attribute value="/doc/portal/documentation.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="list1" >
+      <add-attribute value="/doc/portal/news.jsp" />
+      <add-attribute value="/doc/portal/download.jsp" />
+      <add-attribute value="/doc/portal/tilesCompsTemplates.jsp" />
+      <add-attribute value="/doc/portal/strutsIntegration.jsp" />
+      <add-attribute value="/doc/portal/comments.jsp" />
+      <add-attribute value="/doc/portal/revisions.jsp" />
+    </put-list-attribute>
   </definition>
   
   <!-- =======================================================  -->
@@ -77,34 +77,34 @@
 
   <!-- Menu bar definition -->
 <definition name="doc.menu.main" template="/layouts/vboxLayout.jsp" >
-  <putListAttribute name="list" >
-    <addAttribute value="common.menu.home" />
-    <addAttribute value="common.menu.examples" />
-    <addAttribute value="common.menu.doc" />
-    <!-- <putAttribute value="common.menu.printer.friendly" /> -->
-  </putListAttribute>
+  <put-list-attribute name="list" >
+    <add-attribute value="common.menu.home" />
+    <add-attribute value="common.menu.examples" />
+    <add-attribute value="common.menu.doc" />
+    <!-- <put-attribute value="common.menu.printer.friendly" /> -->
+  </put-list-attribute>
 </definition>
 
   <!-- The home menu definition -->
 <definition name="common.menu.home" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Tiles" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Tiles" />
+  <put-list-attribute name="items" >
     <item value="Tiles Home"     link="/index.jsp" />
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
   <!-- Printer friendly menu definition -->
 <definition name="common.menu.examples" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Examples" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Examples" />
+  <put-list-attribute name="items" >
     <item value="Home"     link="/examples/index.jsp" />
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
   <!-- Documentation menu definition v1.1-->
 <definition name="common.menu.doc" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Documentation" />
-    <putListAttribute name="items" >
+  <put-attribute name="title" value="Documentation" />
+    <put-list-attribute name="items" >
       <item value="Home"           link="/doc/index.jsp" />
       <item value="Live Examples"  link="/examples/index.jsp"  />
       <item value="Quick overview" link="/test/quickOverview.jsp"  />
@@ -119,18 +119,18 @@
       <item value="Struts Home"            link="http://www.apache.org"
             icon="/images/struts-power.gif" />
 	  -->
-    </putListAttribute>
+    </put-list-attribute>
 </definition>
 
   <!-- Printer friendly menu definition -->
 <definition name="common.menu.printer.friendly" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Printer Versions" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Printer Versions" />
+  <put-list-attribute name="items" >
     <item value="Quick Overview"     link="/test/testAll.jsp" />
     <item value="Tutorial"           link="/doc/tutorialBody.html" />
     <item value="User Guide"         link="/doc/userGuideBody.html" />
     <item value="Overview (old)"  	 link="/doc/overviewBody.html" />
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
 </tiles-definitions>

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-doc-defs.xml Wed Feb 14 07:22:34 2007
@@ -37,11 +37,11 @@
 
   <!-- Doc index page description  -->
   <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
-	  <putAttribute name="title"  value="Tiles Library Documentation" />
-	  <putAttribute name="header" value="/common/header.jsp" />
-	  <putAttribute name="menu"   value="doc.menu.main" />
-	  <putAttribute name="footer" value="/common/footer.jsp" />
-	  <putAttribute name="body"   value="doc.portal.body" />
+	  <put-attribute name="title"  value="Tiles Library Documentation" />
+	  <put-attribute name="header" value="/common/header.jsp" />
+	  <put-attribute name="menu"   value="doc.menu.main" />
+	  <put-attribute name="footer" value="/common/footer.jsp" />
+	  <put-attribute name="body"   value="doc.portal.body" />
   </definition>
 
   <!-- =======================================================  -->
@@ -49,21 +49,21 @@
   <!-- =======================================================  -->
 
   <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
-    <putAttribute name="numCols" value="2" />
-    <putListAttribute name="list0" >
-      <addAttribute value="/doc/portal/welcome.jsp" />
-      <addAttribute value="/doc/portal/features.jsp" />
-      <!--<addAttribute value="/doc/portal/todo.jsp" /> -->
-      <addAttribute value="/doc/portal/documentation.jsp" />
-    </putListAttribute>
-    <putListAttribute name="list1" >
-      <addAttribute value="/doc/portal/news.jsp" />
-      <addAttribute value="/doc/portal/download.jsp" />
-      <addAttribute value="/doc/portal/tilesCompsTemplates.jsp" />
-      <addAttribute value="/doc/portal/strutsIntegration.jsp" />
-      <addAttribute value="/doc/portal/comments.jsp" />
-      <addAttribute value="/doc/portal/revisions.jsp" />
-    </putListAttribute>
+    <put-attribute name="numCols" value="2" />
+    <put-list-attribute name="list0" >
+      <add-attribute value="/doc/portal/welcome.jsp" />
+      <add-attribute value="/doc/portal/features.jsp" />
+      <!--<add-attribute value="/doc/portal/todo.jsp" /> -->
+      <add-attribute value="/doc/portal/documentation.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="list1" >
+      <add-attribute value="/doc/portal/news.jsp" />
+      <add-attribute value="/doc/portal/download.jsp" />
+      <add-attribute value="/doc/portal/tilesCompsTemplates.jsp" />
+      <add-attribute value="/doc/portal/strutsIntegration.jsp" />
+      <add-attribute value="/doc/portal/comments.jsp" />
+      <add-attribute value="/doc/portal/revisions.jsp" />
+    </put-list-attribute>
   </definition>
   
   <!-- =======================================================  -->
@@ -72,18 +72,18 @@
 
   <!-- Menu bar definition -->
 <definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
-  <putListAttribute name="componentsList" >
-    <addAttribute value="doc.menu.links" />
-    <addAttribute value="doc.menu.taglib.references" />
-    <addAttribute value="doc.menu.printer.friendly" />
-    <addAttribute value="doc.menu.old.documents" />
-  </putListAttribute>
+  <put-list-attribute name="componentsList" >
+    <add-attribute value="doc.menu.links" />
+    <add-attribute value="doc.menu.taglib.references" />
+    <add-attribute value="doc.menu.printer.friendly" />
+    <add-attribute value="doc.menu.old.documents" />
+  </put-list-attribute>
 </definition>
 
   <!-- Documentation menu definition v1.1-->
 <definition name="doc.menu.links" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Documentation" />
-    <putListAttribute name="items" >
+  <put-attribute name="title" value="Documentation" />
+    <put-list-attribute name="items" >
       <item value="Home"           link="/index.jsp"  />
       <item value="Live Examples (new)" link="/examples/index.jsp"  />
       <!--
@@ -101,35 +101,35 @@
       <item value="Javadoc"        link="/api/index.html" />
       <item value="Struts Home"    link="http://www.apache.org"   icon="/images/struts-power.gif"        
 			classtype="org.apache.tiles.beans.SimpleMenuItem" />
-    </putListAttribute>
+    </put-list-attribute>
 </definition>
 
   <!-- Printer friendly menu definition -->
 <definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Printer Versions" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Printer Versions" />
+  <put-list-attribute name="items" >
     <item value="Quick Overview"     link="/test/testAll.jsp" />
     <item value="Tutorial"           link="/doc/tutorialBody.html" />
     <item value="User Guide"         link="/doc/userGuideBody.html" />
     <item value="Overview (old)"  	 link="/doc/overviewBody.html" />
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
   <!-- Taglib menu definition -->
 <definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Tag Library Reference" />
-    <putListAttribute name="items" >
+  <put-attribute name="title" value="Tag Library Reference" />
+    <put-list-attribute name="items" >
       <item value="Tiles Tags"     link="/doc/tilesTags.jsp" />
       <!-- <item value="Extension Tags (old)"   link="/doc/extensionsTags.jsp" /> -->
-    </putListAttribute>
+    </put-list-attribute>
 </definition>
 
   <!-- Oldies menu definition -->
 <definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Old Documents" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Old Documents" />
+  <put-list-attribute name="items" >
     <item value="Overview (old)"     link="/doc/overview.jsp" />
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
 

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml Wed Feb 14 07:22:34 2007
@@ -37,11 +37,11 @@
 
   <!-- Master layout and default tiles used by all pages -->
   <definition name="examples.masterPage" template="/layouts/classicLayout.jsp">
-	  <putAttribute name="title"  value="Tiles 1.1 Examples" />
-	  <putAttribute name="header" value="/examples/tiles/header.jsp" />
-	  <putAttribute name="menu"   value="examples.menu.bar" />
-	  <putAttribute name="footer" value="/examples/tiles/footer.jsp" />
-	  <putAttribute name="body"   value="/examples/tiles/body.jsp" />
+	  <put-attribute name="title"  value="Tiles 1.1 Examples" />
+	  <put-attribute name="header" value="/examples/tiles/header.jsp" />
+	  <put-attribute name="menu"   value="examples.menu.bar" />
+	  <put-attribute name="footer" value="/examples/tiles/footer.jsp" />
+	  <put-attribute name="body"   value="/examples/tiles/body.jsp" />
   </definition>
 
   <!-- =======================================================  -->
@@ -52,7 +52,7 @@
 
   <!-- Test nested list -->
 <definition name="test.nested.list" template="/layouts/vboxLayout.jsp" >
-  <putListAttribute name="list" >
+  <put-list-attribute name="list" >
     <item value="item1" link="/examples/tabs.jsp"/>
     <item value="item2" link="/examples/tabs.jsp"/>
     <item value="item3" link="/examples/tabs.jsp"/>
@@ -60,15 +60,15 @@
 	  <set-property property="link" value="aLink1"/>
 	  <set-property property="value" value="aValue1"/>
 	</bean>
-    <putListAttribute name="list" >
+    <put-list-attribute name="list" >
       <item value="nested.item1" link="/examples/tabs.jsp"/>
-      <putListAttribute name="list" >
+      <put-list-attribute name="list" >
         <item value="nested.nested.item1" link="/examples/tabs.jsp"/>
         <item value="nested.nested.item2" link="/examples/tabs.jsp"/>
-      </putListAttribute>
+      </put-list-attribute>
       <item value="nested.item2" link="/examples/tabs.jsp"/>
-    </putListAttribute>
-  </putListAttribute>
+    </put-list-attribute>
+  </put-list-attribute>
 </definition>
 
   <!-- =======================================================  -->
@@ -78,14 +78,14 @@
   <!-- Menu bar definition -->
   <!-- Some definitions come from other definition files (ex : doc.menu.*) -->
 <definition name="examples.menu.bar" template="/layouts/vboxLayout.jsp" >
-  <putListAttribute name="list" >
-    <addAttribute value="common.menu.home" />
-    <addAttribute value="examples.userMenu" />
-    <addAttribute value="examples.menu.links" />
-    <addAttribute value="common.menu.doc" />
-    <addAttribute value="examples.menu.settings" />
-    <addAttribute value="examples.menu.admin" />
-  </putListAttribute>
+  <put-list-attribute name="list" >
+    <add-attribute value="common.menu.home" />
+    <add-attribute value="examples.userMenu" />
+    <add-attribute value="examples.menu.links" />
+    <add-attribute value="common.menu.doc" />
+    <add-attribute value="examples.menu.settings" />
+    <add-attribute value="examples.menu.admin" />
+  </put-list-attribute>
 </definition>
 
   <!--
@@ -104,12 +104,12 @@
   -->
 <definition name="examples.userMenu" extends="examples.menu.root"
             preparer="org.apache.tiles.showcase.portal.UserMenuAction"  >
-  <putAttribute name="catalogSettings" value="examples.myMenu.catalog.settings"/>
-  <putAttribute name="catalogName" value="examples.portal.menuCatalog"/>
-  <putAttribute name="title" value="My Menu" />
-    <putListAttribute name="items" >
+  <put-attribute name="catalogSettings" value="examples.myMenu.catalog.settings"/>
+  <put-attribute name="catalogName" value="examples.portal.menuCatalog"/>
+  <put-attribute name="title" value="My Menu" />
+    <put-list-attribute name="items" >
       <item value="customize"    link="/examples/myMenuSettings.jsp" />
-    </putListAttribute>
+    </put-list-attribute>
 </definition>
 
   <!--
@@ -117,18 +117,18 @@
   This definition declares available items in the user menu catalog.
   -->
 <definition name="examples.myMenu.catalog.settings" >
-  <putListAttribute name="list" >
-    <addAttribute value="examples.userMenu" />
-    <addAttribute value="examples.menu.links" />
-    <addAttribute value="examples.menu.settings" />
-    <addAttribute value="examples.menu.admin" />
-  </putListAttribute>
+  <put-list-attribute name="list" >
+    <add-attribute value="examples.userMenu" />
+    <add-attribute value="examples.menu.links" />
+    <add-attribute value="examples.menu.settings" />
+    <add-attribute value="examples.menu.admin" />
+  </put-list-attribute>
 </definition>
 
   <!-- Examples main menu definition -->
 <definition name="examples.menu.links" extends="examples.menu.root" >
-  <putAttribute name="title" value="Examples" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Examples" />
+  <put-list-attribute name="items" >
     <item value="Examples Home"			link="/examples/index.jsp" />
     <item value="Portal"    			link="/examples/portal.jsp" />
     <item value="my Portal"             link="/examples/myPortal.jsp" />
@@ -137,25 +137,25 @@
     <item value="Tabs (choosen pages)"	link="/examples/tabs.jsp"/>
     <item value="Tabs (Summaries)"		link="/examples/summariesTabs.jsp" />
     <item value="Rss Channels"			link="/examples/rssChannels.jsp"/>
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
   <!-- Preferences menu definition -->
 <definition name="examples.menu.settings" extends="examples.menu.root" >
-  <putAttribute name="title" value="Preferences" />
-    <putListAttribute name="items" >
+  <put-attribute name="title" value="Preferences" />
+    <put-list-attribute name="items" >
     <item value="my Portal Settings"	link="/examples/myPortalSettings.jsp"/>
     <item value="my Menu Settings"		link="/examples/myMenuSettings.jsp" />
     <item value="my Layout Settings"	link="/examples/skinSettings.jsp" />
-    </putListAttribute>
+    </put-list-attribute>
 </definition>
 
   <!-- admin menu definition -->
 <definition name="examples.menu.admin" extends="examples.menu.root" >
-  <putAttribute name="title" value="Admin" />
-  <putListAttribute name="items" >
+  <put-attribute name="title" value="Admin" />
+  <put-list-attribute name="items" >
     <item value="Reload"     link="/admin/tiles/reload.do"       />
-  </putListAttribute>
+  </put-list-attribute>
 </definition>
 
   <!-- =======================================================  -->
@@ -164,28 +164,28 @@
 
     <!-- Index page -->
   <definition name="examples.index.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 Example Summaries" />
-	  <putAttribute name="body"   value="examples.index.portal.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Example Summaries" />
+	  <put-attribute name="body"   value="examples.index.portal.body" />
   </definition>
 
     <!-- Portal Body declaration-->
   <definition name="examples.index.portal.body" template="/layouts/columnsLayout.jsp" >
-	  <putAttribute name="numCols" value="2" />
-	  <putListAttribute name="list0" >
-	    <addAttribute value="/examples/tiles/portalSummary.jsp" />
-	    <addAttribute value="/examples/tiles/myPortalSummary.jsp" />
-	    <addAttribute value="/examples/tiles/rssChannelsSummary.jsp" />
-	    <addAttribute value="/examples/tiles/myLayoutSummary.jsp" />
-	    <addAttribute value="/examples/tiles/adminSummary.jsp" />
-	    <addAttribute value="/examples/tiles/componentsSummary.jsp" />
-	  </putListAttribute>
-	  <putListAttribute name="list1" >
-	    <addAttribute value="/examples/tiles/menuSummary.jsp" />
-	    <addAttribute value="/examples/tiles/myMenuSummary.jsp" />
-	    <addAttribute value="/examples/tiles/tabsSummary.jsp" />
-	    <addAttribute value="/examples/tiles/i18nSummary.jsp" />
-	    <addAttribute value="/examples/tiles/multiChannelsSummary.jsp" />
-	  </putListAttribute>
+	  <put-attribute name="numCols" value="2" />
+	  <put-list-attribute name="list0" >
+	    <add-attribute value="/examples/tiles/portalSummary.jsp" />
+	    <add-attribute value="/examples/tiles/myPortalSummary.jsp" />
+	    <add-attribute value="/examples/tiles/rssChannelsSummary.jsp" />
+	    <add-attribute value="/examples/tiles/myLayoutSummary.jsp" />
+	    <add-attribute value="/examples/tiles/adminSummary.jsp" />
+	    <add-attribute value="/examples/tiles/componentsSummary.jsp" />
+	  </put-list-attribute>
+	  <put-list-attribute name="list1" >
+	    <add-attribute value="/examples/tiles/menuSummary.jsp" />
+	    <add-attribute value="/examples/tiles/myMenuSummary.jsp" />
+	    <add-attribute value="/examples/tiles/tabsSummary.jsp" />
+	    <add-attribute value="/examples/tiles/i18nSummary.jsp" />
+	    <add-attribute value="/examples/tiles/multiChannelsSummary.jsp" />
+	  </put-list-attribute>
   </definition>
 
   <!-- =======================================================  -->
@@ -194,40 +194,40 @@
 
     <!-- Portal page -->
   <definition name="examples.portal.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 Portal" />
-	  <putAttribute name="body"   value="examples.portal.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Portal" />
+	  <put-attribute name="body"   value="examples.portal.body" />
   </definition>
 
     <!-- Portal Body declaration-->
   <definition name="examples.portal.body" template="/layouts/columnsLayout.jsp"
               preparer="/examples/myPortal.do" >
-	  <putAttribute name="numCols" value="2" />
-	  <putListAttribute name="list0" >
-	    <addAttribute value="/examples/tiles/portal/login.jsp" />
-	    <addAttribute value="/examples/tiles/portal/messages.jsp" />
-	    <addAttribute value="/examples/tiles/portal/newsFeed.jsp" />
-	    <!--<addAttribute value="examples.menu.bar" />-->
-
-	  </putListAttribute>
-	  <putListAttribute name="list1" >
-	    <addAttribute value="/examples/tiles/portal/advert3.jsp" />
-	    <addAttribute value="/examples/tiles/portal/stocks.jsp" />
-	    <addAttribute value="/examples/tiles/portal/whatsNew.jsp" />
-	    <addAttribute value="/examples/tiles/portal/advert2.jsp" />
-	  </putListAttribute>
+	  <put-attribute name="numCols" value="2" />
+	  <put-list-attribute name="list0" >
+	    <add-attribute value="/examples/tiles/portal/login.jsp" />
+	    <add-attribute value="/examples/tiles/portal/messages.jsp" />
+	    <add-attribute value="/examples/tiles/portal/newsFeed.jsp" />
+	    <!--<add-attribute value="examples.menu.bar" />-->
+
+	  </put-list-attribute>
+	  <put-list-attribute name="list1" >
+	    <add-attribute value="/examples/tiles/portal/advert3.jsp" />
+	    <add-attribute value="/examples/tiles/portal/stocks.jsp" />
+	    <add-attribute value="/examples/tiles/portal/whatsNew.jsp" />
+	    <add-attribute value="/examples/tiles/portal/advert2.jsp" />
+	  </put-list-attribute>
 	    <!-- labels used by catalog [optional]-->
-	  <putListAttribute name="labels0" >
-	    <addAttribute value="Login" />
-	    <addAttribute value="Your Messages" />
-	    <addAttribute value="News Feed" />
-	    <!--<putAttribute value="Menu Bar" />-->
-	  </putListAttribute>
-	  <putListAttribute name="labels1" >
-	    <addAttribute value="Advert 3" />
-	    <addAttribute value="Stock" />
-	    <addAttribute value="What's new" />
-	    <addAttribute value="Advert 2" />
-	  </putListAttribute>
+	  <put-list-attribute name="labels0" >
+	    <add-attribute value="Login" />
+	    <add-attribute value="Your Messages" />
+	    <add-attribute value="News Feed" />
+	    <!--<put-attribute value="Menu Bar" />-->
+	  </put-list-attribute>
+	  <put-list-attribute name="labels1" >
+	    <add-attribute value="Advert 3" />
+	    <add-attribute value="Stock" />
+	    <add-attribute value="What's new" />
+	    <add-attribute value="Advert 2" />
+	  </put-list-attribute>
   </definition>
 
   <!-- =======================================================  -->
@@ -236,8 +236,8 @@
 
     <!-- Portal settings page -->
   <definition name="examples.portal.settings.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 Portal Settings" />
-	  <putAttribute name="body"   value="examples.portal.settings.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Portal Settings" />
+	  <put-attribute name="body"   value="examples.portal.settings.body" />
   </definition>
 
     <!-- Portal settings Body declaration-->
@@ -254,8 +254,8 @@
 
     <!-- Portal settings page -->
   <definition name="examples.userMenu.settings.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 My Menu Settings" />
-	  <putAttribute name="body"   value="examples.userMenu.settings.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 My Menu Settings" />
+	  <put-attribute name="body"   value="examples.userMenu.settings.body" />
   </definition>
 
     <!-- Portal settings Body declaration-->
@@ -264,14 +264,14 @@
               template="/examples/tiles/myMenuSettings.jsp"
               extends="examples.userMenu"
 			  preparer="/examples/controller/myMenuSettings.do" >
-	  <putListAttribute name="defaultChoice" >
-	    <addAttribute value="examples.userMenu" />
-	    <addAttribute value="portal.menu.links" />
-	    <addAttribute value="portal.menu.preferences" />
-	    <addAttribute value="doc.menu.taglib.references" />
-	    <addAttribute value="doc.menu.printer.friendly" />
-	    <addAttribute value="doc.menu.old.documents" />
-	  </putListAttribute>
+	  <put-list-attribute name="defaultChoice" >
+	    <add-attribute value="examples.userMenu" />
+	    <add-attribute value="portal.menu.links" />
+	    <add-attribute value="portal.menu.preferences" />
+	    <add-attribute value="doc.menu.taglib.references" />
+	    <add-attribute value="doc.menu.printer.friendly" />
+	    <add-attribute value="doc.menu.old.documents" />
+	  </put-list-attribute>
   </definition>
 
   <!-- =======================================================  -->
@@ -280,15 +280,15 @@
 
     <!-- tabs page -->
   <definition name="examples.tabs.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 Tabs layout example" />
-	  <putAttribute name="body"   value="examples.tabs.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Tabs layout example" />
+	  <put-attribute name="body"   value="examples.tabs.body" />
   </definition>
 
 	  <!-- body using tabs -->
   <definition name="examples.tabs.body" template="/layouts/tabsLayout.jsp" >
-	<putAttribute name="selectedIndex"  value="0" />
-	<putAttribute name="parameterName"  value="selected" />
-    <putListAttribute name="tabList" >
+	<put-attribute name="selectedIndex"  value="0" />
+	<put-attribute name="parameterName"  value="selected" />
+    <put-list-attribute name="tabList" >
       <item value="Doc Home"		link="/index.jsp" />
       <item value="Quick overview"	link="/test/quickOverview.do" />
       <!-- <item value="Tutorial"		link="/doc/tutorial.jsp" /> -->
@@ -299,7 +299,7 @@
       <item value="NewsFeed"		link="/examples/tiles/portal/newsFeed.jsp" />
       <item value="Stocks"			link="/examples/tiles/portal/stocks.jsp" />
       <item value="WhatsNew"		link="/examples/tiles/portal/whatsNew.jsp" />
-    </putListAttribute>
+    </put-list-attribute>
   </definition>
 
   <!-- =======================================================  -->
@@ -308,15 +308,15 @@
 
     <!-- tabs page -->
   <definition name="examples.tabs.summaries.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 Summaries in Tabs" />
-	  <putAttribute name="body"   value="examples.tabs.summaries.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Summaries in Tabs" />
+	  <put-attribute name="body"   value="examples.tabs.summaries.body" />
   </definition>
 
 	  <!-- body using tabs -->
   <definition name="examples.tabs.summaries.body" template="/layouts/tabsLayout.jsp" >
-	<putAttribute name="selectedIndex"  value="0" />
-	<putAttribute name="parameterName"  value="selected" />
-    <putListAttribute name="tabList" >
+	<put-attribute name="selectedIndex"  value="0" />
+	<put-attribute name="parameterName"  value="selected" />
+    <put-list-attribute name="tabList" >
       <item value="Portal"			link="/examples/tiles/portalSummary.jsp" />
       <item value="my Portal"		link="/examples/tiles/myPortalSummary.jsp"/>
       <item value="Menu"			link="/examples/tiles/menuSummary.jsp"/>
@@ -327,7 +327,7 @@
       <item value="i18n"			link="/examples/tiles/i18nSummary.jsp" />
       <item value="Multi Channels"	link="/examples/tiles/multiChannelsSummary.jsp" />
       <item value="Components"		link="/examples/tiles/componentsSummary.jsp" />
-    </putListAttribute>
+    </put-list-attribute>
   </definition>
 
   <!-- =======================================================  -->
@@ -336,8 +336,8 @@
 
     <!-- Rss main page -->
   <definition name="examples.rssChannels.page" extends="examples.masterPage">
-	  <putAttribute name="title"  value="Tiles 1.1 Rss Channels" />
-	  <putAttribute name="body"   value="examples.rssChannel.offline.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Rss Channels" />
+	  <put-attribute name="body"   value="examples.rssChannel.offline.body" />
   </definition>
 
     <!-- Rss channel body declaration-->
@@ -345,11 +345,11 @@
   <definition name="examples.rssChannel.body"
               template="/examples/tiles/rssChannels.jsp"
 			  preparer="/examples/controller/rssChannel.do" >
-    <putListAttribute name="urls" >
-	    <!--<putAttribute value="http://www.newsforge.com/newsforge.rss" /> -->
-	    <addAttribute value="http://xmlhack.com/rss.php" />
-	    <addAttribute value="http://lwn.net/headlines/rss" />
-	  </putListAttribute>
+    <put-list-attribute name="urls" >
+	    <!--<put-attribute value="http://www.newsforge.com/newsforge.rss" /> -->
+	    <add-attribute value="http://xmlhack.com/rss.php" />
+	    <add-attribute value="http://lwn.net/headlines/rss" />
+	  </put-list-attribute>
   </definition>
 
     <!-- Rss channel body declaration-->
@@ -357,10 +357,10 @@
   <definition name="examples.rssChannel.offline.body"
               template="/examples/tiles/rssChannels.jsp"
 			  preparer="/examples/controller/rssChannel.do" >
-      <putListAttribute name="urls" >
-	    <addAttribute value="/examples/rssFeed/rss-example.xml" />
-	    <addAttribute value="/examples/rssFeed/apacheweek-headlines.xml" />
-	  </putListAttribute>
+      <put-list-attribute name="urls" >
+	    <add-attribute value="/examples/rssFeed/rss-example.xml" />
+	    <add-attribute value="/examples/rssFeed/apacheweek-headlines.xml" />
+	  </put-list-attribute>
   </definition>
 
   <!-- =======================================================  -->
@@ -369,17 +369,17 @@
 
     <!-- Skin main page -->
   <definition name="examples.skin.settings.page" extends="examples.customizable.layouts.root">
-	  <putAttribute name="title"  value="Tiles 1.1 Skin Setting" />
-	  <putAttribute name="body"   value="examples.skin.settings.body" />
+	  <put-attribute name="title"  value="Tiles 1.1 Skin Setting" />
+	  <put-attribute name="body"   value="examples.skin.settings.body" />
   </definition>
 
     <!-- Skin body declaration-->
   <definition name="examples.skin.settings.body"
               template="/examples/tiles/mySkinSettings.jsp"
 			  preparer="/examples/controller/mySkinSettings.do" >
-	  <putAttribute name="userSettingsName"   value="tiles.examples.skin.user.settings" />
-	  <!--<putAttribute name="catalogName"   value="tiles.examples.skin.catalog" />-->
-	  <putAttribute name="catalogSettings"   value="examples.available.skins" />
+	  <put-attribute name="userSettingsName"   value="tiles.examples.skin.user.settings" />
+	  <!--<put-attribute name="catalogName"   value="tiles.examples.skin.catalog" />-->
+	  <put-attribute name="catalogSettings"   value="examples.available.skins" />
   </definition>
 
   <!-- =======================================================  -->
@@ -395,33 +395,33 @@
 	<definition name="examples.customizable.layouts.root"
 	            extends="examples.masterPage"
 				template="/examples/controller/layoutSwitch.do"   >
-	  <putAttribute name="userSettingsName"   value="tiles.examples.skin.user.settings" />
-	  <!--<putAttribute name="catalogName"   value="tiles.examples.skin.catalog" />-->
-	  <putAttribute name="catalogSettings"   value="examples.available.skins" />
-	  <putAttribute name="layout.attribute"   		value="page.layout" />
+	  <put-attribute name="userSettingsName"   value="tiles.examples.skin.user.settings" />
+	  <!--<put-attribute name="catalogName"   value="tiles.examples.skin.catalog" />-->
+	  <put-attribute name="catalogSettings"   value="examples.available.skins" />
+	  <put-attribute name="layout.attribute"   		value="page.layout" />
 	</definition>
 
     <!-- Available skins -->
   <definition name="examples.available.skins" >
-      <putListAttribute name="skin.list" >
-	    <addAttribute value="examples.default.skin" />
-	    <addAttribute value="examples.menuleft.skin" />
-	  </putListAttribute>
+      <put-list-attribute name="skin.list" >
+	    <add-attribute value="examples.default.skin" />
+	    <add-attribute value="examples.menuleft.skin" />
+	  </put-list-attribute>
   </definition>
 
     <!-- Default skin values -->
   <definition name="examples.default.skin" >
-    <putAttribute name="skin.label" value="Default" />
-    <putAttribute name="page.layout" value="/layouts/classicLayout.jsp" />
-    <putAttribute name="menu.layout" value="/layouts/menu.jsp" />
-    <putAttribute name="menuBar.layout" value="/layouts/vboxLayout.jsp" />
+    <put-attribute name="skin.label" value="Default" />
+    <put-attribute name="page.layout" value="/layouts/classicLayout.jsp" />
+    <put-attribute name="menu.layout" value="/layouts/menu.jsp" />
+    <put-attribute name="menuBar.layout" value="/layouts/vboxLayout.jsp" />
   </definition>
 
     <!-- Default skin values -->
   <definition name="examples.menuleft.skin" extends="examples.default.skin" >
-    <putAttribute name="skin.label" value="Left Menu" />
-    <putAttribute name="page.layout" value="/layouts/skin1/menuLeftLayout.jsp" />
-    <putAttribute name="menu.layout" value="/layouts/menu.jsp" />
+    <put-attribute name="skin.label" value="Left Menu" />
+    <put-attribute name="page.layout" value="/layouts/skin1/menuLeftLayout.jsp" />
+    <put-attribute name="menu.layout" value="/layouts/menu.jsp" />
   </definition>
 
 

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml Wed Feb 14 07:22:34 2007
@@ -33,14 +33,14 @@
 
   <!-- Test instances -->
 <definition name="test.home.page" extends="doc.mainLayout" >
-  <putAttribute name="title"  value="Tiles: test page" />
-  <putAttribute name="body"   value="/test/testAll.jsp" />
+  <put-attribute name="title"  value="Tiles: test page" />
+  <put-attribute name="body"   value="/test/testAll.jsp" />
 </definition>
 
   <!-- Test menu definition -->
 <definition name="test.menu.links" template="/layouts/menu.jsp" >
-  <putAttribute name="title" value="Tests" />
-    <putListAttribute name="items" >
+  <put-attribute name="title" value="Tests" />
+    <put-list-attribute name="items" >
       <item value="All in one"     link="/test/index.jsp"  />
       <item value="Basic" link="/test/testBasic.jsp" />
       <item value="Ignore attribute"  link="/test/testIgnore.jsp"   />
@@ -48,71 +48,71 @@
       <item value="Role" link="/test/testRole.jsp"      />
       <item value="Struts action"  link="/test/testStrutsAction.jsp"   />
       <item value="Controller"    link="/test/testController.jsp"     />
-    </putListAttribute>
+    </put-list-attribute>
 </definition>
 
   <!-- Test instances -->
 <definition name="test.layout.test1" template="/test/layout.jsp" >
-  <putAttribute name="title"  value="Test definition from factory : basic" />
-  <putAttribute name="header" value="header.jsp" />
-  <putAttribute name="body"   value="body.jsp" />
+  <put-attribute name="title"  value="Test definition from factory : basic" />
+  <put-attribute name="header" value="header.jsp" />
+  <put-attribute name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test instances -->
 <definition name="test.layout.test2" template="/test/layout.jsp" >
-  <putAttribute name="title"  value="Test definition from factory : specify types"   type="string" />
-  <putAttribute name="header" value="header.jsp" type="template"   />
-  <putAttribute name="body"   value="body.jsp"   type="template"   />
+  <put-attribute name="title"  value="Test definition from factory : specify types"   type="string" />
+  <put-attribute name="header" value="header.jsp" type="template"   />
+  <put-attribute name="body"   value="body.jsp"   type="template"   />
 </definition>
 
   <!-- Test instances -->
 <definition name="test.layout.test3" template="/test/layout.jsp" >
-  <putAttribute name="title"  value="Test definition from factory : Test with a tag body (to do)" />
-  <putAttribute name="header" value="This is a header" type="string"/>
-  <putAttribute name="body"   value="body.jsp"/>
+  <put-attribute name="title"  value="Test definition from factory : Test with a tag body (to do)" />
+  <put-attribute name="header" value="This is a header" type="string"/>
+  <put-attribute name="body"   value="body.jsp"/>
 </definition>
 
   <!-- Test backward compatibility -->
 <definition name="test.layout.test4" template="/test/layout.jsp" >
-    <putAttribute name="title"  value="Test definition from factory: backward compatibility"
+    <put-attribute name="title"  value="Test definition from factory: backward compatibility"
          type="string"/>
-  <putAttribute name="header" value="header.jsp"/>
-  <putAttribute name="body"   value="body.jsp" />
+  <put-attribute name="header" value="header.jsp"/>
+  <put-attribute name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test Struts Action and Tiles integration -->
 <definition name="test.struts.action" template="/test/layout.jsp" >
-    <putAttribute name="title"  value="Test Struts Action and Tiles integration: default title"
+    <put-attribute name="title"  value="Test Struts Action and Tiles integration: default title"
          type="string"/>
-  <putAttribute name="header" value="header.jsp"/>
-  <putAttribute name="body"   value="body.jsp" />
+  <put-attribute name="header" value="header.jsp"/>
+  <put-attribute name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test Struts Action and Tiles integration -->
 <definition name="test.struts.action.fail" template="/test/failpage.jsp" >
-  <putAttribute name="title"  value="Test fail" type="string" />
+  <put-attribute name="title"  value="Test fail" type="string" />
 </definition>
 
   <!-- Test Tiles Controller -->
   <definition name="test.struts.controller"
               template="/test/layout.jsp"
       preparer="org.apache.tiles.showcase.test.TestTileController" >
-  <putAttribute name="title"  value="Test Tile Controller : call to Controller" />
-  <putAttribute name="header" value="header.jsp"/>
-  <putAttribute name="body"   value="body.jsp" />
+  <put-attribute name="title"  value="Test Tile Controller : call to Controller" />
+  <put-attribute name="header" value="header.jsp"/>
+  <put-attribute name="body"   value="body.jsp" />
 </definition>
 
   <!-- Test body for put tag -->
 <definition name="test.body" template="/test/failpage.jsp" >
-  <putAttribute name="title"  type="string">first body : title</putAttribute>
-  <putAttribute name="body"  type="string">second body : body</putAttribute>
+  <put-attribute name="title"  type="string">first body : title</putAttribute>
+  <put-attribute name="body"  type="string">second body : body</putAttribute>
 </definition>
 
   <!-- Test instances -->
 <definition name="test.action.noforward" template="/test/layout.jsp" >
-  <putAttribute name="title"  value="Test Action with No Forward" />
-  <putAttribute name="header" value="header.jsp" />
-  <putAttribute name="body"   value="showRequestUri.jsp" />
+  <put-attribute name="title"  value="Test Action with No Forward" />
+  <put-attribute name="header" value="header.jsp" />
+  <put-attribute name="body"   value="showRequestUri.jsp" />
 </definition>
 
 

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs.xml Wed Feb 14 07:22:34 2007
@@ -33,50 +33,50 @@
 
   <!-- Definition description  -->
   <definition name="myFirstDefinition" template="/tutorial/layout/classicLayout.jsp">
-	  <putAttribute name="title"  value="My First Definition Page" />
-	  <!-- <putAttribute name="title" >My First Definition Page</put> -->
-	  <putAttribute name="header" value="/tutorial/common/header.jsp" />
-	  <putAttribute name="footer" value="/tutorial/common/footer.jsp" />
-	  <putAttribute name="menu"   value="/tutorial/common/menu.jsp" />
-	  <putAttribute name="body"   value="/tutorial/basic/helloBody.jsp" />
+	  <put-attribute name="title"  value="My First Definition Page" />
+	  <!-- <put-attribute name="title" >My First Definition Page</put> -->
+	  <put-attribute name="header" value="/tutorial/common/header.jsp" />
+	  <put-attribute name="footer" value="/tutorial/common/footer.jsp" />
+	  <put-attribute name="menu"   value="/tutorial/common/menu.jsp" />
+	  <put-attribute name="body"   value="/tutorial/basic/helloBody.jsp" />
   </definition>
 
   <!-- Main Layout Definition description  -->
   <definition name="mainLayout" template="/tutorial/layout/classicLayout.jsp">
-	  <putAttribute name="title"  value="World Financial Online" />
-	  <putAttribute name="header" value="/tutorial/common/header.jsp" />
-	  <putAttribute name="footer" value="/tutorial/common/footer.jsp" />
-	  <putAttribute name="menu"   value="menu.main" />
-	  <putAttribute name="body"   value="main.portal.body" />
+	  <put-attribute name="title"  value="World Financial Online" />
+	  <put-attribute name="header" value="/tutorial/common/header.jsp" />
+	  <put-attribute name="footer" value="/tutorial/common/footer.jsp" />
+	  <put-attribute name="menu"   value="menu.main" />
+	  <put-attribute name="body"   value="main.portal.body" />
   </definition>
   
     <!-- Portal Body declaration-->
   <definition name="main.portal.body" template="/layout/columnsLayout.jsp">
-	  <putAttribute name="numCols" value="2" />
-	  <putListAttribute name="list0" >
-	    <addAttribute value="/tutorial/portal/login.jsp" />
-	    <addAttribute value="/tutorial/portal/messages.jsp" />
-	    <addAttribute value="/tutorial/portal/newsFeed.jsp" />
-	    <addAttribute value="/tutorial/portal/advert2.jsp" />
-	  </putListAttribute>
-	  <putListAttribute name="list1" >
-	    <addAttribute value="/tutorial/portal/advert3.jsp" />
-	    <addAttribute value="/tutorial/portal/stocks.jsp" />
-	    <addAttribute value="/tutorial/portal/whatsNew.jsp" />
-	    <addAttribute value="/tutorial/portal/personalLinks.jsp" />
-	    <addAttribute value="/tutorial/portal/search.jsp" />
-	  </putListAttribute>
+	  <put-attribute name="numCols" value="2" />
+	  <put-list-attribute name="list0" >
+	    <add-attribute value="/tutorial/portal/login.jsp" />
+	    <add-attribute value="/tutorial/portal/messages.jsp" />
+	    <add-attribute value="/tutorial/portal/newsFeed.jsp" />
+	    <add-attribute value="/tutorial/portal/advert2.jsp" />
+	  </put-list-attribute>
+	  <put-list-attribute name="list1" >
+	    <add-attribute value="/tutorial/portal/advert3.jsp" />
+	    <add-attribute value="/tutorial/portal/stocks.jsp" />
+	    <add-attribute value="/tutorial/portal/whatsNew.jsp" />
+	    <add-attribute value="/tutorial/portal/personalLinks.jsp" />
+	    <add-attribute value="/tutorial/portal/search.jsp" />
+	  </put-list-attribute>
   </definition>
 
   <!-- Main menu definition -->
 <definition name="menu.main" template="/layout/vboxLayout.jsp" >
-  <putListAttribute name="componentsList" >
-    <addAttribute value="menu.logo" />
-    <addAttribute value="menu.documentation" />
-    <addAttribute value="menu.links" />
-    <addAttribute value="menu.lang" />
-    <addAttribute value="menu.src" />
-  </putListAttribute>
+  <put-list-attribute name="componentsList" >
+    <add-attribute value="menu.logo" />
+    <add-attribute value="menu.documentation" />
+    <add-attribute value="menu.links" />
+    <add-attribute value="menu.lang" />
+    <add-attribute value="menu.src" />
+  </put-list-attribute>
 </definition>
 
   <!-- menu logo definition -->
@@ -85,161 +85,161 @@
   <!-- Documentation menu -->
   <!-- Old style menu. Check module 'examples' for new style -->
 <definition name="menu.documentation" template="/common/submenu.jsp" >
-  <putAttribute name="title" value="Tiles" />
-  <putListAttribute name="items" >
-    <putListAttribute name="none">
-      <addAttribute value="Home" />
-      <addAttribute value="/index.jsp" type="string"/>
-    </putListAttribute>
-  </putListAttribute>
-  <putListAttribute name="links" >
-  </putListAttribute>
+  <put-attribute name="title" value="Tiles" />
+  <put-list-attribute name="items" >
+    <put-list-attribute name="none">
+      <add-attribute value="Home" />
+      <add-attribute value="/index.jsp" type="string"/>
+    </put-list-attribute>
+  </put-list-attribute>
+  <put-list-attribute name="links" >
+  </put-list-attribute>
 </definition>
 
   <!-- menu logo definition -->
 <definition name="menu.links" template="/common/submenu.jsp" >
-  <putAttribute name="title" value="Tutorial" />
-  <putListAttribute name="items">
-    <putListAttribute name="none">
-      <addAttribute value="Home" />
-      <addAttribute value="/index.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Basic Page" />
-      <addAttribute value="/basicPage.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="First Portal" />
-      <addAttribute value="/portalPage.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="First Definition" />
-      <addAttribute value="/firstDefinition.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Overloaded Definition" />
-      <addAttribute value="/overloadDefinitionParameters.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Extended Definition" />
-      <addAttribute value="/extendedDefinition.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Dynamic Portal" />
-      <addAttribute value="/dynPortal/index.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Dynamic Portal Prefs" />
-      <addAttribute value="/dynPortal/myPortalPrefs.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Struts Forward" />
-      <addAttribute value="/strutsForward.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Definition Tag" />
-      <addAttribute value="/definitionTag.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Extended Definition Tag" />
-      <addAttribute value="/extendedDefinitionTag.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Dynamic Definition" />
-      <addAttribute value="/dynTemplate.do" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Frame Example" />
-      <addAttribute value="/basicFramesetPage.jsp" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="Invoice" />
-      <addAttribute value="/invoice/index.jsp" />
-    </putListAttribute>
-  </putListAttribute>
+  <put-attribute name="title" value="Tutorial" />
+  <put-list-attribute name="items">
+    <put-list-attribute name="none">
+      <add-attribute value="Home" />
+      <add-attribute value="/index.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Basic Page" />
+      <add-attribute value="/basicPage.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="First Portal" />
+      <add-attribute value="/portalPage.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="First Definition" />
+      <add-attribute value="/firstDefinition.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Overloaded Definition" />
+      <add-attribute value="/overloadDefinitionParameters.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Extended Definition" />
+      <add-attribute value="/extendedDefinition.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Dynamic Portal" />
+      <add-attribute value="/dynPortal/index.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Dynamic Portal Prefs" />
+      <add-attribute value="/dynPortal/myPortalPrefs.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Struts Forward" />
+      <add-attribute value="/strutsForward.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Definition Tag" />
+      <add-attribute value="/definitionTag.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Extended Definition Tag" />
+      <add-attribute value="/extendedDefinitionTag.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Dynamic Definition" />
+      <add-attribute value="/dynTemplate.do" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Frame Example" />
+      <add-attribute value="/basicFramesetPage.jsp" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="Invoice" />
+      <add-attribute value="/invoice/index.jsp" />
+    </put-list-attribute>
+  </put-list-attribute>
 </definition>
 
   <!-- Menu sources definition -->
 <definition name="menu.src" template="/tutorial/common/menuViewSrc.jsp" >
-  <putListAttribute name="list" >
-    <addAttribute value="/index.jsp" />
-    <addAttribute value="/basicPage.jsp" />
-    <addAttribute value="/portalPage.jsp" />
-    <addAttribute value="/firstDefinition.jsp" />
-    <addAttribute value="/overloadDefinitionParameters.jsp" />
-    <addAttribute value="/extendedDefinition.jsp" />
-    <addAttribute value="/definitionTag.jsp" />
-    <addAttribute value="/extendedDefinitionTag.jsp" />
-    <addAttribute value="/basicFramesetPage.jsp" />
-    <addAttribute value="/WEB-INF/templateDefinitions.xml" />
-
-    <addAttribute value="/basic/myLayout.jsp" />
-    <addAttribute value="/basic/hello.jsp" />
-    <addAttribute value="/basic/menu.jsp" />
-    <addAttribute value="/portal/portalBody.jsp" />
-
-    <addAttribute value="/common/footer.jsp" />
-    <addAttribute value="/common/menu.jsp" />
-    <addAttribute value="/common/submenu.jsp" />
-    <addAttribute value="/common/menuViewSrc.jsp" />
-    <addAttribute value="/common/viewSrc.jsp" />
-    <addAttribute value="/common/viewSrcBody.jsp" />
+  <put-list-attribute name="list" >
+    <add-attribute value="/index.jsp" />
+    <add-attribute value="/basicPage.jsp" />
+    <add-attribute value="/portalPage.jsp" />
+    <add-attribute value="/firstDefinition.jsp" />
+    <add-attribute value="/overloadDefinitionParameters.jsp" />
+    <add-attribute value="/extendedDefinition.jsp" />
+    <add-attribute value="/definitionTag.jsp" />
+    <add-attribute value="/extendedDefinitionTag.jsp" />
+    <add-attribute value="/basicFramesetPage.jsp" />
+    <add-attribute value="/WEB-INF/templateDefinitions.xml" />
+
+    <add-attribute value="/basic/myLayout.jsp" />
+    <add-attribute value="/basic/hello.jsp" />
+    <add-attribute value="/basic/menu.jsp" />
+    <add-attribute value="/portal/portalBody.jsp" />
+
+    <add-attribute value="/common/footer.jsp" />
+    <add-attribute value="/common/menu.jsp" />
+    <add-attribute value="/common/submenu.jsp" />
+    <add-attribute value="/common/menuViewSrc.jsp" />
+    <add-attribute value="/common/viewSrc.jsp" />
+    <add-attribute value="/common/viewSrcBody.jsp" />
 	
-    <addAttribute value="/common/menu/menuLogo.jsp" />
-    <addAttribute value="/common/menu/menuLinks.jsp" />
-    <addAttribute value="/common/menu/menuSrc.jsp" />
-
-    <addAttribute value="/layout/classicLayout.jsp" />
-    <addAttribute value="/layout/columnsLayout.jsp" />
-    <addAttribute value="/layout/vboxLayout.jsp" />
+    <add-attribute value="/common/menu/menuLogo.jsp" />
+    <add-attribute value="/common/menu/menuLinks.jsp" />
+    <add-attribute value="/common/menu/menuSrc.jsp" />
+
+    <add-attribute value="/layout/classicLayout.jsp" />
+    <add-attribute value="/layout/columnsLayout.jsp" />
+    <add-attribute value="/layout/vboxLayout.jsp" />
 	
-    <addAttribute value="/invoice/editAddress.jsp" />
-    <addAttribute value="/invoice/editInvoice.jsp" />
-    <addAttribute value="/invoice/index.jsp" />
-  </putListAttribute>
+    <add-attribute value="/invoice/editAddress.jsp" />
+    <add-attribute value="/invoice/editInvoice.jsp" />
+    <add-attribute value="/invoice/index.jsp" />
+  </put-list-attribute>
 </definition>
 
   <!-- select language menu -->
 <definition name="menu.lang" template="/common/submenu.jsp" >
-  <putAttribute name="title" value="Language" />
-  <putListAttribute name="items" >
-    <putListAttribute name="none">
-      <addAttribute value="Français" />
-      <addAttribute value="/tutorial/lang.do?language=FR" />
-    </putListAttribute>
-    <putListAttribute name="none">
-      <addAttribute value="English" />
-      <addAttribute value="/tutorial/lang.do?language=UK" />
-    </putListAttribute>
-    <putListAttribute name="links" >
-      <addAttribute value="Deutsch" />
-      <addAttribute value="/tutorial/lang.do?language=DE" />
-    </putListAttribute>
-  </putListAttribute>
+  <put-attribute name="title" value="Language" />
+  <put-list-attribute name="items" >
+    <put-list-attribute name="none">
+      <add-attribute value="Français" />
+      <add-attribute value="/tutorial/lang.do?language=FR" />
+    </put-list-attribute>
+    <put-list-attribute name="none">
+      <add-attribute value="English" />
+      <add-attribute value="/tutorial/lang.do?language=UK" />
+    </put-list-attribute>
+    <put-list-attribute name="links" >
+      <add-attribute value="Deutsch" />
+      <add-attribute value="/tutorial/lang.do?language=DE" />
+    </put-list-attribute>
+  </put-list-attribute>
 </definition>
 
   <!-- Extended definition example -->
 <definition name="extended.definition.example" extends="mainLayout" >
-  <putAttribute name="title" value="Extended Definition" />
-  <putAttribute name="body"  value="/tutorial/portal/newsFeed.jsp" />
+  <put-attribute name="title" value="Extended Definition" />
+  <put-attribute name="body"  value="/tutorial/portal/newsFeed.jsp" />
 </definition>
 
   <!-- Struts forward definition example -->
 <definition name="forward.example.choice.page" extends="mainLayout" >
-  <putAttribute name="title" value="Struts Forward Test" />
-  <putAttribute name="body"  value="/tutorial/forward/forwardBody.jsp" />
+  <put-attribute name="title" value="Struts Forward Test" />
+  <put-attribute name="body"  value="/tutorial/forward/forwardBody.jsp" />
 </definition>
 
   <!-- Struts forward definition example -->
 <definition name="forward.example.success.page" extends="mainLayout" >
-  <putAttribute name="title" value="Struts Forward to 'success'" />
-  <putAttribute name="body"  value="/tutorial/forward/successBody.jsp" />
+  <put-attribute name="title" value="Struts Forward to 'success'" />
+  <put-attribute name="body"  value="/tutorial/forward/successBody.jsp" />
 </definition>
 
   <!-- Struts forward definition example -->
 <definition name="forward.example.failure.page" extends="mainLayout" >
-  <putAttribute name="title" value="Struts Forward to 'failure'" />
-  <putAttribute name="body"  value="/tutorial/forward/failureBody.jsp" />
+  <put-attribute name="title" value="Struts Forward to 'failure'" />
+  <put-attribute name="body"  value="/tutorial/forward/failureBody.jsp" />
 </definition>
 
   <!-- =======================================================  -->
@@ -248,27 +248,27 @@
 
   <!-- Dynamic portal main page (uses common layout) -->
 <definition name="rssChannelTile" template="/tutorial/actions/rssChannel.do" >
-      <putListAttribute name="urls" >
+      <put-list-attribute name="urls" >
   <!-- 
-	    <addAttribute value="http://www.newsforge.com/newsforge.rss" />
+	    <add-attribute value="http://www.newsforge.com/newsforge.rss" />
     -->
-	    <addAttribute value="http://xmlhack.com/rss.php" />
-	    <addAttribute value="http://lwn.net/headlines/rss" />
-	  </putListAttribute>
+	    <add-attribute value="http://xmlhack.com/rss.php" />
+	    <add-attribute value="http://lwn.net/headlines/rss" />
+	  </put-list-attribute>
 </definition>
 
   <!-- Dynamic portal main page (uses common layout) -->
 <definition name="rssLocalChannelTile"  template="/tutorial/actions/rssChannel.do" >
-      <putListAttribute name="urls" >
-	    <addAttribute value="/examples/rssFeed/rss-example.xml" />
-	    <addAttribute value="/examples/rssFeed/apacheweek-headlines.xml" />
-	  </putListAttribute>
+      <put-list-attribute name="urls" >
+	    <add-attribute value="/examples/rssFeed/rss-example.xml" />
+	    <add-attribute value="/examples/rssFeed/apacheweek-headlines.xml" />
+	  </put-list-attribute>
 </definition>
 
   <!-- Dynamic portal main page (uses common layout) -->
 <definition name="test.rssChannel.page" extends="mainLayout" >
-  <putAttribute name="title" value="Rss Channel" />
-  <putAttribute name="body"  value="rssChannelTile" />
+  <put-attribute name="title" value="Rss Channel" />
+  <put-attribute name="body"  value="rssChannelTile" />
 </definition>
 
 
@@ -278,34 +278,34 @@
   
     <!-- Dynamic portal body (Define default list) -->
 <definition name="dynamic.portal.body" template="/tutorial/actions/myPortal.do" >
-	  <putAttribute name="numCols" value="2" />
-	  <putListAttribute name="list0" >
-	    <addAttribute value="/tutorial/portal/login.jsp" />
-	    <addAttribute value="/tutorial/portal/messages.jsp" />
-	    <addAttribute value="/tutorial/portal/newsFeed.jsp" />
-	    <addAttribute value="/tutorial/portal/advert2.jsp" />
-	    <addAttribute value="rssChannelTile" />
-	  </putListAttribute>
-	  <putListAttribute name="list1" >
-	    <addAttribute value="/tutorial/portal/advert3.jsp" />
-	    <addAttribute value="rssLocalChannelTile" />
-	    <addAttribute value="/tutorial/portal/stocks.jsp" />
-	    <addAttribute value="/tutorial/portal/whatsNew.jsp" />
-	    <addAttribute value="/tutorial/portal/personalLinks.jsp" />
-	    <addAttribute value="/tutorial/portal/search.jsp" />
-	  </putListAttribute>
+	  <put-attribute name="numCols" value="2" />
+	  <put-list-attribute name="list0" >
+	    <add-attribute value="/tutorial/portal/login.jsp" />
+	    <add-attribute value="/tutorial/portal/messages.jsp" />
+	    <add-attribute value="/tutorial/portal/newsFeed.jsp" />
+	    <add-attribute value="/tutorial/portal/advert2.jsp" />
+	    <add-attribute value="rssChannelTile" />
+	  </put-list-attribute>
+	  <put-list-attribute name="list1" >
+	    <add-attribute value="/tutorial/portal/advert3.jsp" />
+	    <add-attribute value="rssLocalChannelTile" />
+	    <add-attribute value="/tutorial/portal/stocks.jsp" />
+	    <add-attribute value="/tutorial/portal/whatsNew.jsp" />
+	    <add-attribute value="/tutorial/portal/personalLinks.jsp" />
+	    <add-attribute value="/tutorial/portal/search.jsp" />
+	  </put-list-attribute>
 </definition>
 
     <!-- Dynamic portal main page (use common layout) -->
 <definition name="myDynamicPortal" extends="mainLayout" >
-  <putAttribute name="title" value="My Portal" />
-  <putAttribute name="body"  value="dynamic.portal.body" />
+  <put-attribute name="title" value="My Portal" />
+  <put-attribute name="body"  value="dynamic.portal.body" />
 </definition>
 
     <!-- Dynamic portal preferences page (use common layout) -->
 <definition name="myDynamicPortalPreferences" extends="mainLayout" >
-  <putAttribute name="title" value="My Portal Settings" />
-  <putAttribute name="body"  value="dynamic.portal.prefs.body" />
+  <put-attribute name="title" value="My Portal Settings" />
+  <put-attribute name="body"  value="dynamic.portal.prefs.body" />
 </definition>
 
     <!-- Dynamic portal preferences body (extends portal.body to inherit default list) -->

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_de.xml Wed Feb 14 07:22:34 2007
@@ -33,24 +33,24 @@
 
   <!-- Main Layout Definition description  -->
   <definition name="mainLayout">
-    <putAttribute name="title"  value="World Financial Online - Deutsche Version" />
-    <!--<putAttribute name="header" value="/tutorial/common/header.jsp"/>-->
-    <putAttribute name="footer" value="/tutorial/de/common/footer.jsp" />
-    <!--<putAttribute name="menu" value="menu.main"/>
-    <putAttribute name="body" value="main.portal.body"/>-->
+    <put-attribute name="title"  value="World Financial Online - Deutsche Version" />
+    <!--<put-attribute name="header" value="/tutorial/common/header.jsp"/>-->
+    <put-attribute name="footer" value="/tutorial/de/common/footer.jsp" />
+    <!--<put-attribute name="menu" value="menu.main"/>
+    <put-attribute name="body" value="main.portal.body"/>-->
   </definition>
   
   <!-- select language menu -->
 <definition name="menu.lang" template="/common/submenu.jsp" >
-  <putAttribute name="title" value="Sprache" />
-  <putListAttribute name="items" >
-    <addAttribute value="Englisch" />
-    <addAttribute value="Französisch" />
-  </putListAttribute>
-  <putListAttribute name="links" >
-    <addAttribute value="/tutorial/lang.do?language=UK" />
-    <addAttribute value="/tutorial/lang.do?language=FR" />
-  </putListAttribute>
+  <put-attribute name="title" value="Sprache" />
+  <put-list-attribute name="items" >
+    <add-attribute value="Englisch" />
+    <add-attribute value="Französisch" />
+  </put-list-attribute>
+  <put-list-attribute name="links" >
+    <add-attribute value="/tutorial/lang.do?language=UK" />
+    <add-attribute value="/tutorial/lang.do?language=FR" />
+  </put-list-attribute>
 </definition>
 
 

Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml?view=diff&rev=507573&r1=507572&r2=507573
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tutorial-defs_fr.xml Wed Feb 14 07:22:34 2007
@@ -33,24 +33,24 @@
 
   <!-- Main Layout Definition description  -->
   <definition name="mainLayout" >
-	  <putAttribute name="title"  value="Le Monde Financier En Ligne" />
-	  <!-- <putAttribute name="header" value="/tutorial/common/header.jsp" />  -->
-	  <putAttribute name="footer" value="/tutorial/fr/common/footer.jsp" />
-	  <!-- <putAttribute name="menu"   value="menu.main" />  -->
-	  <!-- <putAttribute name="body"   value="main.portal.body" />  -->
+	  <put-attribute name="title"  value="Le Monde Financier En Ligne" />
+	  <!-- <put-attribute name="header" value="/tutorial/common/header.jsp" />  -->
+	  <put-attribute name="footer" value="/tutorial/fr/common/footer.jsp" />
+	  <!-- <put-attribute name="menu"   value="menu.main" />  -->
+	  <!-- <put-attribute name="body"   value="main.portal.body" />  -->
   </definition>
   
   <!-- select language menu -->
 <definition name="menu.lang" template="/common/submenu.jsp" >
-  <putAttribute name="title" value="Langue" />
-  <putListAttribute name="items" >
-    <addAttribute value="English" />
-    <addAttribute value="Deutch" />
-  </putListAttribute>
-  <putListAttribute name="links" >
-    <addAttribute value="/tutorial/lang.do?language=UK" />
-    <addAttribute value="/tutorial/lang.do?language=DE" />
-  </putListAttribute>
+  <put-attribute name="title" value="Langue" />
+  <put-list-attribute name="items" >
+    <add-attribute value="English" />
+    <add-attribute value="Deutch" />
+  </put-list-attribute>
+  <put-list-attribute name="links" >
+    <add-attribute value="/tutorial/lang.do?language=UK" />
+    <add-attribute value="/tutorial/lang.do?language=DE" />
+  </put-list-attribute>
 </definition>
 
 </tiles-definitions>