cedric 2002/11/05 06:18:58 Modified: web/blank/WEB-INF struts-config.xml web/tiles-documentation/doc/portal documentation.jsp news.jsp revisions.jsp welcome.jsp web/tiles-documentation/layouts tabsLayout.jsp web/tiles-documentation/WEB-INF struts-config.xml struts-examples-config.xml tiles-defs.xml tiles-examples-defs.xml tiles-tests-defs.xml tiles-tutorial-defs.xml web.xml Added: web/tiles-documentation/WEB-INF struts-doc-config.xml struts-tests-config.xml tiles-doc-defs.xml Log: Update documentation for Tiles becoming struts1.1 module aware Revision Changes Path 1.8 +10 -12 jakarta-struts/web/blank/WEB-INF/struts-config.xml Index: struts-config.xml =================================================================== RCS file: /home/cvs/jakarta-struts/web/blank/WEB-INF/struts-config.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- struts-config.xml 26 Oct 2002 00:25:24 -0000 1.7 +++ struts-config.xml 5 Nov 2002 14:18:57 -0000 1.8 @@ -297,16 +297,15 @@ - definitions-config: (optional) Specify configuration file names. There can be several comma separated file names (default: ?? ) - - definitions-debug: (optional) - Specify Tiles debug level. - O : no debug information - 1 : debug information - 2 : more debug information - - definitions-parser-details: (optional) - Specify Digester debug level. This value is passed to Digester - O : no debug information (default) - 1 : debug information - 2 : more debug information + - moduleAware: (optional - struts1.1) + Specify if the Tiles definition factory is module aware. If true (default), + there will be one factory for each Struts module. + If false, there will be one common factory for all module. In this later case, + it is still needed to declare one plugin per module. The factory will be + initialized with parameters found in the first initialized plugin (generally the + one associated with the default module). + true : One factory per module. (default) + false : one single shared factory for all modules - definitions-parser-validate: (optional) Specify if xml parser should validate the Tiles configuration file. true : validate. DTD should be specified in file header. (default) @@ -320,8 +319,7 @@ <plug-in className="org.apache.struts.tiles.TilesPlugin" > <set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml" /> - <set-property property="definitions-debug" value="0" /> - <set-property property="definitions-parser-details" value="0" /> + <set-property property="moduleAware" value="true" /> <set-property property="definitions-parser-validate" value="true" /> </plug-in> 1.2 +13 -1 jakarta-struts/web/tiles-documentation/doc/portal/documentation.jsp Index: documentation.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/doc/portal/documentation.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- documentation.jsp 6 Jul 2002 01:13:49 -0000 1.1 +++ documentation.jsp 5 Nov 2002 14:18:58 -0000 1.2 @@ -15,4 +15,16 @@ <TR> <TD><div align="center"><A href="<%=request.getContextPath()%>/api/index.html"><FONT size=2>API</FONT></A></div></TD></TR> -</table> \ No newline at end of file + <TR> + <TD><A href="http://www.manning.com/husted/index.html"><P align=center><FONT + size=2>Struts in Action (book)</FONT></A></P></TD></TR> + <TR> + <TD><A href="http://www-106.ibm.com/developerworks/java/library/j-strutstiles/?loc=j"><P align=center><FONT + size=2>Struts and Tiles aid component-based development (article)</FONT></A></P></TD></TR> + <TR> + <TD><A href="http://www.javaworld.com/javaworld/jw-01-2002/jw-0104-tilestrut.html"><P align=center><FONT + size=2> UI design with Tiles and Struts (article)</FONT></A></P></TD></TR> + <TR> + <TD><A href="http://www.amazon.com/exec/obidos/ASIN/0596003285/ref%3Dpd%5Fsims%5Fdp%5F%5F1/002-2697389-7971238"><P align=center><FONT + size=2>Programming Jakarta Struts by Chuck Cavaness (book)</FONT></A></P></TD></TR> +</table> 1.3 +6 -12 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news.jsp 19 Jul 2002 10:05:26 -0000 1.2 +++ news.jsp 5 Nov 2002 14:18:58 -0000 1.3 @@ -3,23 +3,17 @@ <th bgcolor="aqua"><font size="+1"><strong>News</strong></font></th></tr> <tr> <td> + <p><FONT size=2>03 Nov. 2002</FONT></P> + <P><STRONG><EM><FONT color=#ff0000>TilesPlugin module aware</FONT></EM></STRONG> + <br><FONT color=#000000 size=2> + The TilesPlugin for struts now create one separate definition factory for each struts module. + </FONT></P> + <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> - <a href="http://www.sys-con.com/java/readerschoice2002/nominationform.cfm" target="_blank"/>Vote JDJ Readers' Choice Award</a> - <ul> - <li>6) Best Java Component : Tiles,</li> - <li>26) Best Java e-Business Framework : Struts,</li> - <li>16) Best Java Training Program : J2EE / JSP Framework by baseBeans -Struts Fast Track</li> - </ul> </FONT></P> <p><FONT size=2>22 May 2002</FONT></P> 1.4 +13 -1 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- revisions.jsp 19 Jul 2002 10:05:26 -0000 1.3 +++ revisions.jsp 5 Nov 2002 14:18:58 -0000 1.4 @@ -2,6 +2,19 @@ <tr> <th bgcolor="aqua"><FONT size=4>History</FONT></th></tr> <TR> + <TD><FONT size=2><STRONG> 03 Nov. 2002</STRONG> </FONT></TD></TR> + <TR> + <TD> + <FONT size=2> + <UL> + <LI>Tiles now use the commons-logging package.</LI> + <li><useAttribute>: Corrected a bug where the tag fail when reused by server.</li> + <li>The struts TilesPlugin now create one factory for each struts module</li> + </UL> + </FONT> + </TD> + </TR> + <TR> <TD><FONT size=2><STRONG> 19 Jul. 2002</STRONG> </FONT></TD></TR> <TR> <TD> @@ -15,7 +28,6 @@ </FONT> </TD> </TR> - <TR> <TR> <TD><FONT size=2><STRONG> 20 Jun. 2002</STRONG> </FONT></TD></TR> <TR> 1.2 +4 -8 jakarta-struts/web/tiles-documentation/doc/portal/welcome.jsp Index: welcome.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/doc/portal/welcome.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- welcome.jsp 6 Jul 2002 01:13:49 -0000 1.1 +++ welcome.jsp 5 Nov 2002 14:18:58 -0000 1.2 @@ -4,12 +4,8 @@ <tr> <td> <P> - <FONT size=2> - Welcome to the - <EM>Tiles </EM>website. This "portal" page is an example of what can be - done with <EM>Tiles</EM> - . It is made by - assembling <EM>Tiles</EM>. + <FONT size=2> Welcome to the <EM>Tiles </EM>website. This "portal" page is an example of what can be + done with <EM>Tiles</EM>. It is made by assembling <EM>Tiles</EM>. </FONT> <BR><FONT size=2> You can : @@ -17,10 +13,10 @@ <li>Take a glance at some Tiles features and capabilities by browsing the commented live examples (avalaible if you install Tiles)</li> <li>Check the "Quick Overview" for code examples and results</li> <li>Start learning Tiles with the tutorial</li> - <li>Learn Tiles Advanced Features</li> + <li>Learn <a href="http://www.lifl.fr/~dumoulin/tiles/tilesAdvancedFeatures.pdf" />Tiles Advanced Features (pdf)</a></li> <li>Read article from <a href="http://www.javaworld.com/javaworld/jw-01-2002/jw-0104-tilestrut.html" >javaworld</a></li> </ul> </FONT> </P> </td></tr> -</table> \ No newline at end of file +</table> 1.2 +4 -0 jakarta-struts/web/tiles-documentation/layouts/tabsLayout.jsp Index: tabsLayout.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/layouts/tabsLayout.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tabsLayout.jsp 6 Jul 2002 01:13:51 -0000 1.1 +++ tabsLayout.jsp 5 Nov 2002 14:18:58 -0000 1.2 @@ -48,6 +48,10 @@ <logic:iterate id="tab" name="tabList" type="org.apache.struts.tiles.beans.MenuItem" > <% // compute href String href = request.getRequestURI() + "?"+parameterName + "=" + index; + // Don't add request URI prefix , but let the client compute the original URL + // This allows to use a Struts action as page URL, and perform a forward. + // Bug reported by Don Peterkofsky + //String href = "" + "?"+parameterName + "=" + index; String color = notSelectedColor; if( index == selectedIndex ) { 1.4 +3 -36 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- struts-config.xml 19 Jul 2002 10:05:25 -0000 1.3 +++ struts-config.xml 5 Nov 2002 14:18:58 -0000 1.4 @@ -25,13 +25,8 @@ <!-- 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-bean name="portalPrefsForm" + type="org.apache.struts.webapp.tiles.dynPortal.PortalPrefsForm"/> </form-beans> @@ -71,32 +66,6 @@ <forward name="success" path="/tutorial/invoice/index.jsp"/> </action> - <!-- Test Struts action and Tiles integration --> - <action path="/test/testAction" - type="org.apache.struts.webapp.tiles.test.TestActionTileAction"> - <forward name="success" path="test.struts.action"/> - <forward name="failure" path="test.struts.action.fail"/> - </action> - - <!-- Test Struts Forwardintegration --> - <action path="/test/testForward" - type="org.apache.struts.webapp.tiles.test.TestActionTileAction" - forward="test.struts.action"/> - - <!-- Test Struts action and Tiles integration --> - <action path="/test/testActionForwardJsp" - type="org.apache.struts.webapp.tiles.test.TestActionTileAction"> - <forward name="success" path="/test/layout.jsp"/> - <forward name="failure" path="test.struts.action.fail"/> - </action> - - <action path="/test/dispatch" - type="org.apache.struts.tiles.actions.DefinitionDispatcherAction" - parameter="def"> - <forward name="success" path="anything" /> - <forward name="error" path="anything" /> - </action> - <!-- ======================================================= --> <!-- Tutorial Dynamic portal actions --> <!-- ======================================================= --> @@ -237,9 +206,7 @@ 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" /> + <set-property property="moduleAware" value="true" /> </plug-in> </struts-config> 1.2 +9 -6 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- struts-examples-config.xml 19 Jul 2002 10:05:25 -0000 1.1 +++ struts-examples-config.xml 5 Nov 2002 14:18:58 -0000 1.2 @@ -23,15 +23,12 @@ <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> @@ -106,6 +103,14 @@ type="org.apache.struts.webapp.tiles.rssChannel.RssChannelsAction"> </action> + <!-- ======================================================= --> + <!-- Test tabs with an action URL --> + <!-- ======================================================= --> + <action path="/tabs" + type="org.apache.struts.tiles.actions.NoOpAction"> + <forward name="success" path="examples.tabs.page"/> + </action> + </action-mappings> @@ -124,9 +129,7 @@ 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" /> + <set-property property="moduleAware" value="true" /> </plug-in> </struts-config> 1.3 +17 -47 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tiles-defs.xml 15 Aug 2002 09:31:49 -0000 1.2 +++ tiles-defs.xml 5 Nov 2002 14:18:58 -0000 1.3 @@ -61,43 +61,23 @@ <definition name="doc.menu.links" path="/layouts/menu.jsp" > <put name="title" value="Documentation" /> <putList name="items" > - <item value="Home" - link="/index.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Live Examples (new)" - link="/examples/index.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <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" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Tutorial" - link="/doc/tutorial.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Tutorial Live Examples" - link="/tutorial/index.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Download" - link="/doc/download.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Installation" - link="/doc/installation.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="User Guide" - link="/doc/userGuide.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Javadoc" - link="/api/index.html" + <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.struts.tiles.beans.SimpleMenuItem" /> - <item value="Struts Home" - icon="/images/struts-power.gif" - link="http://www.apache.org" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> </putList> </definition> @@ -105,18 +85,10 @@ <definition name="doc.menu.printer.friendly" path="/layouts/menu.jsp" > <put name="title" value="Printer Versions" /> <putList name="items" > - <item value="Quick Overview" - link="/test/testAll.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Tutorial" - link="/doc/tutorialBody.html" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="User Guide" - link="/doc/userGuideBody.html" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Overview (old)" - link="/doc/overviewBody.html" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <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> @@ -124,10 +96,8 @@ <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" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <!-- <item value="Extension Tags (old)" link="/doc/extensionsTags.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> --> + <item value="Tiles Tags" link="/doc/tilesTags.jsp" /> + <!-- <item value="Extension Tags (old)" link="/doc/extensionsTags.jsp" /> --> </putList> </definition> @@ -135,7 +105,7 @@ <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" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <item value="Overview (old)" link="/doc/overview.jsp" /> </putList> </definition> 1.5 +41 -77 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tiles-examples-defs.xml 15 Aug 2002 09:31:49 -0000 1.4 +++ tiles-examples-defs.xml 5 Nov 2002 14:18:58 -0000 1.5 @@ -22,7 +22,9 @@ </definition> <!-- ======================================================= --> - <!-- Menu bar and submenus definitions --> + <!-- Test complex definition construct --> + <!-- These definitions are not intended to be used. they are --> + <!-- there to stretch the digester rules --> <!-- ======================================================= --> <!-- Test nested list --> @@ -31,6 +33,10 @@ <item value="item1" link="/examples/tabs.jsp"/> <item value="item2" link="/examples/tabs.jsp"/> <item value="item3" link="/examples/tabs.jsp"/> + <bean classtype="org.apache.struts.tiles.beans.SimpleMenuItem"> + <set-property property="link" value="aLink1"/> + <set-property property="value" value="aValue1"/> + </bean> <putList name="list" > <item value="nested.item1" link="/examples/tabs.jsp"/> <putList name="list" > @@ -42,6 +48,10 @@ </putList> </definition> + <!-- ======================================================= --> + <!-- Menu bar and submenus definitions --> + <!-- ======================================================= --> + <!-- Menu bar definition --> <!-- Some definition come from other definition files (ex : doc.menu.*) --> <definition name="examples.menu.bar" path="/layouts/vboxLayout.jsp" > @@ -72,7 +82,7 @@ <put name="catalogName" value="examples.portal.menuCatalog"/> <put name="title" value="My Menu" /> <putList name="items" > - <item value="customize" link="/examples/myMenuSettings.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <item value="customize" link="/examples/myMenuSettings.jsp" /> </putList> </definition> @@ -98,21 +108,11 @@ <item value="my Portal" link="/examples/myPortal.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="my Portal Settings" - link="/examples/myPortalSettings.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="my Menu Settings" - link="/examples/myMenuSettings.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Tabs (choosen pages)" - link="/examples/tabs.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Tabs (Summaries)" - link="/examples/summariesTabs.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Rss Channels" - link="/examples/rssChannels.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <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"/> + <item value="Tabs (Summaries)" link="/examples/summariesTabs.jsp" /> + <item value="Rss Channels" link="/examples/rssChannels.jsp"/> </putList> </definition> @@ -120,15 +120,9 @@ <definition name="examples.menu.settings" extends="examples.menu.root" > <put name="title" value="Preferences" /> <putList name="items" > - <item value="my Portal Settings" - link="/examples/myPortalSettings.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="my Menu Settings" - link="/examples/myMenuSettings.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="my Layout Settings" - link="/examples/skinSettings.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <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" /> </putList> </definition> @@ -136,7 +130,7 @@ <definition name="examples.menu.admin" extends="examples.menu.root" > <put name="title" value="Admin" /> <putList name="items" > - <item value="Reload" link="/admin/tiles/reload.do" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <item value="Reload" link="/admin/tiles/reload.do" /> </putList> </definition> @@ -269,26 +263,16 @@ <put name="selectedIndex" value="0" /> <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="Examples Home" - link="/examples/index.jsp" /> - <item value="Tutorial Home" - link="/tutorial/index.jsp" /> - <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" /> - <item value="Stocks" - link="/examples/tiles/portal/stocks.jsp" /> - <item value="WhatsNew" - link="/examples/tiles/portal/whatsNew.jsp" /> + <item value="Doc Home" link="/index.jsp" /> + <item value="Quick overview" link="/doc/quickOverview.jsp" /> + <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="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" /> + <item value="Stocks" link="/examples/tiles/portal/stocks.jsp" /> + <item value="WhatsNew" link="/examples/tiles/portal/whatsNew.jsp" /> </putList> </definition> @@ -307,36 +291,16 @@ <put name="selectedIndex" value="0" /> <put name="parameterName" value="selected" /> <putList name="tabList" > - <item value="Portal" - link="/examples/tiles/portalSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="my Portal" - link="/examples/tiles/myPortalSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Menu" - link="/examples/tiles/menuSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="my Menu" - link="/examples/tiles/myMenuSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Tabs" - link="/examples/tiles/tabsSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Rss Channels" - link="/examples/tiles/rssChannelsSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Admin" - link="/examples/tiles/adminSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="i18n" - link="/examples/tiles/i18nSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Multi Channels" - link="/examples/tiles/multiChannelsSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Components" - link="/examples/tiles/componentsSummary.jsp" - classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <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"/> + <item value="my Menu" link="/examples/tiles/myMenuSummary.jsp" /> + <item value="Tabs" link="/examples/tiles/tabsSummary.jsp" /> + <item value="Rss Channels" link="/examples/tiles/rssChannelsSummary.jsp" /> + <item value="Admin" link="/examples/tiles/adminSummary.jsp" /> + <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" /> </putList> </definition> 1.4 +5 -5 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tiles-tests-defs.xml 15 Aug 2002 09:31:49 -0000 1.3 +++ tiles-tests-defs.xml 5 Nov 2002 14:18:58 -0000 1.4 @@ -15,11 +15,11 @@ <putList 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" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Definition" link="/test/testDefinitions.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Role" link="/test/testRole.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Struts action" link="/test/testStrutsAction.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> - <item value="Controller" link="/test/testController.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" /> + <item value="Ignore attribute" link="/test/testIgnore.jsp" /> + <item value="Definition" link="/test/testDefinitions.jsp" /> + <item value="Role" link="/test/testRole.jsp" /> + <item value="Struts action" link="/test/testStrutsAction.jsp" /> + <item value="Controller" link="/test/testController.jsp" /> </putList> </definition> 1.4 +0 -2 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tiles-tutorial-defs.xml 15 Aug 2002 09:31:49 -0000 1.3 +++ tiles-tutorial-defs.xml 5 Nov 2002 14:18:58 -0000 1.4 @@ -266,6 +266,4 @@ <definition name="dynamic.portal.prefs.body" path="/tutorial/actions/myPortalPrefs.tile.do" extends="dynamic.portal.body" > </definition> - - </tiles-definitions> 1.4 +4 -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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- web.xml 19 Jul 2002 10:05:25 -0000 1.3 +++ web.xml 5 Nov 2002 14:18:58 -0000 1.4 @@ -37,6 +37,10 @@ <param-name>config/examples</param-name> <param-value>/WEB-INF/struts-examples-config.xml</param-value> </init-param> + <init-param> + <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> 1.1 jakarta-struts/web/tiles-documentation/WEB-INF/struts-doc-config.xml Index: struts-doc-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> <!-- ======================================================= --> <!-- Tiles Documentation module --> <!-- ======================================================= --> </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-doc-defs.xml /> <set-property property="moduleAware" value="true" /> </plug-in> </struts-config> 1.1 jakarta-struts/web/tiles-documentation/WEB-INF/struts-tests-config.xml Index: struts-tests-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="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> <!-- ======================================================= --> <!-- Test actions --> <!-- ======================================================= --> <!-- Test Struts action and Tiles integration --> <action path="/testAction" type="org.apache.struts.webapp.tiles.test.TestActionTileAction"> <forward name="success" path="test.struts.action"/> <forward name="failure" path="test.struts.action.fail"/> </action> <!-- Test Struts Forwardintegration --> <action path="/test/testForward" type="org.apache.struts.webapp.tiles.test.TestActionTileAction" forward="test.struts.action"/> <!-- Test Struts action and Tiles integration --> <action path="/testActionForwardJsp" type="org.apache.struts.webapp.tiles.test.TestActionTileAction"> <forward name="success" path="/layout.jsp"/> <forward name="failure" path="test.struts.action.fail"/> </action> <action path="/dispatch" type="org.apache.struts.tiles.actions.DefinitionDispatcherAction" parameter="def"> <forward name="success" path="anything" /> <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> <!-- ========== 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="moduleAware" value="true" /> </plug-in> </struts-config> 1.1 jakarta-struts/web/tiles-documentation/WEB-INF/tiles-doc-defs.xml Index: tiles-doc-defs.xml =================================================================== <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd"> <!-- Definitions for Tiles documentation --> <tiles-definitions> <!-- ======================================================= --> <!-- Master definition --> <!-- ======================================================= --> <!-- Doc index page description --> <definition name="doc.mainLayout" path="/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" /> </definition> <!-- ======================================================= --> <!-- Main page body definitions --> <!-- ======================================================= --> <definition name="doc.portal.body" path="/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" 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" /> </putList> </definition> <!-- Documentation menu definition v1.1--> <definition name="doc.menu.links" 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="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.struts.tiles.beans.SimpleMenuItem" /> </putList> </definition> <!-- Printer friendly menu definition --> <definition name="doc.menu.printer.friendly" path="/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" 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>
-- To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>