vmassol 01/07/28 14:18:46 Modified: cactus/docs/framework/xdocs changes.xml contributors.xml doc-book.xml index.xml site-book.xml Added: cactus/docs/framework/xdocs ide_jbuilder.xml cactus/docs/framework/xdocs/images jb_libraries.gif jb_paths.gif Log: merged changes in branch CACTUS_1x_BRANCH to the main trunk Revision Changes Path 1.31 +6 -0 jakarta-commons/cactus/docs/framework/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/changes.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- changes.xml 2001/07/04 13:34:32 1.30 +++ changes.xml 2001/07/28 21:18:46 1.31 @@ -23,6 +23,12 @@ </devs> <release version="1.2 in CVS"> + <action dev="VMA" type="add"> + New tutorial for integration within JBuilder. Thanks to + <link href="mailto:[EMAIL PROTECTED]">Cedric Chabanois</link> + and <link href="mailto:[EMAIL PROTECTED]">Kunal + Vaishnav</link> for providing this tutorial. + </action> <action dev="VMA" type="fix" due-to="Jari Worsley" due-to-email="[EMAIL PROTECTED]"> Log4j was not initialized on the server side when using JSP Redirector (it was initialized only when using the Servlet Redirector) 1.5 +18 -0 jakarta-commons/cactus/docs/framework/xdocs/contributors.xml Index: contributors.xml =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/contributors.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- contributors.xml 2001/07/01 09:47:25 1.4 +++ contributors.xml 2001/07/28 21:18:46 1.5 @@ -42,6 +42,15 @@ </tr> <tr> <td> + <link href="mailto:[EMAIL PROTECTED]"> + Cedric Chabanois</link> + </td> + <td> + JBuilder4 tutorial + </td> + </tr> + <tr> + <td> <link href="mailto:[EMAIL PROTECTED]"> Bob Davison</link> </td> @@ -92,6 +101,15 @@ <td> Cactus logo (and web site design and graphisms when Cactus was not using Stylebook) + </td> + </tr> + <tr> + <td> + <link href="mailto:[EMAIL PROTECTED]"> + Kunal Vaishnav</link> + </td> + <td> + JBuilder4 tutorial </td> </tr> <tr> 1.16 +1 -0 jakarta-commons/cactus/docs/framework/xdocs/doc-book.xml Index: doc-book.xml =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/doc-book.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- doc-book.xml 2001/07/07 15:52:22 1.15 +++ doc-book.xml 2001/07/28 21:18:46 1.16 @@ -42,6 +42,7 @@ <menu-item label="Ant integration" source="ant.xml"/> <menu-item label="Servlet Engines" source="servlets.xml"/> <menu-item label="VAJava Config" source="ide_vajava.xml"/> + <menu-item label="JBuilder4 Config" source="ide_jbuilder.xml"/> <menu-item type="external" label="API Reference" href="javadoc/index.html"/> </menu> 1.18 +9 -38 jakarta-commons/cactus/docs/framework/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/index.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- index.xml 2001/07/07 15:52:22 1.17 +++ index.xml 2001/07/28 21:18:46 1.18 @@ -47,6 +47,15 @@ <table> <tr> <td> + 14/07/2001 + </td> + <td> + New <link href="ide_jbuilder.html">tutorial</link> for setting up + Cactus inside JBuilder. + </td> + </tr> + <tr> + <td> 07/07/2001 </td> <td> @@ -92,44 +101,6 @@ download</link>. It is a bug fix release with a few new features. Check the <link href="changes.html">changes </link> page for a list of changes. - </td> - </tr> - <tr> - <td> - 14/06/2001 - </td> - <td> - <link href="logos.html">New logos for Cactus</link> proposed ! - </td> - </tr> - <tr> - <td> - 14/06/2001 - </td> - <td> - New page containing <link href="resources.html">resources on - testing</link>. - </td> - </tr> - <tr> - <td> - 18/05/2001 - </td> - <td> - New page containing proposition of <link href="logos.html">logos - for Cactus</link>. Thanks to Victor Gritsenko for the first logo - proposition ! Who can beat that logo ! - </td> - </tr> - <tr> - <td> - 12/05/2001 - </td> - <td> - New page on - <link href="mockobjects.html">Mock Objects vs In-container</link> - unit testing strategies. Explains principles and details pros and - cons of each. </td> </tr> </table> 1.15 +1 -0 jakarta-commons/cactus/docs/framework/xdocs/site-book.xml Index: site-book.xml =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/site-book.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- site-book.xml 2001/07/07 15:52:22 1.14 +++ site-book.xml 2001/07/28 21:18:46 1.15 @@ -42,6 +42,7 @@ <menu-item label="Ant integration" source="ant.xml"/> <menu-item label="Servlet Engines" source="servlets.xml"/> <menu-item label="VAJava Config" source="ide_vajava.xml"/> + <menu-item label="JBuilder4 Config" source="ide_jbuilder.xml"/> <menu-item label="API Reference" source="javadoc.xml"/> </menu> 1.2 +197 -0 jakarta-commons/cactus/docs/framework/xdocs/ide_jbuilder.xml 1.2 +146 -0 jakarta-commons/cactus/docs/framework/xdocs/images/jb_libraries.gif <<Binary file>> 1.2 +119 -0 jakarta-commons/cactus/docs/framework/xdocs/images/jb_paths.gif <<Binary file>>