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/10/26 20:52:01 UTC

svn commit: r588746 - in /tiles/framework/trunk: tiles-compat/src/test/java/org/apache/tiles/config/ tiles-test/src/main/webapp/

Author: apetrelli
Date: Fri Oct 26 11:52:00 2007
New Revision: 588746

URL: http://svn.apache.org/viewvc?rev=588746&view=rev
Log:
Fixed SVN properties.

Modified:
    tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml   (contents, props changed)
    tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml   (contents, props changed)
    tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp   (contents, props changed)
    tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp   (contents, props changed)
    tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp   (contents, props changed)

Modified: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml?rev=588746&r1=588745&r2=588746&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml (original)
+++ tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml Fri Oct 26 11:52:00 2007
@@ -1,138 +1,138 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-/*
- * $Id: tiles-defs.xml 535861 2007-05-07 11:46:54Z apetrelli $
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-
- <!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
-       "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
-
-<!-- Definitions for Tiles documentation   -->
-
-<tiles-definitions>
-
-  <!-- =======================================================  -->
-  <!-- Master definition  									-->
-  <!-- =======================================================  -->
-
-  <!-- Doc index page description  -->
-  <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" />
-	  <put name="footer" value="/common/footer.jsp" />
-	  <put name="body"   value="doc.portal.body" />
-      <put name="bean"   value="This is an object" type="string" />
-  </definition>
-
-  <!-- =======================================================  -->
-  <!-- Main page body definitions  									-->
-  <!-- =======================================================  -->
-
-  <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
-    <put name="numCols" value="2" />
-    <putList name="list0" >
-      <add value="/doc/portal/welcome.jsp" />
-      <add value="/doc/portal/features.jsp" />
-      <!--<add value="/doc/portal/todo.jsp" /> -->
-      <add value="/doc/portal/documentation.jsp" />
-    </putList>
-    <putList name="list1" >
-      <add value="/doc/portal/news.jsp" />
-      <add value="/doc/portal/download.jsp" />
-      <add value="/doc/portal/tilesCompsTemplates.jsp" />
-      <add value="/doc/portal/strutsIntegration.jsp" />
-      <add value="/doc/portal/comments.jsp" />
-      <add value="/doc/portal/revisions.jsp" />
-    </putList>
-  </definition>
-  
-  <!-- =======================================================  -->
-  <!-- Menus definitions  									-->
-  <!-- =======================================================  -->
-
-  <!-- Menu bar definition -->
-<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
-  <putList name="componentsList" >
-    <add value="doc.menu.links" />
-    <add value="doc.menu.taglib.references" />
-    <add value="doc.menu.printer.friendly" />
-    <add value="doc.menu.old.documents" />
-  </putList>
-</definition>
-
-  <!-- Documentation menu definition v1.1-->
-<definition name="doc.menu.links" template="/layouts/menu.jsp" >
-  <put name="title" value="Documentation" />
-    <putList name="items" >
-      <item value="Home"           link="/index.jsp"  />
-      <item value="Live Examples (new)" link="/examples/index.jsp"  />
-      <!--
-	  <item> <value>Commented Examples</value> 
-	  		<link>/examples/index.jsp</link>
-			<classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
-	  </item>
-	  -->
-      <item value="Quick overview" link="/doc/quickOverview.jsp"  />
-      <!--
-      <item value="Tutorial"       link="/doc/tutorial.jsp"  />
-      -->
-      <item value="Tutorial Live Examples" link="/tutorial/index.jsp" />
-      <item value="Download"       link="/doc/download.jsp" />
-      <item value="Installation"   link="/doc/installation.jsp" />
-      <item value="User Guide"	   link="/doc/userGuide.jsp" />
-      <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" />
-    </putList>
-</definition>
-
-  <!-- Printer friendly menu definition -->
-<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" />
-    <item value="Tutorial"           link="/doc/tutorialBody.html" />
-    <item value="User Guide"         link="/doc/userGuideBody.html" />
-    <item value="Overview (old)"  	 link="/doc/overviewBody.html" />
-  </putList>
-</definition>
-
-  <!-- Taglib menu definition -->
-<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" />
-      <!-- <item value="Extension Tags (old)"   link="/doc/extensionsTags.jsp" /> -->
-    </putList>
-</definition>
-
-  <!-- Oldies menu definition -->
-<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" />
-  </putList>
-</definition>
-
-
-</tiles-definitions>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+ <!DOCTYPE tiles-definitions PUBLIC
+       "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
+       "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
+
+<!-- Definitions for Tiles documentation   -->
+
+<tiles-definitions>
+
+  <!-- =======================================================  -->
+  <!-- Master definition  									-->
+  <!-- =======================================================  -->
+
+  <!-- Doc index page description  -->
+  <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" />
+	  <put name="footer" value="/common/footer.jsp" />
+	  <put name="body"   value="doc.portal.body" />
+      <put name="bean"   value="This is an object" type="string" />
+  </definition>
+
+  <!-- =======================================================  -->
+  <!-- Main page body definitions  									-->
+  <!-- =======================================================  -->
+
+  <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
+    <put name="numCols" value="2" />
+    <putList name="list0" >
+      <add value="/doc/portal/welcome.jsp" />
+      <add value="/doc/portal/features.jsp" />
+      <!--<add value="/doc/portal/todo.jsp" /> -->
+      <add value="/doc/portal/documentation.jsp" />
+    </putList>
+    <putList name="list1" >
+      <add value="/doc/portal/news.jsp" />
+      <add value="/doc/portal/download.jsp" />
+      <add value="/doc/portal/tilesCompsTemplates.jsp" />
+      <add value="/doc/portal/strutsIntegration.jsp" />
+      <add value="/doc/portal/comments.jsp" />
+      <add value="/doc/portal/revisions.jsp" />
+    </putList>
+  </definition>
+  
+  <!-- =======================================================  -->
+  <!-- Menus definitions  									-->
+  <!-- =======================================================  -->
+
+  <!-- Menu bar definition -->
+<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
+  <putList name="componentsList" >
+    <add value="doc.menu.links" />
+    <add value="doc.menu.taglib.references" />
+    <add value="doc.menu.printer.friendly" />
+    <add value="doc.menu.old.documents" />
+  </putList>
+</definition>
+
+  <!-- Documentation menu definition v1.1-->
+<definition name="doc.menu.links" template="/layouts/menu.jsp" >
+  <put name="title" value="Documentation" />
+    <putList name="items" >
+      <item value="Home"           link="/index.jsp"  />
+      <item value="Live Examples (new)" link="/examples/index.jsp"  />
+      <!--
+	  <item> <value>Commented Examples</value> 
+	  		<link>/examples/index.jsp</link>
+			<classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
+	  </item>
+	  -->
+      <item value="Quick overview" link="/doc/quickOverview.jsp"  />
+      <!--
+      <item value="Tutorial"       link="/doc/tutorial.jsp"  />
+      -->
+      <item value="Tutorial Live Examples" link="/tutorial/index.jsp" />
+      <item value="Download"       link="/doc/download.jsp" />
+      <item value="Installation"   link="/doc/installation.jsp" />
+      <item value="User Guide"	   link="/doc/userGuide.jsp" />
+      <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" />
+    </putList>
+</definition>
+
+  <!-- Printer friendly menu definition -->
+<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" />
+    <item value="Tutorial"           link="/doc/tutorialBody.html" />
+    <item value="User Guide"         link="/doc/userGuideBody.html" />
+    <item value="Overview (old)"  	 link="/doc/overviewBody.html" />
+  </putList>
+</definition>
+
+  <!-- Taglib menu definition -->
+<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" />
+      <!-- <item value="Extension Tags (old)"   link="/doc/extensionsTags.jsp" /> -->
+    </putList>
+</definition>
+
+  <!-- Oldies menu definition -->
+<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" />
+  </putList>
+</definition>
+
+
+</tiles-definitions>

Propchange: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-1.1.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml?rev=588746&r1=588745&r2=588746&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml (original)
+++ tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml Fri Oct 26 11:52:00 2007
@@ -1,138 +1,138 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-/*
- * $Id: tiles-defs.xml 535861 2007-05-07 11:46:54Z apetrelli $
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-
- <!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-       "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
-
-<!-- Definitions for Tiles documentation   -->
-
-<tiles-definitions>
-
-  <!-- =======================================================  -->
-  <!-- Master definition  									-->
-  <!-- =======================================================  -->
-
-  <!-- Doc index page description  -->
-  <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
-	  <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" />
-      <put-attribute name="bean"   value="This is an object" type="object" />
-  </definition>
-
-  <!-- =======================================================  -->
-  <!-- Main page body definitions  									-->
-  <!-- =======================================================  -->
-
-  <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
-    <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>
-  
-  <!-- =======================================================  -->
-  <!-- Menus definitions  									-->
-  <!-- =======================================================  -->
-
-  <!-- Menu bar definition -->
-<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
-  <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" >
-  <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"  />
-      <!--
-	  <item> <value>Commented Examples</value> 
-	  		<link>/examples/index.jsp</link>
-			<classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
-	  </item>
-	  -->
-      <item value="Quick overview" link="/doc/quickOverview.jsp"  />
-      <!--
-      <item value="Tutorial"       link="/doc/tutorial.jsp"  />
-      -->
-      <item value="Tutorial Live Examples" link="/tutorial/index.jsp" />
-      <item value="Download"       link="/doc/download.jsp" />
-      <item value="Installation"   link="/doc/installation.jsp" />
-      <item value="User Guide"	   link="/doc/userGuide.jsp" />
-      <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" />
-    </put-list-attribute>
-</definition>
-
-  <!-- Printer friendly menu definition -->
-<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
-  <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" />
-  </put-list-attribute>
-</definition>
-
-  <!-- Taglib menu definition -->
-<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
-  <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" /> -->
-    </put-list-attribute>
-</definition>
-
-  <!-- Oldies menu definition -->
-<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
-  <put-attribute name="title" value="Old Documents" />
-  <put-list-attribute name="items" >
-    <item value="Overview (old)"     link="/doc/overview.jsp" />
-  </put-list-attribute>
-</definition>
-
-
-</tiles-definitions>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+ <!DOCTYPE tiles-definitions PUBLIC
+       "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+       "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+
+<!-- Definitions for Tiles documentation   -->
+
+<tiles-definitions>
+
+  <!-- =======================================================  -->
+  <!-- Master definition  									-->
+  <!-- =======================================================  -->
+
+  <!-- Doc index page description  -->
+  <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
+	  <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" />
+      <put-attribute name="bean"   value="This is an object" type="object" />
+  </definition>
+
+  <!-- =======================================================  -->
+  <!-- Main page body definitions  									-->
+  <!-- =======================================================  -->
+
+  <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
+    <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>
+  
+  <!-- =======================================================  -->
+  <!-- Menus definitions  									-->
+  <!-- =======================================================  -->
+
+  <!-- Menu bar definition -->
+<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
+  <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" >
+  <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"  />
+      <!--
+	  <item> <value>Commented Examples</value> 
+	  		<link>/examples/index.jsp</link>
+			<classtype>org.apache.tiles.beans.SimpleMenuItem</classtype>
+	  </item>
+	  -->
+      <item value="Quick overview" link="/doc/quickOverview.jsp"  />
+      <!--
+      <item value="Tutorial"       link="/doc/tutorial.jsp"  />
+      -->
+      <item value="Tutorial Live Examples" link="/tutorial/index.jsp" />
+      <item value="Download"       link="/doc/download.jsp" />
+      <item value="Installation"   link="/doc/installation.jsp" />
+      <item value="User Guide"	   link="/doc/userGuide.jsp" />
+      <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" />
+    </put-list-attribute>
+</definition>
+
+  <!-- Printer friendly menu definition -->
+<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
+  <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" />
+  </put-list-attribute>
+</definition>
+
+  <!-- Taglib menu definition -->
+<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
+  <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" /> -->
+    </put-list-attribute>
+</definition>
+
+  <!-- Oldies menu definition -->
+<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
+  <put-attribute name="title" value="Old Documents" />
+  <put-list-attribute name="items" >
+    <item value="Overview (old)"     link="/doc/overview.jsp" />
+  </put-list-attribute>
+</definition>
+
+
+</tiles-definitions>

Propchange: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/config/tiles-defs-2.0.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp?rev=588746&r1=588745&r2=588746&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp Fri Oct 26 11:52:00 2007
@@ -1,7 +1,7 @@
 <%@ page session="false" %>
 <%--
 /*
- * $Id: testinsertdefinition.jsp 573035 2007-09-05 19:27:22Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp?rev=588746&r1=588745&r2=588746&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp Fri Oct 26 11:52:00 2007
@@ -1,7 +1,7 @@
 <%@ page session="false" %>
 <%--
 /*
- * $Id: testinsertdefinition.jsp 573035 2007-09-05 19:27:22Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp?rev=588746&r1=588745&r2=588746&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp Fri Oct 26 11:52:00 2007
@@ -1,7 +1,7 @@
 <%@ page session="false" %>
 <%--
 /*
- * $Id: testinsertdefinition.jsp 573035 2007-09-05 19:27:22Z apetrelli $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL