cedric 2002/12/29 13:20:06
Modified: web/tiles-documentation/WEB-INF web.xml
tiles-tutorial-defs.xml tiles-tests-defs.xml
tiles-examples-defs.xml tiles-defs.xml
struts-tests-config.xml struts-examples-config.xml
struts-config.xml
Log:
Change config files to reflect modules.
Revision Changes Path
1.5 +5 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 5 Nov 2002 14:18:58 -0000 1.4
+++ web.xml 29 Dec 2002 21:20:06 -0000 1.5
@@ -41,10 +41,14 @@
<param-name>config/test</param-name>
<param-value>/WEB-INF/struts-tests-config.xml</param-value>
</init-param>
- <!--
<init-param>
<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>
</init-param>
-->
<init-param>
1.5 +5 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tiles-tutorial-defs.xml 5 Nov 2002 14:18:58 -0000 1.4
+++ tiles-tutorial-defs.xml 29 Dec 2002 21:20:06 -0000 1.5
@@ -72,10 +72,11 @@
<definition name="menu.logo" path="/tutorial/common/menu/menuLogo.jsp" />
<!-- Documentation menu -->
+ <!-- Old style menu. Check module 'examples' for new style -->
<definition name="menu.documentation" path="/common/submenu.jsp" >
- <put name="title" value="Documentation" />
+ <put name="title" value="Tiles" />
<putList name="items" >
- <add value="Documentation Home" />
+ <add value="Home" />
</putList>
<putList name="links" >
<add value="/index.jsp" />
@@ -120,7 +121,7 @@
</definition>
<!-- Menu sources definition -->
-<definition name="menu.src" path="/common/menuViewSrc.jsp" >
+<definition name="menu.src" path="/tutorial/common/menuViewSrc.jsp" >
<putList name="list" >
<add value="/tutorial/index.jsp" />
<add value="/tutorial/basicPage.jsp" />
@@ -203,7 +204,7 @@
<!-- ======================================================= -->
<!-- Dynamic portal main page (use common layout) -->
-<definition name="rssChannelTile" path="/actions/rssChannel.do" >
+<definition name="rssChannelTile" path="/tutorial/actions/rssChannel.do" >
<putList name="urls" >
<add value="http://www.newsforge.com/newsforge.rss"; />
<add value="http://xmlhack.com/rss.php"; />
1.5 +7 -0
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tiles-tests-defs.xml 5 Nov 2002 14:18:58 -0000 1.4
+++ tiles-tests-defs.xml 29 Dec 2002 21:20:06 -0000 1.5
@@ -9,6 +9,13 @@
<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" />
1.6 +9 -14
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tiles-examples-defs.xml 5 Nov 2002 14:18:58 -0000 1.5
+++ tiles-examples-defs.xml 29 Dec 2002 21:20:06 -0000 1.6
@@ -56,12 +56,11 @@
<!-- Some definition 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" />
<add value="examples.userMenu" />
<add value="examples.menu.links" />
- <add value="doc.menu.links" />
+ <add value="common.menu.doc" />
<add value="examples.menu.settings" />
- <add value="doc.menu.taglib.references" />
- <add value="doc.menu.printer.friendly" />
<add value="examples.menu.admin" />
</putList>
</definition>
@@ -101,13 +100,9 @@
<definition name="examples.menu.links" extends="examples.menu.root" >
<put name="title" value="Examples" />
<putList 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"
- classtype="org.apache.struts.tiles.beans.SimpleMenuItem" />
+ <item value="Examples Home" link="/examples/index.jsp" />
+ <item value="Portal" link="/examples/portal.jsp" />
+ <item value="my Portal" link="/examples/myPortal.jsp" />
<item value="my Portal Settings" link="/examples/myPortalSettings.jsp" />
<item value="my Menu Settings" link="/examples/myMenuSettings.jsp" />
<item value="Tabs (choosen pages)" link="/examples/tabs.jsp"/>
@@ -264,10 +259,10 @@
<put name="parameterName" value="selected" />
<putList name="tabList" >
<item value="Doc Home" link="/index.jsp" />
- <item value="Quick overview" link="/doc/quickOverview.jsp" />
- <item value="Tutorial" link="/doc/tutorial.jsp" />
+ <item value="Quick overview" link="/test/quickOverview.do" />
+ <!-- <item value="Tutorial" link="/doc/tutorial.jsp" /> -->
<item value="Examples Home" link="/examples/index.jsp" />
- <item value="Tutorial Home" link="/tutorial/index.jsp" />
+ <item value="Tutorial Home" link="/tutorial/index.do" />
<item value="Login"
link="/examples/tiles/portal/login.jsp" />
<item value="Messages" link="/examples/tiles/portal/messages.jsp" />
<item value="NewsFeed" link="/examples/tiles/portal/newsFeed.jsp" />
@@ -319,7 +314,7 @@
<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"; />
+ <!--<add value="http://www.newsforge.com/newsforge.rss"; /> -->
<add value="http://xmlhack.com/rss.php"; />
<add value="http://lwn.net/headlines/rss"; />
</putList>
1.4 +38 -39 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tiles-defs.xml 5 Nov 2002 14:18:58 -0000 1.3
+++ tiles-defs.xml 29 Dec 2002 21:20:06 -0000 1.4
@@ -4,7 +4,12 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
-<!-- Definitions for Tiles documentation -->
+<!-- Definitions for Tiles -->
+<!--
+ This file contains definitions common to all struts module.
+ In particular, it contains the main layout and the common menus.
+ There is also the main page as a portal.
+-->
<tiles-definitions>
@@ -48,41 +53,53 @@
<!-- ======================================================= -->
<!-- Menu bar definition -->
-<definition name="doc.menu.main" path="/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" />
+<definition name="doc.menu.main" path="/layouts/vboxLayout.jsp" >
+ <putList name="list" >
+ <add value="common.menu.home" />
+ <add value="common.menu.examples" />
+ <add value="common.menu.doc" />
+ <!-- <add value="common.menu.printer.friendly" /> -->
+ </putList>
+</definition>
+
+ <!-- The home menu definition -->
+<definition name="common.menu.home" path="/layouts/menu.jsp" >
+ <put name="title" value="Tiles" />
+ <putList name="items" >
+ <item value="Tiles Home" link="/index.jsp" />
+ </putList>
+</definition>
+
+ <!-- Printer friendly menu definition -->
+<definition name="common.menu.examples" path="/layouts/menu.jsp" >
+ <put name="title" value="Examples" />
+ <putList name="items" >
+ <item value="Home" link="/examples/index.jsp" />
</putList>
</definition>
<!-- Documentation menu definition v1.1-->
-<definition name="doc.menu.links" path="/layouts/menu.jsp" >
+<definition name="common.menu.doc" path="/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.struts.tiles.beans.SimpleMenuItem</classtype>
- </item>
- -->
- <item value="Quick overview" link="/doc/quickOverview.jsp" />
- <item value="Tutorial" link="/doc/tutorial.jsp" />
+ <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 Live Examples" link="/tutorial/index.jsp" />
+ <!--
+ <item value="Tiles Tags" link="/doc/tilesTags.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.struts.tiles.beans.SimpleMenuItem" />
+ <item value="Struts Home" link="http://www.apache.org";
icon="/images/struts-power.gif" />
+ -->
</putList>
</definition>
<!-- Printer friendly menu definition -->
-<definition name="doc.menu.printer.friendly" path="/layouts/menu.jsp" >
+<definition name="common.menu.printer.friendly" path="/layouts/menu.jsp" >
<put name="title" value="Printer Versions" />
<putList name="items" >
<item value="Quick Overview" link="/test/testAll.jsp" />
@@ -91,23 +108,5 @@
<item value="Overview (old)" link="/doc/overviewBody.html" />
</putList>
</definition>
-
- <!-- Taglib menu definition -->
-<definition name="doc.menu.taglib.references" path="/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" path="/layouts/menu.jsp" >
- <put name="title" value="Old Documents" />
- <putList name="items" >
- <item value="Overview (old)" link="/doc/overview.jsp" />
- </putList>
-</definition>
-
</tiles-definitions>
1.2 +10 -38
jakarta-struts/web/tiles-documentation/WEB-INF/struts-tests-config.xml
Index: struts-tests-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-tests-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-tests-config.xml 5 Nov 2002 14:18:58 -0000 1.1
+++ struts-tests-config.xml 29 Dec 2002 21:20:06 -0000 1.2
@@ -17,28 +17,17 @@
<struts-config>
-
-
- <!-- ========== Form Bean Definitions =================================== -->
- <form-beans>
-
- <!-- Logon form bean -->
- <form-bean name="invoiceForm"
- type="org.apache.struts.webapp.tiles.invoice.InvoiceForm"/>
- <form-bean name="portalPrefsForm"
-
type="org.apache.struts.webapp.tiles.dynPortal.PortalPrefsForm"/>
- </form-beans>
-
-
- <!-- ========== Global Forward Definitions ============================== -->
- <global-forwards>
- <forward name="failure" path="forward.example.failure.page"/>
- </global-forwards>
-
-
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
+ <!-- Main page url entry.
+ This action is used to map an URL to an internal jsp.
+ A side effect is that the struts module is switched to the module
+ associated to this config file -->
+ <action path="/quickOverview"
+ type="org.apache.struts.actions.ForwardAction"
+ parameter="test.home.page"/>
+
<!-- ======================================================= -->
<!-- Test actions -->
<!-- ======================================================= -->
@@ -51,7 +40,7 @@
</action>
<!-- Test Struts Forwardintegration -->
- <action path="/test/testForward"
+ <action path="/testForward"
type="org.apache.struts.webapp.tiles.test.TestActionTileAction"
forward="test.struts.action"/>
@@ -69,21 +58,6 @@
<forward name="error" path="anything" />
</action>
- <!-- ======================================================= -->
- <!-- test, to be removed -->
- <!-- ======================================================= -->
- <action path="/tutorial/testAction"
- type="org.apache.struts.webapp.tiles.lang.SelectLocaleAction">
- <forward name="failure" path="/tutorial/common/footer.jsp"/>
- <forward name="success" path="/tutorial/common/footer.jsp"/>
- </action>
-
- <action path="/tutorial/testAction2"
- type="org.apache.struts.webapp.tiles.tutorial.ForwardExampleAction">
- <forward name="failure" path="forward.example.success.page"/>
- <forward name="success" path="forward.example.success.page"/>
- </action>
-
</action-mappings>
@@ -100,9 +74,7 @@
<plug-in className="org.apache.struts.tiles.TilesPlugin" >
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml,
- /WEB-INF/tiles-tests-defs.xml,
-
/WEB-INF/tiles-tutorial-defs.xml,
- /WEB-INF/tiles-examples-defs.xml" />
+ /WEB-INF/tiles-tests-defs.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
1.3 +0 -1
jakarta-struts/web/tiles-documentation/WEB-INF/struts-examples-config.xml
Index: struts-examples-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-examples-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-examples-config.xml 5 Nov 2002 14:18:58 -0000 1.2
+++ struts-examples-config.xml 29 Dec 2002 21:20:06 -0000 1.3
@@ -127,7 +127,6 @@
<plug-in className="org.apache.struts.tiles.TilesPlugin" >
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml,
-
/WEB-INF/tiles-tests-defs.xml,/WEB-INF/tiles-tutorial-defs.xml,
/WEB-INF/tiles-examples-defs.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
1.5 +1 -160 jakarta-struts/web/tiles-documentation/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-config.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts-config.xml 5 Nov 2002 14:18:58 -0000 1.4
+++ struts-config.xml 29 Dec 2002 21:20:06 -0000 1.5
@@ -17,166 +17,9 @@
<struts-config>
-
-
- <!-- ========== Form Bean Definitions =================================== -->
- <form-beans>
-
- <!-- Logon form bean -->
- <form-bean name="invoiceForm"
- type="org.apache.struts.webapp.tiles.invoice.InvoiceForm"/>
- <form-bean name="portalPrefsForm"
-
type="org.apache.struts.webapp.tiles.dynPortal.PortalPrefsForm"/>
- </form-beans>
-
-
- <!-- ========== Global Forward Definitions ============================== -->
- <global-forwards>
- <forward name="failure" path="forward.example.failure.page"/>
- </global-forwards>
-
-
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
- <!-- Edit user registration -->
- <action path="/tutorial/forwardExampleAction"
- type="org.apache.struts.webapp.tiles.tutorial.ForwardExampleAction">
- <forward name="success" path="forward.example.success.page"/>
- </action>
-
- <!-- Edit invoice example -->
- <action path="/tutorial/lang"
- type="org.apache.struts.webapp.tiles.lang.SelectLocaleAction">
- <forward name="failure" path="/tutorial/index.jsp"/>
- <forward name="success" path="/tutorial/index.jsp"/>
- </action>
-
- <!-- Dynamic template example -->
- <action path="/tutorial/dynTemplate"
- type="org.apache.struts.webapp.tiles.template.DynTemplateAction">
- <forward name="success" path="/tutorial/dynFramesetPage.jsp"/>
- </action>
-
-
- <!-- Edit invoice example -->
- <action path="/tutorial/invoice/editInvoice"
-
type="org.apache.struts.webapp.tiles.invoice.EditInvoiceAction"
- name="invoiceForm" >
- <forward name="success" path="/tutorial/invoice/index.jsp"/>
- </action>
-
- <!-- ======================================================= -->
- <!-- Tutorial Dynamic portal actions -->
- <!-- ======================================================= -->
- <!-- Dynamic Portal user lists retrieving action -->
- <action path="/tutorial/actions/myPortal"
-
type="org.apache.struts.webapp.tiles.dynPortal.RetrievePortalAction">
- <forward name="success" path="main.portal.body"/>
- </action>
-
- <!-- Dynamic Portal user lists set action : no op action forwarding to tile -->
- <action path="/tutorial/actions/myPortalPrefs"
- type="org.apache.struts.tiles.actions.NoOpAction"
- name="portalPrefsForm">
- <forward name="success" path="myDynamicPortalPreferences"/>
- </action>
-
- <!-- Dynamic Portal user lists set tile-action : -->
- <action path="/tutorial/actions/myPortalPrefs.tile"
-
type="org.apache.struts.webapp.tiles.dynPortal.SetPortalPrefsAction"
- name="portalPrefsForm">
- <forward name="preferences"
path="/tutorial/dynPortal/myPortalPrefTile.jsp"/>
- <forward name="portal" path="dynamic.portal.body"/>
- </action>
-
-
- <!-- ======================================================= -->
- <!-- Examples Portal 1.1 actions -->
- <!-- ======================================================= -->
- <!-- Dynamic Portal user lists retrieving action -->
- <action path="/portal/myPortal"
-
type="org.apache.struts.webapp.tiles.portal.UserPortalAction">
- </action>
-
- <!-- Tiles Action associated to portal settings -->
- <action path="/examples/controller/myPortalSettings"
-
type="org.apache.struts.webapp.tiles.portal.UserPortalSettingsAction"
- name="myPortalSettingsForm" >
- </action>
-
- <!-- Portal settings page entrance : forward to appropriate page definition -->
- <action path="/examples/myPortalSettings"
- type="org.apache.struts.tiles.actions.NoOpAction"
- name="myPortalSettingsForm" >
- <forward name="success" path="examples.portal.settings.page"/>
- </action>
-
- <!-- Tiles Action associated to Tile myMenuSettings -->
- <action path="/examples/controller/myMenuSettings"
-
type="org.apache.struts.webapp.tiles.portal.UserMenuSettingsAction"
- name="myMenuSettingsForm" >
- </action>
-
- <!-- Menu Settings page entrance : forward to appropriate page definition -->
- <action path="/examples/myMenuSettings"
- type="org.apache.struts.tiles.actions.NoOpAction"
- name="myMenuSettingsForm" >
- <forward name="success" path="examples.userMenu.settings.page"/>
- </action>
-
- <!-- ======================================================= -->
- <!-- Tiles 1.1 Skin Settings -->
- <!-- ======================================================= -->
- <!-- Skin Settings page entrance : forward to appropriate page definition -->
- <action path="/examples/mySkinSettings"
- type="org.apache.struts.tiles.actions.NoOpAction"
- name="mySkinSettingsForm" >
- <forward name="success" path="examples.skin.settings.page"/>
- </action>
-
- <action path="/examples/controller/mySkinSettings"
- type="org.apache.struts.webapp.tiles.skin.LayoutSettingsAction"
- name="mySkinSettingsForm" >
- </action>
-
- <action path="/examples/controller/layoutSwitch"
- type="org.apache.struts.webapp.tiles.skin.LayoutSwitchAction" >
- </action>
-
-
- <!-- ======================================================= -->
- <!-- Tiles 1.1 Rss Channel -->
- <!-- ======================================================= -->
- <action path="/examples/controller/rssChannel"
- type="org.apache.struts.webapp.tiles.rssChannel.RssChannelsAction">
- </action>
-
-
- <!-- ======================================================= -->
- <!-- Rss Channel -->
- <!-- ======================================================= -->
- <action path="/tutorial/actions/rssChannel"
- type="org.apache.struts.webapp.tiles.rssChannel.Channels">
- <forward name="continue" path="/tutorial/dynPortal/Channels.jsp"/>
- <forward name="error" path="/tutorial/dynPortal/Errors.jsp"/>
- </action>
-
- <!-- ======================================================= -->
- <!-- test, to be removed -->
- <!-- ======================================================= -->
- <action path="/tutorial/testAction"
- type="org.apache.struts.webapp.tiles.lang.SelectLocaleAction">
- <forward name="failure" path="/tutorial/common/footer.jsp"/>
- <forward name="success" path="/tutorial/common/footer.jsp"/>
- </action>
-
- <action path="/tutorial/testAction2"
- type="org.apache.struts.webapp.tiles.tutorial.ForwardExampleAction">
- <forward name="failure" path="forward.example.success.page"/>
- <forward name="success" path="forward.example.success.page"/>
- </action>
-
<!-- ======================================================= -->
<!-- Admin -->
<!-- ======================================================= -->
@@ -203,9 +46,7 @@
<plug-in className="org.apache.struts.tiles.TilesPlugin" >
<set-property property="definitions-config"
- value="/WEB-INF/tiles-defs.xml,
-
/WEB-INF/tiles-tests-defs.xml,/WEB-INF/tiles-tutorial-defs.xml,
- /WEB-INF/tiles-examples-defs.xml" />
+ value="/WEB-INF/tiles-defs.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
