cedric 2003/07/21 08:22:45
Modified: web/tiles-documentation/WEB-INF web.xml
tiles-tutorial-defs_fr.xml
tiles-tutorial-defs_de.xml tiles-tutorial-defs.xml
tiles-tests-defs.xml tiles-examples-defs.xml
tiles-defs.xml
Log:
Update and improve the documentation.
Thanks to Yann Cebron.
Revision Changes Path
1.9 +6 -32 jakarta-struts/web/tiles-documentation/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- web.xml 13 May 2003 16:51:29 -0000 1.8
+++ web.xml 21 Jul 2003 15:22:44 -0000 1.9
@@ -11,11 +11,11 @@
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
- <!--
<servlet-class>org.apache.struts.tiles.ActionComponentServlet</servlet-class> -->
- <!-- Tiles config files are now declared with each tiles plugin. Declaring a
tiles
- config file here make it available to each tiles plugin. This is useful to
- have common declarations.
+ <!--
+ Tiles config files are now declared with each TilesPlugin in struts-config.xml.
+ Declaring a tiles config file here makes it available to *all* TilesPlugins.
+ This is useful to have common declarations.
<init-param>
<param-name>definitions-config</param-name>
<param-value>/WEB-INF/tiles-defs.xml,/WEB-INF/tiles-tests-defs.xml,
@@ -23,18 +23,6 @@
/WEB-INF/tiles-examples-defs.xml</param-value>
</init-param>
-->
- <init-param>
- <param-name>definitions-debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>definitions-parser-details</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>definitions-parser-validate</param-name>
- <param-value>true</param-value>
- </init-param>
<init-param>
<param-name>config</param-name>
@@ -52,7 +40,7 @@
<param-name>config/tutorial</param-name>
<param-value>/WEB-INF/struts-tutorial-config.xml</param-value>
</init-param>
- <!--
+ <!--
<init-param>
<param-name>config/doc</param-name>
<param-value>/WEB-INF/struts-doc-config.xml</param-value>
@@ -62,24 +50,10 @@
<param-name>validate</param-name>
<param-value>true</param-value>
</init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
- </init-param>
- <!-- Added as a trick for a bug in Struts -->
- <init-param>
- <param-name>application</param-name>
-
<param-value>org.apache.struts.webapp.tiles.dev1-1.ApplicationResources</param-value>
- </init-param>
<load-on-startup>2</load-on-startup>
</servlet>
-
<!-- Action Servlet Mapping -->
<servlet-mapping>
<servlet-name>action</servlet-name>
@@ -104,7 +78,7 @@
<web-resource-name>Protected Area</web-resource-name>
<!-- Define the context-relative URL(s) to be protected -->
<url-pattern>/test/testRole.jsp</url-pattern>
- <!-- If you list http methods, only those methods are protected -->
+ <!-- If you list HTTP methods, only those methods are protected -->
<http-method>DELETE</http-method>
<http-method>GET</http-method>
<http-method>POST</http-method>
1.3 +2 -1
jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tutorial-defs_fr.xml
Index: tiles-tutorial-defs_fr.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tutorial-defs_fr.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tiles-tutorial-defs_fr.xml 15 Aug 2002 09:31:49 -0000 1.2
+++ tiles-tutorial-defs_fr.xml 21 Jul 2003 15:22:44 -0000 1.3
@@ -4,7 +4,8 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
-<!-- html definition Mappings -->
+<!-- Definitions for Tiles tutorial - French Version -->
+
<tiles-definitions>
<!-- Main Layout Definition description -->
1.4 +7 -8
jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tutorial-defs_de.xml
Index: tiles-tutorial-defs_de.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tutorial-defs_de.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tiles-tutorial-defs_de.xml 29 Jun 2003 17:26:24 -0000 1.3
+++ tiles-tutorial-defs_de.xml 21 Jul 2003 15:22:44 -0000 1.4
@@ -4,18 +4,17 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
-
-<!-- html definition Mappings -->
+<!-- Definitions for Tiles tutorial - German Version -->
<tiles-definitions>
<!-- Main Layout Definition description -->
- <definition name="mainLayout" path="/layout/classicLayout.jsp">
- <put name="title" value="World Financial Online - Deutsche Version" />
- <put name="header" value="/tutorial/common/header.jsp" />
- <put name="footer" value="/tutorial/de/common/footer.jsp" />
- <put name="menu" value="menu.main" />
- <put name="body" value="main.portal.body" />
+ <definition name="mainLayout">
+ <put name="title" value="World Financial Online - Deutsche Version" />
+ <!--<put name="header" value="/tutorial/common/header.jsp"/>-->
+ <put name="footer" value="/tutorial/de/common/footer.jsp" />
+ <!--<put name="menu" value="menu.main"/>
+ <put name="body" value="main.portal.body"/>-->
</definition>
<!-- select language menu -->
1.7 +7 -17
jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tutorial-defs.xml
Index: tiles-tutorial-defs.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tutorial-defs.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tiles-tutorial-defs.xml 29 Jun 2003 17:26:24 -0000 1.6
+++ tiles-tutorial-defs.xml 21 Jul 2003 15:22:44 -0000 1.7
@@ -4,19 +4,7 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
-<!--
- DTD for the Struts Application Configuration File, Version 1.1
-
- To support validation of your configuration file, include the following
- DOCTYPE element at the beginning (after the "xml" declaration):
-
- <!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/tiless-config_1_1.dtd";>
-
--->
-
-<!-- html definition Mappings -->
+<!-- Definitions for Tiles tutorial -->
<tiles-definitions>
@@ -203,7 +191,7 @@
<!-- Rss Channels definitions -->
<!-- ======================================================= -->
- <!-- Dynamic portal main page (use common layout) -->
+ <!-- Dynamic portal main page (uses common layout) -->
<definition name="rssChannelTile" path="/tutorial/actions/rssChannel.do" >
<putList name="urls" >
<add value="http://www.newsforge.com/newsforge.rss"; />
@@ -212,7 +200,7 @@
</putList>
</definition>
- <!-- Dynamic portal main page (use common layout) -->
+ <!-- Dynamic portal main page (uses common layout) -->
<definition name="rssLocalChannelTile" path="/tutorial/actions/rssChannel.do" >
<putList name="urls" >
<add value="/tutorial/rss/rss-example.xml" />
@@ -220,7 +208,7 @@
</putList>
</definition>
- <!-- Dynamic portal main page (use common layout) -->
+ <!-- Dynamic portal main page (uses common layout) -->
<definition name="test.rssChannel.page" extends="mainLayout" >
<put name="title" value="Rss Channel" />
<put name="body" value="rssChannelTile" />
@@ -264,7 +252,9 @@
</definition>
<!-- Dynamic portal preferences body (extends portal.body to inherit default
list) -->
-<definition name="dynamic.portal.prefs.body"
path="/tutorial/actions/myPortalPrefs.tile.do" extends="dynamic.portal.body" >
+ <definition name="dynamic.portal.prefs.body"
+ path="/tutorial/actions/myPortalPrefs.tile.do"
+ extends="dynamic.portal.body">
</definition>
</tiles-definitions>
1.7 +6 -7
jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tests-defs.xml
Index: tiles-tests-defs.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-tests-defs.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tiles-tests-defs.xml 22 Mar 2003 00:28:39 -0000 1.6
+++ tiles-tests-defs.xml 21 Jul 2003 15:22:44 -0000 1.7
@@ -8,14 +8,12 @@
<tiles-definitions>
-
<!-- Test instances -->
<definition name="test.home.page" extends="doc.mainLayout" >
<put name="title" value="Tiles: test page" />
<put name="body" value="/test/testAll.jsp" />
</definition>
-
<!-- Test menu definition -->
<definition name="test.menu.links" path="/layouts/menu.jsp" >
<put name="title" value="Tests" />
@@ -30,7 +28,6 @@
</putList>
</definition>
-
<!-- Test instances -->
<definition name="test.layout.test1" path="/test/layout.jsp" >
<put name="title" value="Test definition from factory : basic" />
@@ -54,14 +51,16 @@
<!-- Test backward compatibility -->
<definition name="test.layout.test4" path="/test/layout.jsp" >
- <put name="title" value="Test definition from factory : backward compatibility"
direct="true" />
+ <put name="title" value="Test definition from factory: backward compatibility"
+ direct="true"/>
<put name="header" value="header.jsp"/>
<put name="body" value="body.jsp" direct="false" />
</definition>
<!-- Test Struts Action and Tiles integration -->
<definition name="test.struts.action" path="/test/layout.jsp" >
- <put name="title" value="Test Struts Action and Tiles integration : default
title" direct="true" />
+ <put name="title" value="Test Struts Action and Tiles integration: default
title"
+ direct="true"/>
<put name="header" value="header.jsp"/>
<put name="body" value="body.jsp" direct="false" />
</definition>
@@ -71,9 +70,9 @@
<put name="title" value="Test fail" direct="true" />
</definition>
-
<!-- Test Tiles Controller -->
-<definition name="test.struts.controller" path="/test/layout.jsp"
+ <definition name="test.struts.controller"
+ path="/test/layout.jsp"
controllerClass="org.apache.struts.webapp.tiles.test.TestTileController" >
<put name="title" value="Test Tile Controller : call to Controller" />
<put name="header" value="header.jsp"/>
1.7 +30 -18
jakarta-struts/web/tiles-documentation/WEB-INF/tiles-examples-defs.xml
Index: tiles-examples-defs.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-examples-defs.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tiles-examples-defs.xml 29 Dec 2002 21:20:06 -0000 1.6
+++ tiles-examples-defs.xml 21 Jul 2003 15:22:44 -0000 1.7
@@ -23,8 +23,8 @@
<!-- ======================================================= -->
<!-- Test complex definition construct
-->
- <!-- These definitions are not intended to be used. they are -->
- <!-- there to stretch the digester rules
-->
+ <!-- These definitions are not intended to be used. -->
+ <!-- They are included to stretch the Digester rules.
-->
<!-- ======================================================= -->
<!-- Test nested list -->
@@ -53,7 +53,7 @@
<!-- ======================================================= -->
<!-- Menu bar definition -->
- <!-- Some definition come from other definition files (ex : doc.menu.*) -->
+ <!-- Some definitions come from other definition files (ex : doc.menu.*) -->
<definition name="examples.menu.bar" path="/layouts/vboxLayout.jsp" >
<putList name="list" >
<add value="common.menu.home" />
@@ -65,16 +65,20 @@
</putList>
</definition>
- <!-- menus common ancestor definition -->
- <!-- This definition is used as common ancestor for menu definitions.
- It allows to define common attribute in one place.
- Actually, it defines the layout used to render menus.
+ <!--
+ Menus common ancestor definition
+ This definition is used as common ancestor for menu definitions.
+ It allows to define common attributes in one place.
+ Actually, it only defines the layout used to render menus.
-->
<definition name="examples.menu.root" path="/layouts/menu.jsp" >
</definition>
- <!-- User menu definition -->
- <!-- This menu is customizable by user. Definition only contains default items -->
+ <!--
+ User menu definition
+ This menu is customizable by user.
+ Definition only contains default items.
+ -->
<definition name="examples.userMenu" extends="examples.menu.root"
controllerClass="org.apache.struts.webapp.tiles.portal.UserMenuAction"
>
<put name="catalogSettings" value="examples.myMenu.catalog.settings"/>
@@ -85,8 +89,10 @@
</putList>
</definition>
- <!-- Menu bar definition used by customizable menu catalog -->
- <!-- This definition declare available items in user menu catalog -->
+ <!--
+ Menu bar definition used by customizable menu catalog
+ This definition declares available items in the user menu catalog.
+ -->
<definition name="examples.myMenu.catalog.settings" >
<putList name="list" >
<add value="examples.userMenu" />
@@ -213,7 +219,8 @@
<!-- Portal settings Body declaration-->
<!-- Extends portal body to provide the same default set of tiles -->
- <definition name="examples.portal.settings.body"
path="/examples/tiles/myPortalSettings.jsp"
+ <definition name="examples.portal.settings.body"
+ path="/examples/tiles/myPortalSettings.jsp"
extends="examples.portal.body"
controllerUrl="/examples/controller/myPortalSettings.do" >
</definition>
@@ -230,7 +237,8 @@
<!-- Portal settings Body declaration-->
<!-- Extends user menu body to provide the same default parameters -->
- <definition name="examples.userMenu.settings.body"
path="/examples/tiles/myMenuSettings.jsp"
+ <definition name="examples.userMenu.settings.body"
+ path="/examples/tiles/myMenuSettings.jsp"
extends="examples.userMenu"
controllerUrl="/examples/controller/myMenuSettings.do" >
<putList name="defaultChoice" >
@@ -311,7 +319,8 @@
<!-- Rss channel body declaration-->
<!-- Example to use when connected (online)-->
- <definition name="examples.rssChannel.body" path="/examples/tiles/rssChannels.jsp"
+ <definition name="examples.rssChannel.body"
+ path="/examples/tiles/rssChannels.jsp"
controllerUrl="/examples/controller/rssChannel.do" >
<putList name="urls" >
<!--<add value="http://www.newsforge.com/newsforge.rss"; /> -->
@@ -322,7 +331,8 @@
<!-- Rss channel body declaration-->
<!-- Example whith local feeds (offline)-->
- <definition name="examples.rssChannel.offline.body"
path="/examples/tiles/rssChannels.jsp"
+ <definition name="examples.rssChannel.offline.body"
+ path="/examples/tiles/rssChannels.jsp"
controllerUrl="/examples/controller/rssChannel.do" >
<putList name="urls" >
<add value="/examples/rssFeed/rss-example.xml" />
@@ -341,7 +351,8 @@
</definition>
<!-- Skin body declaration-->
- <definition name="examples.skin.settings.body"
path="/examples/tiles/mySkinSettings.jsp"
+ <definition name="examples.skin.settings.body"
+ path="/examples/tiles/mySkinSettings.jsp"
controllerUrl="/examples/controller/mySkinSettings.do" >
<put name="userSettingsName" value="tiles.examples.skin.user.settings" />
<!--<put name="catalogName" value="tiles.examples.skin.catalog" />-->
@@ -353,8 +364,9 @@
<!-- ======================================================= -->
- <!-- This definition is used as common ancestor for customible layouts
definitions.
- It allows to define common attribute in one place.
+ <!--
+ This definition is used as common ancestor for customible layouts definitions.
+ It allows to define common attributes in one place.
Actually, it defines names used by layout controller.
-->
<definition name="examples.customizable.layouts.root"
1.5 +7 -4 jakarta-struts/web/tiles-documentation/WEB-INF/tiles-defs.xml
Index: tiles-defs.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-defs.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tiles-defs.xml 29 Dec 2002 21:20:06 -0000 1.4
+++ tiles-defs.xml 21 Jul 2003 15:22:44 -0000 1.5
@@ -4,9 +4,9 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
-<!-- Definitions for Tiles -->
<!--
- This file contains definitions common to all struts module.
+ Definitions for Tiles
+ This file contains definitions common to all Struts modules.
In particular, it contains the main layout and the common menus.
There is also the main page as a portal.
-->
@@ -85,7 +85,9 @@
<item value="Home" link="/doc/index.jsp" />
<item value="Live Examples" link="/examples/index.jsp" />
<item value="Quick overview" link="/test/quickOverview.jsp" />
- <!--<item value="Tutorial" link="/doc/tutorial.jsp" />-->
+ <!--
+ <item value="Tutorial" link="/doc/tutorial.jsp" />
+ -->
<item value="Tutorial Live Examples" link="/tutorial/index.jsp" />
<!--
<item value="Tiles Tags" link="/doc/tilesTags.jsp" />
@@ -93,7 +95,8 @@
<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" />
+ <item value="Struts Home" link="http://www.apache.org";
+ icon="/images/struts-power.gif" />
-->
</putList>
</definition>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
