cedric 2002/07/19 03:05:26 Modified: web/tiles-documentation/WEB-INF web.xml tiles-tutorial-defs.xml tiles-examples-defs.xml struts-config.xml web/tiles-documentation/doc/portal revisions.jsp news.jsp web/tiles-documentation/examples/tiles mySkinSettings.jsp myPortalSettings.jsp myMenuSettings.jsp Added: web/tiles-documentation/WEB-INF struts-examples-config.xml Log: Promote the examples directory as a struts module: - create appropriate struts config file - minor modification to URL in <html:form ....> - remove examples actions from main struts config file Revision Changes Path 1.3 +10 -0 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- web.xml 11 Jul 2002 16:58:46 -0000 1.2 +++ web.xml 19 Jul 2002 10:05:25 -0000 1.3 @@ -34,6 +34,16 @@ <param-value>/WEB-INF/struts-config.xml</param-value> </init-param> <init-param> + <param-name>config/examples</param-name> + <param-value>/WEB-INF/struts-examples-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>validate</param-name> <param-value>true</param-value> </init-param> 1.2 +5 -5 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tiles-tutorial-defs.xml 6 Jul 2002 01:13:48 -0000 1.1 +++ tiles-tutorial-defs.xml 19 Jul 2002 10:05:25 -0000 1.2 @@ -212,10 +212,10 @@ </definition> <!-- Dynamic portal main page (use common layout) --> -<definition name="rssLocalChannelTile" path="/actions/rssChannel.do" > +<definition name="rssLocalChannelTile" path="/tutorial/actions/rssChannel.do" > <putList name="urls" > - <add value="/rss/rss-example.xml" /> - <add value="/rss/apacheweek-headlines.xml" /> + <add value="/tutorial/rss/rss-example.xml" /> + <add value="/tutorial/rss/apacheweek-headlines.xml" /> </putList> </definition> @@ -231,7 +231,7 @@ <!-- ======================================================= --> <!-- Dynamic portal body (Define default list) --> -<definition name="dynamic.portal.body" path="/actions/myPortal.do" > +<definition name="dynamic.portal.body" path="/tutorial/actions/myPortal.do" > <put name="numCols" value="2" /> <putList name="list0" > <add value="/tutorial/portal/login.jsp" /> @@ -263,7 +263,7 @@ </definition> <!-- Dynamic portal preferences body (extends portal.body to inherit default list) --> -<definition name="dynamic.portal.prefs.body" path="/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> 1.3 +1 -1 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tiles-examples-defs.xml 11 Jul 2002 16:58:46 -0000 1.2 +++ tiles-examples-defs.xml 19 Jul 2002 10:05:25 -0000 1.3 @@ -182,7 +182,7 @@ <!-- Portal Body declaration--> <definition name="examples.portal.body" path="/layouts/columnsLayout.jsp" - controllerUrl="/portal/myPortal.do" > + controllerUrl="/examples/myPortal.do" > <put name="numCols" value="2" /> <putList name="list0" > <add value="/examples/tiles/portal/login.jsp" /> 1.3 +4 -4 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- struts-config.xml 11 Jul 2002 16:58:46 -0000 1.2 +++ struts-config.xml 19 Jul 2002 10:05:25 -0000 1.3 @@ -101,20 +101,20 @@ <!-- Tutorial Dynamic portal actions --> <!-- ======================================================= --> <!-- Dynamic Portal user lists retrieving action --> - <action path="/actions/myPortal" + <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="/actions/myPortalPrefs" + <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="/actions/myPortalPrefs.tile" + <action path="/tutorial/actions/myPortalPrefs.tile" type="org.apache.struts.webapp.tiles.dynPortal.SetPortalPrefsAction" name="portalPrefsForm"> <forward name="preferences" path="/tutorial/dynPortal/myPortalPrefTile.jsp"/> @@ -187,7 +187,7 @@ <!-- ======================================================= --> <!-- Rss Channel --> <!-- ======================================================= --> - <action path="/actions/rssChannel" + <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"/> 1.1 jakarta-struts/web/tiles-documentation/WEB-INF/struts-examples-config.xml Index: struts-examples-config.xml =================================================================== <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> <!-- This is the Struts configuration file for the example application, using the proposed new syntax. NOTE: You would only flesh out the details in the "form-bean" declarations if you had a generator tool that used them to create the corresponding Java classes for you. Otherwise, you would need only the "form-bean" element itself, with the corresponding "name" and "type" attributes. --> <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="myPortalSettingsForm" type="org.apache.struts.webapp.tiles.portal.PortalSettingsForm"/> <form-bean name="myMenuSettingsForm" type="org.apache.struts.webapp.tiles.portal.MenuSettingsForm"/> <form-bean name="mySkinSettingsForm" type="org.apache.struts.webapp.tiles.skin.LayoutSettingsForm"/> </form-beans> <!-- ========== Global Forward Definitions ============================== --> <global-forwards> <forward name="failure" path="forward.example.failure.page"/> </global-forwards> <!-- ========== Action Mapping Definitions ============================== --> <action-mappings> <!-- ======================================================= --> <!-- Examples Portal 1.1 actions --> <!-- ======================================================= --> <!-- Dynamic Portal user lists retrieving action --> <action path="/myPortal" type="org.apache.struts.webapp.tiles.portal.UserPortalAction"> </action> <!-- Tiles Action associated to portal settings --> <action path="/controller/myPortalSettings" type="org.apache.struts.webapp.tiles.portal.UserPortalSettingsAction" name="myPortalSettingsForm" > </action> <!-- Portal settings page entrance : forward to appropriate page definition --> <action path="/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="/controller/myMenuSettings" type="org.apache.struts.webapp.tiles.portal.UserMenuSettingsAction" name="myMenuSettingsForm" > </action> <!-- Menu Settings page entrance : forward to appropriate page definition --> <action path="/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="/mySkinSettings" type="org.apache.struts.tiles.actions.NoOpAction" name="mySkinSettingsForm" > <forward name="success" path="examples.skin.settings.page"/> </action> <action path="/controller/mySkinSettings" type="org.apache.struts.webapp.tiles.skin.LayoutSettingsAction" name="mySkinSettingsForm" > </action> <action path="/controller/layoutSwitch" type="org.apache.struts.webapp.tiles.skin.LayoutSwitchAction" > </action> <!-- ======================================================= --> <!-- Tiles 1.1 Rss Channel --> <!-- ======================================================= --> <action path="/controller/rssChannel" type="org.apache.struts.webapp.tiles.rssChannel.RssChannelsAction"> </action> </action-mappings> <!-- ========== Tiles plug-in setting settings =================== --> <!-- Here we specified the tiles plug-in. This plug-in register appropriate Request Processor --> <!-- <controller processorClass="org.apache.struts.tiles.TilesRequestProcessor" /> --> <!-- ========== Associated Messages Ressource settings =================== --> <!-- Not used by tiles or this website, but needed due to a bug in actual Struts version --> <message-resources parameter="org.apache.struts.webapp.tiles.dev1-1.ApplicationResources" null="false" /> <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="definitions-debug" value="1" /> <set-property property="definitions-parser-details" value="0" /> <set-property property="definitions-parser-validate" value="true" /> </plug-in> </struts-config> 1.3 +15 -0 jakarta-struts/web/tiles-documentation/doc/portal/revisions.jsp Index: revisions.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/doc/portal/revisions.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- revisions.jsp 11 Jul 2002 16:59:38 -0000 1.2 +++ revisions.jsp 19 Jul 2002 10:05:26 -0000 1.3 @@ -2,6 +2,21 @@ <tr> <th bgcolor="aqua"><FONT size=4>History</FONT></th></tr> <TR> + <TD><FONT size=2><STRONG> 19 Jul. 2002</STRONG> </FONT></TD></TR> + <TR> + <TD> + <FONT size=2> + <UL> + <LI>TilesPlugin available for Struts1.1</LI> + <li>Blank war files have been updated</li> + <li>Definition factory interface has change. A new life cycle is introduce</li> + <li>Struts multi-modules feature works with the Tiles</li> + </UL> + </FONT> + </TD> + </TR> + <TR> + <TR> <TD><FONT size=2><STRONG> 20 Jun. 2002</STRONG> </FONT></TD></TR> <TR> <TD> 1.2 +8 -1 jakarta-struts/web/tiles-documentation/doc/portal/news.jsp Index: news.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/doc/portal/news.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- news.jsp 6 Jul 2002 01:13:49 -0000 1.1 +++ news.jsp 19 Jul 2002 10:05:26 -0000 1.2 @@ -3,6 +3,13 @@ <th bgcolor="aqua"><font size="+1"><strong>News</strong></font></th></tr> <tr> <td> + <p><FONT size=2>19 Jul. 2002</FONT></P> + <P><STRONG><EM><FONT color=#ff0000>Tiles is now in the main branch of + Struts1.1 distribution</FONT></EM></STRONG> + <br><FONT color=#000000 size=2> + A Tiles plug-in is available for Struts1.1. + </FONT></P> + <p><FONT size=2>13 Jun. 2002</FONT></P> <P><STRONG><EM><FONT color=#ff0000>Vote for Tiles and Struts</FONT></EM></STRONG> <br><FONT color=#000000 size=2> @@ -73,4 +80,4 @@ <FONT size=2>Check "History" for latest modifications (further in this page)</FONT></P> <P> -</td></tr></table> \ No newline at end of file +</td></tr></table> 1.2 +1 -1 jakarta-struts/web/tiles-documentation/examples/tiles/mySkinSettings.jsp Index: mySkinSettings.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/examples/tiles/mySkinSettings.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mySkinSettings.jsp 6 Jul 2002 01:13:50 -0000 1.1 +++ mySkinSettings.jsp 19 Jul 2002 10:05:26 -0000 1.2 @@ -5,7 +5,7 @@ <tiles:importAttribute name="catalog" /> <tiles:useAttribute name="selected" /> -<html:form action="/examples/mySkinSettings.do" > +<html:form action="/mySkinSettings.do" > 1.2 +1 -1 jakarta-struts/web/tiles-documentation/examples/tiles/myPortalSettings.jsp Index: myPortalSettings.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/examples/tiles/myPortalSettings.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- myPortalSettings.jsp 6 Jul 2002 01:13:50 -0000 1.1 +++ myPortalSettings.jsp 19 Jul 2002 10:05:26 -0000 1.2 @@ -68,7 +68,7 @@ </script> -<html:form action="/examples/myPortalSettings.do" > +<html:form action="/myPortalSettings.do" > 1.2 +1 -1 jakarta-struts/web/tiles-documentation/examples/tiles/myMenuSettings.jsp Index: myMenuSettings.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/examples/tiles/myMenuSettings.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- myMenuSettings.jsp 6 Jul 2002 01:13:50 -0000 1.1 +++ myMenuSettings.jsp 19 Jul 2002 10:05:26 -0000 1.2 @@ -75,7 +75,7 @@ <tiles:importAttribute name="catalog" /> <tiles:importAttribute name="userItems" /> -<html:form action="/examples/myMenuSettings.do" > +<html:form action="/myMenuSettings.do" > <ul> <li>Choose an item from "Items Choice" colomn, and add it to "my Items" using the '>' button.</li>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>