You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/01/03 14:41:04 UTC

cvs commit: jakarta-cactus/documentation/docs/skins/jakarta.apache.org loader.xml

vmassol     2003/01/03 05:41:04

  Modified:    documentation/docs/xdocs howto_testcase_jsp.xml coverage.xml
                        logos.xml contributing.xml license.xml
                        howto_sample.xml coverage_12.xml howto_tomcat.xml
                        howto_httpunit.xml release_checklist.xml
                        webalizer.xml build_result.xml howto_ant.xml
                        resources.xml howto_testcase_servlet.xml
                        howto_ejb_j2eeri.xml javadoc.xml downloads.xml
                        how_it_works_uml.xml howto_runner.xml
                        howto_testcase.xml cactusname.xml javadoc_12.xml
                        index.xml howto_ide_jbuilder5.xml
                        howto_ide_vajava_wte.xml users.xml
                        howto_ant_primer.xml howto_junitee.xml
                        contributors.xml faq.xml news.xml features.xml
                        howto_migration.xml howto_jsp.xml howto_build.xml
                        goals.xml book.xml changes.xml
                        howto_testcase_filter.xml howto_security.xml
                        getting_started.xml how_it_works.xml howto_ejb.xml
                        javadoc_13.xml howto_ide_vajava_tomcat.xml
                        howto_config.xml howto_ide.xml
                        howto_ide_jbuilder4.xml coverage_empty.xml
                        howto_classpath.xml todo.xml mockobjects.xml
                        testedon.xml mailinglist.xml coverage_13.xml
                        coding_conventions.xml howto_ant_install.xml
                        howto_ant_cactus.xml
               documentation build.properties.sample build.xml
               documentation/docs/skins/jakarta.apache.org/stylesheets
                        document2html.xsl
               .        build.xml build.properties.sample gump.xml
  Removed:     documentation/docs/xdocs/dtd characters.ent document-v10.dtd
                        changes-v10.dtd todo-v10.dtd
               documentation/docs/skins/jakarta.apache.org/stylesheets
                        changes2document.xsl todo2document.xsl copyover.xsl
                        book2project.xsl roadmap2document.xsl
               documentation/docs/skins/jakarta.apache.org loader.xml
  Log:
  Replaced Stylebook by straight XSL
  
  Revision  Changes    Path
  1.3       +5 -5      jakarta-cactus/documentation/docs/xdocs/howto_testcase_jsp.xml
  
  Index: howto_testcase_jsp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_testcase_jsp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_testcase_jsp.xml	26 Dec 2002 15:10:19 -0000	1.2
  +++ howto_testcase_jsp.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>JspTestCase Principles</title>
       <authors>
  -      <person name="Nicholas Lesiecki" email="ndlesiecki@yahoo.com"/>
  +      <author name="Nicholas Lesiecki" email="ndlesiecki@yahoo.com"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/coverage.xml
  
  Index: coverage.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/coverage.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage.xml	9 Jun 2002 18:28:06 -0000	1.1
  +++ coverage.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Test Coverage</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.6       +4 -7      jakarta-cactus/documentation/docs/xdocs/logos.xml
  
  Index: logos.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/logos.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- logos.xml	26 Apr 2002 21:02:40 -0000	1.5
  +++ logos.xml	3 Jan 2003 13:41:01 -0000	1.6
  @@ -1,16 +1,13 @@
   <?xml version="1.0"?>
   
  -<!--
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  --->
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Logos for Cactus</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/contributing.xml
  
  Index: contributing.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/contributing.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- contributing.xml	9 Sep 2002 20:28:27 -0000	1.2
  +++ contributing.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Making a Contribution to Cactus</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +7 -8      jakarta-cactus/documentation/docs/xdocs/license.xml
  
  Index: license.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/license.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- license.xml	10 Mar 2002 14:10:25 -0000	1.1
  +++ license.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  - <header>
  -  <title>Cactus Public License</title>
  -  <authors>
  -   <person name="Vincent Massol" email="vmassol@apache.org"/>
  -  </authors>
  - </header>
  +
  +  <properties>
  +    <title>Cactus Public License</title>
  +    <authors>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
  +    </authors>
  +  </properties>
   
     <body>
     
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_sample.xml
  
  Index: howto_sample.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_sample.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_sample.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_sample.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Sample Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/coverage_12.xml
  
  Index: coverage_12.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/coverage_12.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage_12.xml	9 Jun 2002 18:28:06 -0000	1.1
  +++ coverage_12.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Test Coverage</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.6       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_tomcat.xml
  
  Index: howto_tomcat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_tomcat.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- howto_tomcat.xml	27 Jul 2002 21:21:26 -0000	1.5
  +++ howto_tomcat.xml	3 Jan 2003 13:41:01 -0000	1.6
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Tomcat Quickstart</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_httpunit.xml
  
  Index: howto_httpunit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_httpunit.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_httpunit.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_httpunit.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>HttpUnit Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.9       +4 -5      jakarta-cactus/documentation/docs/xdocs/release_checklist.xml
  
  Index: release_checklist.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/release_checklist.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- release_checklist.xml	28 Jul 2002 23:24:34 -0000	1.8
  +++ release_checklist.xml	3 Jan 2003 13:41:01 -0000	1.9
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Release Checklist</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/webalizer.xml
  
  Index: webalizer.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/webalizer.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- webalizer.xml	10 Mar 2002 14:10:25 -0000	1.1
  +++ webalizer.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Webalizer</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/build_result.xml
  
  Index: build_result.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/build_result.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build_result.xml	23 Nov 2002 12:13:30 -0000	1.3
  +++ build_result.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Nightly Build Results</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_ant.xml
  
  Index: howto_ant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ant.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant.xml	27 Jul 2002 21:20:16 -0000	1.2
  +++ howto_ant.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Ant Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.13      +5 -6      jakarta-cactus/documentation/docs/xdocs/resources.xml
  
  Index: resources.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/resources.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- resources.xml	15 Dec 2002 21:26:55 -0000	1.12
  +++ resources.xml	3 Jan 2003 13:41:01 -0000	1.13
  @@ -1,15 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Resources</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  -      <person name="Nicholas Lesiecki" email="ndlesiecki@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Nicholas Lesiecki" email="ndlesiecki@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_testcase_servlet.xml
  
  Index: howto_testcase_servlet.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_testcase_servlet.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_testcase_servlet.xml	27 Jul 2002 21:21:20 -0000	1.3
  +++ howto_testcase_servlet.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>ServletTestCase Principles</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +5 -6      jakarta-cactus/documentation/docs/xdocs/howto_ejb_j2eeri.xml
  
  Index: howto_ejb_j2eeri.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ejb_j2eeri.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_ejb_j2eeri.xml	10 Mar 2002 14:10:25 -0000	1.1
  +++ howto_ejb_j2eeri.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,15 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>EJB Testing with J2EE RI</title>
       <authors>
  -      <person name="Hudson Wong" email="hudsoncwwong@yahoo.com"/>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Hudson Wong" email="hudsoncwwong@yahoo.com"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/javadoc.xml
  
  Index: javadoc.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/javadoc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- javadoc.xml	9 Jun 2002 18:28:06 -0000	1.2
  +++ javadoc.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>API Reference</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.5       +4 -5      jakarta-cactus/documentation/docs/xdocs/downloads.xml
  
  Index: downloads.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/downloads.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- downloads.xml	26 Dec 2002 13:47:40 -0000	1.4
  +++ downloads.xml	3 Jan 2003 13:41:01 -0000	1.5
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Downloads</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/how_it_works_uml.xml
  
  Index: how_it_works_uml.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/how_it_works_uml.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- how_it_works_uml.xml	14 Apr 2002 21:51:47 -0000	1.1
  +++ how_it_works_uml.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Cactus UML Sequence Diagram</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.7       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_runner.xml
  
  Index: howto_runner.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_runner.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto_runner.xml	1 Jan 2003 20:00:42 -0000	1.6
  +++ howto_runner.xml	3 Jan 2003 13:41:01 -0000	1.7
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>TestRunner Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.5       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_testcase.xml
  
  Index: howto_testcase.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_testcase.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- howto_testcase.xml	25 Aug 2002 13:37:30 -0000	1.4
  +++ howto_testcase.xml	3 Jan 2003 13:41:01 -0000	1.5
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Writing Cactus TestCase</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +5 -6      jakarta-cactus/documentation/docs/xdocs/cactusname.xml
  
  Index: cactusname.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/cactusname.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cactusname.xml	10 Mar 2002 14:10:25 -0000	1.1
  +++ cactusname.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Why the name ?</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  @@ -52,7 +51,7 @@
             find a name which had something to do with the Apache name. We thought
             of indians of course ... we tried several names and then Dominique
             said "Cactus" (you know, indians, the desert, cacti. That's one
  -          clich&eacute; of indians we have here in France !). I immediatly liked
  +          cliche; of indians we have here in France !). I immediatly liked
             it ...
           </li>
           <li>
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/javadoc_12.xml
  
  Index: javadoc_12.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/javadoc_12.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- javadoc_12.xml	9 Jun 2002 18:28:06 -0000	1.1
  +++ javadoc_12.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>API Reference</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +19 -21    jakarta-cactus/documentation/docs/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	14 Apr 2002 21:51:47 -0000	1.2
  +++ index.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,19 +1,17 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Jakarta Cactus</title>
  -    <subtitle>Server-Side Unit Testing Framework</subtitle>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  -    <s1 title="Project description">
  +    <section name="Project description">
         <p>
           Cactus is a simple test framework for unit testing server-side java
           code (Servlets, EJBs, Tag Libs, Filters, ...).
  @@ -21,30 +19,30 @@
         <p>
           The intent of Cactus is to lower the cost of writing tests for
           server-side code. It
  -        uses <link href="http://junit.org">JUnit</link> and extends it.
  +        uses <a href="http://junit.org">JUnit</a> and extends it.
         </p>
         <p>
           Cactus has been developed with the idea of automatic testing in mind
           and it provides a packaged and simple
  -        mechanism based on <link href="http://jakarta.apache.org/ant">Ant</link>
  +        mechanism based on <a href="http://jakarta.apache.org/ant">Ant</a>
           to automate server-side testing.
         </p>
         <p>
           Cactus implements an in-container strategy (click on the diagram below
           to understand how it works). An alternative but complementary approach
           not covered by Cactus is to use Mock Objects (see the
  -        <link href="mockobjects.html">Mock vs Container</link> page to
  +        <a href="mockobjects.html">Mock vs Container</a> page to
           understand the differences and why Cactus believes in the
           usefulness of an in-container approach).
         </p>
         <p>
  -        <link href="how_it_works.html">
  -        <figure src="images/archiani.gif" alt="How it works ..."/></link>
  +        <a href="how_it_works.html">
  +        <figure src="images/archiani.gif" alt="How it works ..."/></a>
         </p>
  -    </s1>
  +    </section>
   
       <anchor id="unittest_types"/>
  -    <s1 title="Different kinds of unit tests">
  +    <section name="Different kinds of unit tests">
   
         <p>
           There are several kinds of unit testing frameworks. We categorize them
  @@ -54,7 +52,7 @@
           <li>
             <strong>Type 1 : code logic unit testing</strong>. Probably the
             best strategy for these tests is to use a
  -          <link href="http://www.mockobjects.com">Mock Objects</link> type
  +          <a href="http://www.mockobjects.com">Mock Objects</a> type
             framework.
           </li>
           <li>
  @@ -67,8 +65,8 @@
             <strong>Type 3 : functional unit testing</strong>. These unit tests
             will let you test the returned values from your server code. This is
             for example
  -          <link href="http://sourceforge.net/projects/httpunit">HttpUnit
  -          </link> (Note that HttpUnit also performs standard functional testing
  +          <a href="http://sourceforge.net/projects/httpunit">HttpUnit
  +          </a> (Note that HttpUnit also performs standard functional testing
             - as opposed to functional unit testing -, which let you test full
             use cases - a login use case for example, which is comprised of
             several requests/responses).
  @@ -89,16 +87,16 @@
           Type 2 if you wish.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Getting Started">
  +    <section name="Getting Started">
   
         <p>
           To get started, read the
  -        <link href="getting_started.html">Getting Started</link> guide.
  +        <a href="getting_started.html">Getting Started</a> guide.
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +5 -6      jakarta-cactus/documentation/docs/xdocs/howto_ide_jbuilder5.xml
  
  Index: howto_ide_jbuilder5.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ide_jbuilder5.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide_jbuilder5.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_ide_jbuilder5.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,15 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>JBuilder 5 Integration</title>
       <authors>
  -      <person name="Sean Zhang" email="sean.zhang@verizon.com"/>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Sean Zhang" email="sean.zhang@verizon.com"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_ide_vajava_wte.xml
  
  Index: howto_ide_vajava_wte.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ide_vajava_wte.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_ide_vajava_wte.xml	23 Apr 2002 07:33:27 -0000	1.3
  +++ howto_ide_vajava_wte.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>VAJava and WebSphere Test Environment</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/users.xml
  
  Index: users.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/users.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- users.xml	20 Apr 2002 13:03:56 -0000	1.1
  +++ users.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Who is using Cactus ?</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +5 -64     jakarta-cactus/documentation/docs/xdocs/howto_ant_primer.xml
  
  Index: howto_ant_primer.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ant_primer.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant_primer.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_ant_primer.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,16 +1,13 @@
   <?xml version="1.0"?>
   
  -<!--
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  --->
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Ant Integration</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  @@ -198,14 +195,6 @@
           </table>
   
           <note>
  -          In the sample application provided with Cactus, we don't generate
  -          any web site documentation (only javadoc) so we're not using the
  -          stylebook-related directories and Ant targets. However we do so in
  -          Cactus itself, so if you need to take a look, download the Cactus
  -          sources.
  -        </note>
  -
  -        <note>
             An <code>out</code> directory will be created by the Ant build. All
             build-generated files will be put in that directory (compiled classes,
             generated javadoc documentation, test configuration files for running
  @@ -827,11 +816,10 @@
           <p>
             Generate the project's documentation. It includes the javadoc,
             additional README files (if any) and the documentation web site
  -          (built using Stylebook for example, as shown in the example below).
           </p>
   
           <p>
  -          Example not using Stylebook :
  +          Example:
           </p>
   
   <source><![CDATA[
  @@ -852,53 +840,6 @@
   
           <!-- Create the zipped documentation -->
           <zip zipfile="${final.doc.name}" basedir="${out.doc.dir}"/>
  -
  -    </target>
  -]]></source>
  -
  -        <p>
  -          Example using Stylebook (from the Cactus build file itself) :
  -        </p>
  -
  -<source><![CDATA[
  -    <!--
  -       ========================================================================
  -         Generate the full documentation for a given Servlet API, i.e.
  -         web site + javadoc
  -       ========================================================================
  -    -->
  -    <!-- Preparation target for the doc target -->
  -    <target name="prepare-doc" depends="javadoc">
  -
  -        <mkdir dir="${out.doc.dir}"/>
  -        <mkdir dir="${out.doc.dir}/images"/>
  -
  -        <!-- Copy doc-book.xml to book.xml for defining the documentation web
  -             site and replacing token filters (year) -->
  -        <delete file="${xdoc.dir}/book.xml"/>
  -        <copy file="${xdoc.dir}/doc-book.xml" tofile="${xdoc.dir}/book.xml"
  -            filtering="on"/>
  -
  -        <!-- Copy the images -->
  -        <copy todir="${out.site.dir}/images">
  -            <fileset dir="${xdoc.dir}/images"/>
  -        </copy>
  -
  -    </target>
  -
  -    <!-- Generate the documentation -->
  -    <target name="doc" depends="prepare-doc">
  -
  -        <!-- Generate the documentation web site -->
  -        <stylebook book="${xdoc.dir}/book.xml"
  -            skinDirectory="${skin.dir}/jakarta.apache.org"
  -            targetDirectory="${out.doc.dir}">
  -
  -            <classpath>
  -                <pathelement path="${java.class.path}"/>
  -            </classpath>
  -
  -        </stylebook>
   
       </target>
   ]]></source>
  
  
  
  1.4       +5 -6      jakarta-cactus/documentation/docs/xdocs/howto_junitee.xml
  
  Index: howto_junitee.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_junitee.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_junitee.xml	13 May 2002 21:40:43 -0000	1.3
  +++ howto_junitee.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,15 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>JUnitEE Howto</title>
       <authors>
  -      <person name="Kaarle Kaila" email="kaarle.kaila@iki.fi"/>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Kaarle Kaila" email="kaarle.kaila@iki.fi"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.12      +5 -6      jakarta-cactus/documentation/docs/xdocs/contributors.xml
  
  Index: contributors.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/contributors.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- contributors.xml	26 Dec 2002 12:53:31 -0000	1.11
  +++ contributors.xml	3 Jan 2003 13:41:01 -0000	1.12
  @@ -1,15 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Contributors</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  -			<person name="Nicholas Lesiecki" email="ndlesiecki@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Nicholas Lesiecki" email="ndlesiecki@apache.org"/>
       </authors>
  -   </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.8       +4 -5      jakarta-cactus/documentation/docs/xdocs/faq.xml
  
  Index: faq.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/faq.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- faq.xml	25 Aug 2002 13:34:39 -0000	1.7
  +++ faq.xml	3 Jan 2003 13:41:01 -0000	1.8
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>FAQ</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.20      +5 -7      jakarta-cactus/documentation/docs/xdocs/news.xml
  
  Index: news.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/news.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- news.xml	1 Dec 2002 20:51:56 -0000	1.19
  +++ news.xml	3 Jan 2003 13:41:01 -0000	1.20
  @@ -1,15 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  -    <title>Jakarta Cactus</title>
  -    <subtitle>Cactus News</subtitle>
  +
  +  <properties>
  +    <title>Cactus News</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.8       +4 -5      jakarta-cactus/documentation/docs/xdocs/features.xml
  
  Index: features.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/features.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- features.xml	17 Sep 2002 20:08:05 -0000	1.7
  +++ features.xml	3 Jan 2003 13:41:01 -0000	1.8
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Features</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -   </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_migration.xml
  
  Index: howto_migration.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_migration.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_migration.xml	27 Jul 2002 21:29:07 -0000	1.3
  +++ howto_migration.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Migration Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_jsp.xml
  
  Index: howto_jsp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_jsp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_jsp.xml	25 Aug 2002 13:37:30 -0000	1.2
  +++ howto_jsp.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Testing JSP with Cactus</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -16     jakarta-cactus/documentation/docs/xdocs/howto_build.xml
  
  Index: howto_build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_build.xml	26 Dec 2002 14:50:39 -0000	1.3
  +++ howto_build.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Building Cactus from the Source</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  @@ -120,17 +119,6 @@
               <td>
                 The AspectJ Ant tasks.
                 Availabe <link href="http://aspectj.org/">here</link>.
  -            </td>
  -          </tr>
  -          <tr>
  -            <td>stylebook.jar</td>
  -            <td>1.0</td>
  -            <td>
  -              XML Stylebook (only for documentation).
  -              Unfortunately, there is no real standalone distribution of the 
  -              Stylebook library. It can be found, for example, in the
  -              XercesJ tools distributions (available 
  -              <link href="http://xml.apache.org/dist/xerces-j/">here</link>).
               </td>
             </tr>
           </table>
  
  
  
  1.5       +4 -5      jakarta-cactus/documentation/docs/xdocs/goals.xml
  
  Index: goals.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/goals.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- goals.xml	9 Sep 2002 20:28:57 -0000	1.4
  +++ goals.xml	3 Jan 2003 13:41:01 -0000	1.5
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Cactus goals</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.22      +2 -2      jakarta-cactus/documentation/docs/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/book.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- book.xml	15 Dec 2002 18:26:34 -0000	1.21
  +++ book.xml	3 Jan 2003 13:41:01 -0000	1.22
  @@ -10,10 +10,10 @@
     <menu label="About">
       <menu-item label="What is Cactus ?" source="index.xml"/>
       <menu-item label="News" source="news.xml"/>
  -    <menu-item type="changes" label="Changes" source="changes.xml"/>
  +    <menu-item label="Changes" source="changes.xml"/>
       <menu-item label="Features/Status" source="features.xml"/>
       <menu-item label="Goals" source="goals.xml"/>
  -    <menu-item type="roadmap" label="Roadmap/Todo" source="todo.xml"/>
  +    <menu-item label="Roadmap/Todo" source="todo.xml"/>
       <menu-item label="Contributors" source="contributors.xml"/>
       <menu-item label="Contributing" source="contributing.xml"/>
       <menu-item label="Cactus Users" source="users.xml"/>
  
  
  
  1.67      +183 -230  jakarta-cactus/documentation/docs/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- changes.xml	3 Jan 2003 10:24:23 -0000	1.66
  +++ changes.xml	3 Jan 2003 13:41:01 -0000	1.67
  @@ -1,235 +1,186 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE changes SYSTEM "./dtd/changes-v10.dtd">
  +<document>
   
  -<changes title="Changes">
  -
  -  <s1 title="Summary of changes">
  -    <ul>
  -      <li>
  -        <link href="news.html">News and Events</link>
  -      </li>
  -      <li>
  -        <jump anchor="website_changes">Last 15 days web site changes</jump>
  -      </li>
  -      <li>
  -        <jump anchor="release_changes">Release changes</jump>
  -      </li>
  -    </ul>
  -  </s1>
  -  
  -  <anchor id="eclipse-plugin_changes" />
  -  <releases title="Eclipse plugin changes">
  -  	<devs>
  -  		<person name="Vincent Massol" email="vmassol@apache.org" id="VMA" />
  -  		<person name="Julien Ruaux" email="jruaux@octo.com" id="JRU" />
  -  	</devs>
  -  	<release version="Milestone 1" date="- in CVS">
  -  		<action dev="JRU" type="add">
  -  		  a minimalistic launch configuration
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  		  a minimalistic launch shortcut
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  		  a minimalistic launch configuration tab group
  -  		</action>
  -  	</release>
  -  	<release version="Milestone 2" date="- in CVS">
  -  		<action dev="JRU" type="add">
  -  			Validate calling Ant script before and after running the
  -  			tests to package and deploy the application to the container and
  -  			start it.
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  			Execute the Cactus Ant script for Tomcat before starting
  -  			the JUnit Test Runner (and after). This Ant script needs to be
  -  			part of the Cactus plugin and does the following: creates a WAR
  -  			from the application sources and start Tomcat. After the test is
  -  			finished a second script is run to stop Tomcat.
  -  		</action>
  -  	</release>
  -  	<release version="Milestone 3" date="- in CVS">
  -  		<action dev="JRU" type="add">
  -  		  Added a Cactus preference page (see below for content)
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  		  Support for several containers
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  			On preference page and on Cactus TabGroup page: ability to
  -  			choose the port on which the container is started.
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  			On preference page, ability to specify the working directory
  -  			where the Cactus plugin will create all its files (packaged war,
  -  			app server config files, etc)
  -  		</action>
  -  		<action dev="JRU" type="add">
  -  		  Minimal plugin documentation
  -  		</action>
  -  	</release>
  -  </releases>
  -  	<!-- ================================================================= -->
  -  <!-- Last 15 days web site changes -->
  -  <!-- ================================================================= -->
  -
  -  <anchor id="website_changes"/>
  -  <cvslogs title="Last 15 days web site changes">
  -
  -    <p>
  -      These are the changes that happened to the Cactus web site for the past
  -      15 days since the last site update (excluding the todo and changes pages
  -      which are modified too often) :
  -    </p>
  -
  -    &cvslog;
  -
  -  </cvslogs>
  -
  -  <!-- ================================================================= -->
  -  <!-- Release changes -->
  -  <!-- ================================================================= -->
  -
  -  <anchor id="release_changes"/>
  -  <releases title="Release changes">
  -
  -    <devs>
  -      <person name="Vincent Massol" email="vmassol@apache.org" id="VMA"/>
  -      <person name="Nicholas Lesiecki" email="ndlesiecki@yahoo.com" id="NDL"/>
  -      <person name="Christopher Lenz" email="cmlenz@gmx.de" id="CML"/>
  -    </devs>
  -
  -    <release version="1.5" date="- in CVS">
  -      <action dev="CML" type="update">
  -        Cactus now uses the <code>HttpURLConnection</code> adapter from the 
  -        Commons-HttpClient code base. The version in the Cactus 
  -        <code>util</code> package has been deprecated.
  -      </action>
  -      <action dev="CML" type="update">
  -        Added stack trace filtering to the ServletTestRunner. Stack frames
  -        in the JUnit framework classes as well as in the Cactus base test case
  -        classes are filtered out.
  -      </action>
  -      <action dev="VMA" type="add">
  -        The Cactus web site now provides online documentation for both the
  -        CVS HEAD version and the last released version.
  -      </action>
  -      <action dev="CML" type="fix">
  -        Enable the <code>ServletTestRunner</code> to run in an environment where
  -        it is not allowed to set system properties. In such cases, the
  -        <code>cactus.properties</code> configuration file needs to be on the 
  -        server classpath.
  -      </action>
  -      <action dev="CML" type="update">
  -        Implemented server-side XSLT transformations in the
  -        <code>ServletTestRunner</code>. The code is based on the TraX API but
  -        uses reflection to avoid a direct runtime dependancy.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added automated Ant scripts for JBoss/Jetty 3.x.
  -      </action>
  -      <action dev="VMA" type="add" due-to="Christopher Lenz" due-to-email="cmlenz@gmx.de">
  -        Added new extension class to help unit test JSP Taglibs. See the
  -        <code>TestJspTagLifecycle</code> test class in the sample-servlet
  -        application for help on using it.
  -      </action>
  -      <action dev="VMA" type="update">
  -        Improved error handling when dealing with invalid Cookies.
  -      </action>
  -      <action dev="VMA" type="fix" due-to="Roumen B. Antonov" due-to-email="rantonov@fourthgen.com">
  -        Fixed a potential bug with classloaders. On the server side, Cactus 
  -        looks for the TestCase class by searching first the WebApp Classloader
  -        and then the Context ClassLoader. However, the Context ClassLoader is 
  -        only searched if an Exception (subclass of <code>Exception</code>) is 
  -        raised. Thus, if a <code>NoClassDefFoundError</code> had been raised, 
  -        Cactus would not have searched in the Context ClassLoader.
  -      </action>
  -      <action dev="VMA" type="update">
  -        Updated to the latest <code>junit-noframes.xsl</code> from Ant.
  -      </action>
  -      <action dev="VMA" type="add" due-to="Atsushi Hasegawa" due-to-email="ahasegawa@borland.com">
  -        Added support for internationalisation (double byte characters) for 
  -        sending back test results. This allows Cactus to be used with any
  -        character set.
  -      </action>
  -      <action dev="VMA" type="fix" due-to="Pranab Dhar" due-to-email="Pranab.Dhar@dfa.state.ny.us">
  -        Fixed bug where a redirector overriden by calling 
  -        <code>WebRequest.setRedirectorName()</code> was not used to fetch the
  -        Cactus test result (the default redirector specified in the Cactus
  -        configuration was used instead).
  -      </action>
  -      <action dev="VMA" type="fix" due-to="Stephan Merker" due-to-email="Stephan.Merker@cegedim.fr">
  -        Fixed bug where Cactus was using the deprecated HttpClient 
  -        <code>PostMethod.setRequestBody(String)</code> which had some bug 
  -        related to char to byte encoding. Now using the
  -        <code>PostMethod.setRequestBody(InputStream)</code> signature.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added links to Japanese and Korean translations of Cactus.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Ability to get a real HTTP Session cookie before the start of the 
  -        test. This is achieved by calling the new
  -        <code>WebRequest.getSessionCookie()</code> method which returns
  -        a <code>HttpSessionCookie</code> object that you then add to the
  -        HTTP request. Initially suggested by
  -        <link href="mailto:kyle.w.willkomm@accenture.com">Kyle W.
  -        Willkomm</link>.
  -      </action>
  -      <action dev="VMA" type="add">
  -        New <code>WebResponse.getCookieIgnoreCase(cookieName)</code> to get
  -        the first cookie matching <code>cookieName</code> whatever the case
  -        (case-insensitive).
  -      </action>
  -      <action dev="VMA" type="add" due-to="Jason Robertson" due-to-email="Jason.Robertson@acs-inc.com">
  -        Added Form-based authentication support (Submitted by Jason Robertson).
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added a <link href="howto_build.html">tutorial</link> that explains how
  -        to build Cactus from the sources.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added a Jetty Sample application to demonstrate how to use the new
  -        Jetty initializer.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added a Jetty initializer. This is the first implementation of the 
  -        new initializer feature. This initializer starts Jetty before Cactus 
  -        tests are run. This is really nice to quickly run tests inside any 
  -        IDE or even from a simple <code>&lt;junit&gt;</code> Ant taks without 
  -        the need to package and deploy a WAR. In addition, it is real nice to 
  -        debug tests this way. Moreover, Jetty starts in less than 1 second, 
  -        making it completely seamless and transparent! We are now at the same 
  -        order of magnitude as pure JUnit tests in term of speed ... :-). Of 
  -        course, this is only for Servlet tests ... I am still waiting for an
  -        embeddable EJB container that starts in less than 1 second ...
  -      </action>
  -      <action dev="VMA" type="add">
  -		Added notion of Initializer. This is an optional class that you can 
  -		specify in <code>cactus.properties</code> or as a System property (
  -		the property name is <code>cactus.initializer</code>). It will be run
  -		once per JVM only. The initializer class must implement the
  -		<code>org.apache.cactus.util.Initializable</code> interface.
  -      </action>
  -      <action dev="VMA" type="update">
  -        Update of jars bundled in the Cactus distribution: Commons Logging
  -        1.0.1, Log4j 1.2.6, HttpClient 2.0alpha1 built on 29/08/2002,
  -        HttpUnit 1.4.5 and JUnit 3.8.1.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added support for client side <code>begin(...)</code>
  -        and <code>end(...)</code> methods. They are called on the
  -        client side, before and after every test in the same way as the
  -        JUnit <code>setUp()</code> and <code>tearDown()</code> are called
  -        before and after each test, but on the server side. <em>Note: web site
  -        documentation is not yet up to date</em>.
  -      </action>
  -      <action dev="VMA" type="add">
  -        Added a new <code>CheckPropertiesTask</code> Ant task to check
  -        properties in build files.
  -      </action>
  -    </release>
  +  <properties>
  +    <title>Changes</title>
  +    <authors>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
  +    </authors>
  +  </properties>
  +
  +  <body>
  +
  +    <s1 title="Summary of changes">
  +      <ul>
  +        <li>
  +          <link href="news.html">News and Events</link>
  +        </li>
  +        <li>
  +          <jump anchor="website_changes">Last 15 days web site changes</jump>
  +        </li>
  +        <li>
  +          <jump anchor="release_changes">Release changes</jump>
  +        </li>
  +      </ul>
  +    </s1>
  +
  +    <!-- ================================================================= -->
  +    <!-- Last 15 days web site changes -->
  +    <!-- ================================================================= -->
  +
  +    <anchor id="website_changes"/>
  +    <cvslogs title="Last 15 days web site changes">
  +
  +      <p>
  +        These are the changes that happened to the Cactus web site for the past
  +        15 days since the last site update (excluding the todo and changes 
  +        pages which are modified too often) :
  +      </p>
  +
  +      <!-- Note: The XSL stylesheet will include the CVS changelog here -->
  +      
  +    </cvslogs>
  +
  +    <!-- ================================================================= -->
  +    <!-- Release changes -->
  +    <!-- ================================================================= -->
  +
  +    <anchor id="release_changes"/>
  +    <releases title="Release changes">
  +
  +      <devs>
  +        <person name="Vincent Massol" email="vmassol@apache.org" id="VMA"/>
  +        <person name="Nicholas Lesiecki" email="ndlesiecki@yahoo.com" id="NDL"/>
  +        <person name="Christopher Lenz" email="cmlenz@gmx.de" id="CML"/>
  +      </devs>
  +
  +      <release version="1.5" date="- in CVS">
  +        <action dev="CML" type="update">
  +          Added stack trace filtering to the ServletTestRunner. Stack frames
  +          in the JUnit framework classes as well as in the Cactus base test 
  +          case classes are filtered out.
  +        </action>
  +        <action dev="VMA" type="add">
  +          The Cactus web site now provides online documentation for both the
  +          CVS HEAD version and the last released version.
  +        </action>
  +        <action dev="CML" type="fix">
  +          Enable the <code>ServletTestRunner</code> to run in an environment 
  +          where it is not allowed to set system properties. In such cases, the
  +          <code>cactus.properties</code> configuration file needs to be on the 
  +          server classpath.
  +        </action>
  +        <action dev="CML" type="update">
  +          Implemented server-side XSLT transformations in the
  +          <code>ServletTestRunner</code>. The code is based on the TraX API but
  +          uses reflection to avoid a direct runtime dependancy.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added automated Ant scripts for JBoss/Jetty 3.x.
  +        </action>
  +        <action dev="VMA" type="add" due-to="Christopher Lenz" due-to-email="cmlenz@gmx.de">
  +          Added new extension class to help unit test JSP Taglibs. See the
  +          <code>TestJspTagLifecycle</code> test class in the sample-servlet
  +          application for help on using it.
  +        </action>
  +        <action dev="VMA" type="update">
  +          Improved error handling when dealing with invalid Cookies.
  +        </action>
  +        <action dev="VMA" type="fix" due-to="Roumen B. Antonov" due-to-email="rantonov@fourthgen.com">
  +          Fixed a potential bug with classloaders. On the server side, Cactus 
  +          looks for the TestCase class by searching first the WebApp 
  +          Classloader and then the Context ClassLoader. However, the Context 
  +          ClassLoader is only searched if an Exception (subclass of 
  +          <code>Exception</code>) is raised. Thus, if a 
  +          <code>NoClassDefFoundError</code> had been raised, Cactus would 
  +          not have searched in the Context ClassLoader.
  +        </action>
  +        <action dev="VMA" type="update">
  +          Updated to the latest <code>junit-noframes.xsl</code> from Ant.
  +        </action>
  +        <action dev="VMA" type="add" due-to="Atsushi Hasegawa" due-to-email="ahasegawa@borland.com">
  +          Added support for internationalisation (double byte characters) for 
  +          sending back test results. This allows Cactus to be used with any
  +          character set.
  +        </action>
  +        <action dev="VMA" type="fix" due-to="Pranab Dhar" due-to-email="Pranab.Dhar@dfa.state.ny.us">
  +          Fixed bug where a redirector overriden by calling 
  +          <code>WebRequest.setRedirectorName()</code> was not used to fetch the
  +          Cactus test result (the default redirector specified in the Cactus
  +          configuration was used instead).
  +        </action>
  +        <action dev="VMA" type="fix" due-to="Stephan Merker" due-to-email="Stephan.Merker@cegedim.fr">
  +          Fixed bug where Cactus was using the deprecated HttpClient 
  +          <code>PostMethod.setRequestBody(String)</code> which had some bug
  +          related to char to byte encoding. Now using the
  +          <code>PostMethod.setRequestBody(InputStream)</code> signature.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added links to Japanese and Korean translations of Cactus.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Ability to get a real HTTP Session cookie before the start of the 
  +          test. This is achieved by calling the new
  +          <code>WebRequest.getSessionCookie()</code> method which returns
  +          a <code>HttpSessionCookie</code> object that you then add to the
  +          HTTP request. Initially suggested by
  +          <link href="mailto:kyle.w.willkomm@accenture.com">Kyle W.
  +          Willkomm</link>.
  +        </action>
  +        <action dev="VMA" type="add">
  +          New <code>WebResponse.getCookieIgnoreCase(cookieName)</code> to get
  +          the first cookie matching <code>cookieName</code> whatever the case
  +          (case-insensitive).
  +        </action>
  +        <action dev="VMA" type="add" due-to="Jason Robertson" due-to-email="Jason.Robertson@acs-inc.com">
  +          Added Form-based authentication support.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added a <link href="howto_build.html">tutorial</link> that explains 
  +          how to build Cactus from the sources.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added a Jetty Sample application to demonstrate how to use the new
  +          Jetty initializer.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added a Jetty initializer. This is the first implementation of the 
  +          new initializer feature. This initializer starts Jetty before Cactus 
  +          tests are run. This is really nice to quickly run tests inside any 
  +          IDE or even from a simple <code>&lt;junit&gt;</code> Ant taks without 
  +          the need to package and deploy a WAR. In addition, it is real nice to 
  +          debug tests this way. Moreover, Jetty starts in less than 1 second, 
  +          making it completely seamless and transparent! We are now at the same
  +          order of magnitude as pure JUnit tests in term of speed ... :-). Of 
  +          course, this is only for Servlet tests ... I am still waiting for an
  +          embeddable EJB container that starts in less than 1 second ...
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added notion of Initializer. This is an optional class that you can 
  +          specify in <code>cactus.properties</code> or as a System property (
  +          the property name is <code>cactus.initializer</code>). It will be run
  +          once per JVM only. The initializer class must implement the
  +          <code>org.apache.cactus.util.Initializable</code> interface.
  +        </action>
  +        <action dev="VMA" type="update">
  +          Update of jars bundled in the Cactus distribution: Commons Logging
  +          1.0.1, Log4j 1.2.6, HttpClient 2.0alpha1 built on 29/08/2002,
  +          HttpUnit 1.4.5 and JUnit 3.8.1.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added support for client side <code>begin(...)</code>
  +          and <code>end(...)</code> methods. They are called on the
  +          client side, before and after every test in the same way as the
  +          JUnit <code>setUp()</code> and <code>tearDown()</code> are called
  +          before and after each test, but on the server side. <em>Note: web 
  +          site documentation is not yet up to date</em>.
  +        </action>
  +        <action dev="VMA" type="add">
  +          Added a new <code>CheckPropertiesTask</code> Ant task to check
  +          properties in build files.
  +        </action>
  +      </release>
   
       <release version="1.4.1" date="31 August 2002">
         <action dev="VMA" type="add" due-to="Hirsch Richard" due-to-email="richard.hirsch@siemens.com">
  @@ -1051,4 +1002,6 @@
   
     </releases>
   
  -</changes>
  \ No newline at end of file
  +  </body>
  +
  +</document>
  \ No newline at end of file
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_testcase_filter.xml
  
  Index: howto_testcase_filter.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_testcase_filter.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_testcase_filter.xml	27 Jul 2002 21:21:55 -0000	1.3
  +++ howto_testcase_filter.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>FilterTestCase Principles</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_security.xml
  
  Index: howto_security.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_security.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_security.xml	21 Jul 2002 10:52:40 -0000	1.3
  +++ howto_security.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Testing secure code Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.6       +4 -5      jakarta-cactus/documentation/docs/xdocs/getting_started.xml
  
  Index: getting_started.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/getting_started.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- getting_started.xml	22 Jul 2002 18:41:58 -0000	1.5
  +++ getting_started.xml	3 Jan 2003 13:41:01 -0000	1.6
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Getting Started</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/how_it_works.xml
  
  Index: how_it_works.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/how_it_works.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- how_it_works.xml	19 Apr 2002 21:36:01 -0000	1.3
  +++ how_it_works.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Cactus Architecture</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_ejb.xml
  
  Index: howto_ejb.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ejb.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_ejb.xml	10 Mar 2002 14:10:25 -0000	1.1
  +++ howto_ejb.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>EJB Testing with Cactus Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/javadoc_13.xml
  
  Index: javadoc_13.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/javadoc_13.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- javadoc_13.xml	9 Jun 2002 18:28:06 -0000	1.1
  +++ javadoc_13.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>API Reference</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +5 -6      jakarta-cactus/documentation/docs/xdocs/howto_ide_vajava_tomcat.xml
  
  Index: howto_ide_vajava_tomcat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ide_vajava_tomcat.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide_vajava_tomcat.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_ide_vajava_tomcat.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  -    <title>ViAJava and Tomcat Test Environment</title>
  +
  +  <properties>
  +    <title>VAJava and Tomcat Test Environment</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.7       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_config.xml
  
  Index: howto_config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_config.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto_config.xml	27 Sep 2002 19:05:00 -0000	1.6
  +++ howto_config.xml	3 Jan 2003 13:41:01 -0000	1.7
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Configuration Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_ide.xml
  
  Index: howto_ide.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ide.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_ide.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>IDE Howto</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +6 -7      jakarta-cactus/documentation/docs/xdocs/howto_ide_jbuilder4.xml
  
  Index: howto_ide_jbuilder4.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ide_jbuilder4.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide_jbuilder4.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_ide_jbuilder4.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,16 +1,15 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>JBuilder 4 Integration</title>
       <authors>
  -      <person name="Cedric Chabanois" email="cchabanois@ifrance.com"/>
  -      <person name="Kunal Vaishnav" email="Kunal_Vaishnav@jdedwards.com"/>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Cedric Chabanois" email="cchabanois@ifrance.com"/>
  +      <author name="Kunal Vaishnav" email="Kunal_Vaishnav@jdedwards.com"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/coverage_empty.xml
  
  Index: coverage_empty.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/coverage_empty.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage_empty.xml	9 Jun 2002 18:28:06 -0000	1.1
  +++ coverage_empty.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Test Coverage</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.6       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_classpath.xml
  
  Index: howto_classpath.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_classpath.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- howto_classpath.xml	25 Aug 2002 13:35:33 -0000	1.5
  +++ howto_classpath.xml	3 Jan 2003 13:41:01 -0000	1.6
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Setting the Cactus CLASSPATH</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.41      +38 -54    jakarta-cactus/documentation/docs/xdocs/todo.xml
  
  Index: todo.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/todo.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- todo.xml	3 Jan 2003 09:57:57 -0000	1.40
  +++ todo.xml	3 Jan 2003 13:41:01 -0000	1.41
  @@ -1,60 +1,42 @@
   <?xml version="1.0"?>
   
  -<roadmap title="Roadmap/Todo for Cactus">
  +<document>
   
  -  <s1 title="Forewords">
  -    <p>
  -      As is stated on the Cactus <link href="goals.html">goals</link> page, the
  -      intention is to explore as much as possible in the realm of unit testing
  -      of server side java code ...
  -    </p>
  -    <p>
  -      This brings a bad news and a good one ... The
  -      bad one is that the TODO list is likely to keep growing or at least
  -      have a respectable size ... The good one
  -      is that there will be work for everyone ... :-)
  -    </p>
  -    <p>
  -      If you are interested in participating, send an email on the Cactus mailing
  -      list stating your interest and you'll be enrolled right away ... We're
  -      always looking for help ! Don't be put off if in the "Volunteer" column
  -      there is already a person listed. On the contrary, the more person that
  -      participate in a given task, the better (like in pair programming, several
  -      sets of eyes are always better than one!). However you'll need to sync.
  -      with these others persons but this is easily done by posting to the
  -      mailing-list.
  -    </p>
  -    <p>
  -      The game has just begun ... !
  -    </p>
  -  </s1>
  -
  -  <version title="Eclipse plugin - Milestone 4">
  -
  -  	<category title="Features">
  -  		<action>
  -  			Ability to leave the server running after the test is
  -  			finished so that we don’t need to start it again for the next
  -  			test (needs hot redeploy)
  -  		</action>
  -  		<action>
  -  			The user must be able to provide its own web.xml file.
  -  			Otherwise the plugin will use the one provided by default.
  -  		</action>
  -  		<action>
  -  			User interface : no shell popups for Ant tasks, preferences
  -  			for JAR files (JARs should be included in the Plugin, override by
  -  			the user possible)
  -  		</action>
  -  	</category>
  -  	<category title="Documentation">
  -  		<action>
  -  			Add full plugin documentation and development documentation
  -  			(for todos, etc)
  -  		</action>
  -  	</category>
  +  <properties>
  +    <title>Roadmap/Todo for Cactus</title>
  +    <authors>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
  +    </authors>
  +  </properties>
   
  -  </version>
  +  <body>
  +
  +    <s1 title="Forewords">
  +      <p>
  +        As is stated on the Cactus <link href="goals.html">goals</link> page, 
  +        the intention is to explore as much as possible in the realm of unit 
  +        testing of server side java code ...
  +      </p>
  +      <p>
  +        This brings a bad news and a good one ... The
  +        bad one is that the TODO list is likely to keep growing or at least
  +        have a respectable size ... The good one
  +        is that there will be work for everyone ... :-)
  +      </p>
  +      <p>
  +        If you are interested in participating, send an email on the Cactus 
  +        mailing list stating your interest and you'll be enrolled right 
  +        away ... We're always looking for help ! Don't be put off if in the 
  +        "Volunteer" column there is already a person listed. On the contrary, 
  +        the more person that participate in a given task, the better (like in 
  +        pair programming, several sets of eyes are always better than one!). 
  +        However you'll need to sync. with these others persons but this is 
  +        easily done by posting to the mailing-list.
  +      </p>
  +      <p>
  +        The game has just begun ... !
  +      </p>
  +    </s1>
   
     <version title="Version 1.5">
   
  @@ -204,4 +186,6 @@
   
     </version>
   
  -</roadmap>
  \ No newline at end of file
  +  </body>
  +  
  +</document>
  \ No newline at end of file
  
  
  
  1.3       +4 -7      jakarta-cactus/documentation/docs/xdocs/mockobjects.xml
  
  Index: mockobjects.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/mockobjects.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mockobjects.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ mockobjects.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,16 +1,13 @@
   <?xml version="1.0"?>
   
  -<!--
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  --->
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Mock Objects vs In-Container testing</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.21      +4 -5      jakarta-cactus/documentation/docs/xdocs/testedon.xml
  
  Index: testedon.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/testedon.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- testedon.xml	25 Aug 2002 15:16:54 -0000	1.20
  +++ testedon.xml	3 Jan 2003 13:41:01 -0000	1.21
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Tested On</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/mailinglist.xml
  
  Index: mailinglist.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/mailinglist.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mailinglist.xml	10 Mar 2002 14:10:25 -0000	1.1
  +++ mailinglist.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Cactus Mailing-List</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.2       +4 -5      jakarta-cactus/documentation/docs/xdocs/coverage_13.xml
  
  Index: coverage_13.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/coverage_13.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage_13.xml	9 Jun 2002 18:28:06 -0000	1.1
  +++ coverage_13.xml	3 Jan 2003 13:41:01 -0000	1.2
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Test Coverage</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +6 -7      jakarta-cactus/documentation/docs/xdocs/coding_conventions.xml
  
  Index: coding_conventions.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/coding_conventions.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- coding_conventions.xml	27 Aug 2002 22:22:32 -0000	1.2
  +++ coding_conventions.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,15 +1,14 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Coding Conventions</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  -			<person name="Nicholas Lesiecki" email="ndlesiecki@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Nicholas Lesiecki" email="ndlesiecki@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.3       +4 -22     jakarta-cactus/documentation/docs/xdocs/howto_ant_install.xml
  
  Index: howto_ant_install.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ant_install.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant_install.xml	19 Apr 2002 21:36:01 -0000	1.2
  +++ howto_ant_install.xml	3 Jan 2003 13:41:01 -0000	1.3
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Installing Ant</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  @@ -36,17 +35,6 @@
         </p>
         <ul>
           <li>
  -          The <strong><code>stylebook</code></strong> task : it is used to
  -          build the Cactus web site and Cactus documentation. The Stylebook
  -          version required by the Cactus build is
  -          the Stylebook 1.0b3 for Xalan2 (named
  -          <code>stylebook-1.0-b3_xalan-2.jar</code>) which needs the Xalan 2.0
  -          jar and the Xerces jar. <em>The stylebook task is not used by
  -          the Cactus Sample application build process, so it is only needed
  -          if you're building from the Cactus sources</em>. This task is
  -          normally found in the <code>optional.jar</code> Ant jar.
  -        </li>
  -        <li>
             The <strong><code>junit</code></strong> task : it is used to run
             the unit tests of Cactus itself and the Cactus unit tests of the
             Sample application. This task is
  @@ -122,12 +110,6 @@
             all these jars in <code>%ANT_HOME%\lib</code>.
           </li>
         </ol>
  -
  -      <note>
  -        You should ensure that the Ant optional jar that you download contains
  -        the &lt;stylebook&gt; and &lt;junit&gt; tasks. Alternatively you can
  -        download the prepackaged Ant zip as mentionned above.
  -      </note>
   
       </s1>
   
  
  
  
  1.4       +4 -5      jakarta-cactus/documentation/docs/xdocs/howto_ant_cactus.xml
  
  Index: howto_ant_cactus.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/howto_ant_cactus.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- howto_ant_cactus.xml	15 Dec 2002 11:35:39 -0000	1.3
  +++ howto_ant_cactus.xml	3 Jan 2003 13:41:01 -0000	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
  -
   <document>
  -  <header>
  +
  +  <properties>
       <title>Running Cactus tests from Ant</title>
       <authors>
  -      <person name="Vincent Massol" email="vmassol@apache.org"/>
  +      <author name="Vincent Massol" email="vmassol@apache.org"/>
       </authors>
  -  </header>
  +  </properties>
   
     <body>
   
  
  
  
  1.7       +1 -10     jakarta-cactus/documentation/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/build.properties.sample,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.properties.sample	15 Dec 2002 14:12:49 -0000	1.6
  +++ build.properties.sample	3 Jan 2003 13:41:03 -0000	1.7
  @@ -23,12 +23,3 @@
   # -----------------------------------------------------------------------------
   # Optional properties
   # -----------------------------------------------------------------------------
  -
  -# Location of all jars. Note: This is not a mandatory property. It is only
  -# used here so that it can be reused when defining the location of all the jars
  -# below. You do not have to put all the external jars in a single location.
  -lib.repo = c:/apps/maven/repository
  -
  -# The location of the Stylebook jar (used to generate the documentation).
  -# If not specified here, the jar must be present in ANTHOME/lib
  -stylebook.jar = ${lib.repo}/stylebook/jars/stylebook-1.0-b3_xalan-2.jar
  
  
  
  1.18      +18 -20    jakarta-cactus/documentation/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	15 Dec 2002 18:26:34 -0000	1.17
  +++ build.xml	3 Jan 2003 13:41:03 -0000	1.18
  @@ -6,12 +6,6 @@
       which serves as the Cactus Web Site and as local documentation in the
       Cactus distribution).
   
  -    The following Ant tasks need to be available in your ant installation (i.e.
  -    the Ant task themselves and their dependent jars need to be put in
  -    ANT_HOME/lib) :
  -
  -        stylebook   [REQUIRED] For builing the documentation from XML
  -
       The mandatory and optional Ant properties are defined in
       build.properties.sample. Please read and edit that file.
   
  @@ -45,10 +39,6 @@
       <!-- Prefix to add to all distributable files -->
       <property name="project.prefix" value="jakarta-"/>
   
  -    <!-- Default location for the stylebook jar -->
  -    <property name="stylebook.jar"
  -        value="${basedir}/lib/stylebook.jar"/>
  -
       <!--
          ========================================================================
            Default values for properties not defined in build.properties or in
  @@ -197,6 +187,7 @@
           <!-- Copy the images -->
           <copy todir="${target.doc.dir}/images" filtering="off">
               <fileset dir="${doc.xdoc.dir}/images"/>
  +            <fileset dir="${doc.skin.dir}/jakarta.apache.org/resources"/>
           </copy>
   
           <!-- Copy the misc doc files needed by the web site -->
  @@ -209,19 +200,26 @@
               filtering="on"/>
   
           <!-- Generate the docs -->
  -        <stylebook book="${target.xdoc.dir}/book.xml"
  -            skinDirectory="${doc.skin.dir}/jakarta.apache.org"
  -            targetDirectory="${target.doc.dir}">
  +		<style basedir="${target.xdoc.dir}" destdir="${target.doc.dir}"
  +          style="${doc.skin.dir}/jakarta.apache.org/stylesheets/document2html.xsl">
   
  -            <classpath>
  -                <pathelement location="${stylebook.jar}"/>
  -                <pathelement path="${java.class.path}"/>
  -            </classpath>
  -
  -        </stylebook>
  +        	<include name="*.xml"/>
  +        	<exclude name="book.xml"/>
   
  -    </target>
  +            <!--Location of the book.xml file relative to where the stylesheet 
  +                is located. Note: this path MUST be relative as it is used as a
  +                realtive URI from within the stylesheet -->
  +            <param name="bookfile" expression="../../../../../${target.xdoc.dir}/book.xml"/>
  +
  +			<!-- Location of the cvslog.xml file relative to where the 
  +			     stylesheet is located. Note: this path MUST be relative as it
  +			     is used as a realtive URI from within the stylesheet -->
  +            <param name="cvslogfile" expression="../../../../../${target.xdoc.dir}/cvslog/cvslog.xml"/>
  +			     
  +        </style>
   
  +	</target>
  +	
       <!--
          ========================================================================
            Generate the documentation (without the generated clover reports that
  
  
  
  1.6       +479 -238  jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- document2html.xsl	2 Jan 2003 18:04:47 -0000	1.5
  +++ document2html.xsl	3 Jan 2003 13:41:04 -0000	1.6
  @@ -1,73 +1,96 @@
   <?xml version="1.0"?>
   
  -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<!-- ====================================================================== -->
  +<!-- Transform an xml xdoc into HTML -->
  +<!-- $Id$ -->
  +<!-- ====================================================================== -->
   
  -  <xsl:param name="stylebook.project"/>
  -  <xsl:param name="copyright"/>
  -  <xsl:param name="updated"/>
  -  <xsl:param name="currentversion"/>
  -  <xsl:param name="otherversion"/>
  -  <xsl:param name="docid"/>
  -  <xsl:param name="target"/>
  -
  -  <xsl:output method="html" indent="yes"/>
  -
  -  <!-- voodoo magic to calculate base directory -->
  -  <xsl:template name="get-base-directory">  
  -    <xsl:call-template name="get-base-directory-internal">
  -      <xsl:with-param name="file" select="$docid"/>
  -    </xsl:call-template>
  -  </xsl:template>  
  +<!-- TODOS:
  +     - remove all color references and expose them as variables
  +     - try to have a single XSL that calls other XSL for dealing with
  +       the different page types as defined in book.xml
  +     - remove stylesheet images (add, update, fix, remove) from
  +       xdocs/images
  +     - handle xdocs located in sub-directories (issue is with the 
  +       relative path to the images)
  +     - migrate the xdocs to the new <properties> instead of <head>
  +-->
   
  -  <xsl:template name="get-base-directory-internal">
  -    <xsl:param name="file"/>     
  -    <xsl:choose>
  -      <xsl:when test="contains( $file, '/' )">
  -        <xsl:variable name="remainder" select="substring-after($file, '/')" />
  -        <xsl:variable name="path">
  -          <xsl:call-template name="get-base-directory-internal">
  -            <xsl:with-param name="file" select="$remainder"/>
  -          </xsl:call-template>
  -        </xsl:variable>
  -        <xsl:value-of select="concat('../',$path)"/>
  -      </xsl:when>
  -      <xsl:otherwise>./</xsl:otherwise>
  -    </xsl:choose>
  -  </xsl:template>
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- ====================================================================== -->
  -<!-- document section -->
  -<!-- ====================================================================== -->
  +  <!-- Location of the book.xml file, which describes the web site meta
  +       data such as the menu items, etc -->
  +  <xsl:param name="bookfile" select="''"/>
  +
  +  <!-- Location of the cvslog.xml file which contains the CVS changelog
  +       items for the last 15 days web site changes -->
  +  <xsl:param name="cvslogfile" select="''"/>
  +  
  +  <!-- Output method -->
  +  <xsl:output method="html" indent="no"/>
   
  - <xsl:template match="document">
  +  <!-- Defined variables -->
  +  <xsl:variable name="body-bg"    select="'#ffffff'"/>
  +  <xsl:variable name="body-fg"    select="'#000000'"/>
  +  <xsl:variable name="body-link"  select="'#023264'"/>
  +  <xsl:variable name="banner-bg"  select="'#023264'"/>
  +  <xsl:variable name="banner-fg"  select="'#ffffff'"/>
  +
  +  <!-- Read the menu definitions. It is located in a file named book.xml
  +       placed at the same level as the xdoc files. The path we specify is
  +       relative to where this stylesheet is located -->
  +  <xsl:variable name="book" select="document($bookfile)/book"/>
  +
  +  <!-- ==================================================================== -->
  +  <!-- Document section -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="document">
  +       
       <html>
  +
         <head>
  -        <title><xsl:value-of select="header/title"/></title>
  +
  +		<!-- Add the authors as a meta tag -->
  +        <meta name="author">
  +          <xsl:attribute name="content">
  +            <xsl:for-each select="properties/authors/author">
  +              <xsl:value-of select="@name"/>
  +              <xsl:if test="not(position()=last())">, </xsl:if>
  +            </xsl:for-each>
  +          </xsl:attribute>
  +        </meta>
  +
  +        <!-- Add the document title -->
  +        <title><xsl:call-template name="get-title"/></title>
  +
         </head>
  -      <body text="#000000" link="#525D76" vlink="#023264" alink="#023264"
  -            topmargin="4" leftmargin="4" marginwidth="4" marginheight="4"
  -            bgcolor="#ffffff">
   
  -        <!-- THE TOP BAR (HEADER) -->
  +      <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
  +          alink="{$body-link}" vlink="{$body-link}">
  +
  +        <!-- ============================================================== -->
  +        <!-- Top level header -->
  +        <!-- ============================================================== -->
  +
           <table width="100%" cellspacing="0" cellpadding="0" border="0">
             <tr>
  +
  +            <!-- Display left logo (the Jakarta logo) -->
               <td valign="top" align="left">
                 <a href="http://jakarta.apache.org/index.html">
                   <img hspace="0" vspace="0" border="0">
  -                  <xsl:attribute name="src"><xsl:call-template 
  -                    name="get-base-directory"/>images/jakarta-logo.gif</xsl:attribute>
  +                  <xsl:attribute name="src">images/jakarta-logo.gif</xsl:attribute>
                   </img>
                 </a>
               </td>
   
               <td width="100%" valign="middle" align="left" bgcolor="#ffffff">
  -              <img hspace="0" 
  -                   vspace="0" 
  -                   border="0" 
  -                   alt="{header/title}" 
  -                   align="right">
  -                   <xsl:attribute name="src"><xsl:call-template 
  -                     name="get-base-directory"/>/images/logocactus.gif</xsl:attribute>
  +              <img hspace="0" vspace="0" border="0" align="right">
  +                <xsl:attribute name="alt">
  +                  <xsl:call-template name="get-title"/>
  +                </xsl:attribute>
  +                <xsl:attribute name="src">images/logocactus.gif</xsl:attribute>
                 </img>
               </td>
             </tr>
  @@ -76,73 +99,104 @@
               <td width="100%" height="2" colspan="2"><hr noshade="" size="1"/></td>
             </tr>
           </table>
  -        <!-- THE MAIN PANEL (SIDEBAR AND CONTENT) -->
  +
  +        <!-- ============================================================== -->
  +        <!-- Main panel (sidebar and content) -->
  +        <!-- ============================================================== -->
  +
           <table width="100%" cellspacing="0" cellpadding="0" border="0">
             <tr>
  -            <!-- THE SIDE BAR -->
  +
  +            <!-- ========================================================== -->
  +            <!-- Side bar -->
  +            <!-- ========================================================== -->
  +
               <td width="1%" valign="top">
               </td>
               <td width="14%" valign="top" nowrap="1">
   
                 <font size="-2">
  -                Last update : <xsl:value-of select="$updated"/>
  +                Last update : <xsl:value-of select="$book/@updated"/>
                 </font>
                 <br/>
                 <font size="-2">
  -                Doc for : <b>v<xsl:value-of select="$currentversion"/></b>
  +                Doc for : <b>v<xsl:value-of select="$book/@currentversion"/></b>
                   | 
                   <a>
                     <xsl:attribute name="href">
                       <xsl:choose>
  -                      <xsl:when test="contains($currentversion,'dev')">
  +                      <xsl:when test="contains($book/@currentversion,'dev')">
                           ..
                         </xsl:when>
                         <xsl:otherwise>
  -                        <xsl:value-of select="$otherversion"/>
  +                        <xsl:value-of select="$book/@otherversion"/>
                         </xsl:otherwise>
                       </xsl:choose>
                     </xsl:attribute>
  -                  v<xsl:value-of select="$otherversion"/>
  +                  v<xsl:value-of select="$book/@otherversion"/>
                   </a>
                 </font>
   
  +              <!-- ======================================================== -->
  +              <!-- Menu -->
  +              <!-- ======================================================== -->
  +
                 <br/>
                 <font face="arial,helvetica,sanserif">
  -                <xsl:apply-templates select="document($stylebook.project)"/>
  +                <xsl:apply-templates select="$book"/>
                 </font>
   
               </td>
  -            <!-- THE CONTENT PANEL -->
  +
  +            <!-- ========================================================== -->
  +            <!-- Content Panel -->
  +            <!-- ========================================================== -->
  +
               <td width="*" valign="top" align="left">
                 <xsl:apply-templates/>
               </td>
  +
             </tr>
           </table>
  -        
  +
           <br/>
           
  +        <!-- ============================================================== -->
  +        <!-- Footer -->
  +        <!-- ============================================================== -->
  +
           <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr><td><hr noshade="" size="1"/></td></tr>
             <tr>
               <td align="center">
  -             <font face="arial,helvetica,sanserif" size="-1" color="#525D76">
  +             <font face="arial,helvetica,sanserif" size="-1" color="{$body-link}">
                  <i>
  -                Copyright &#169; <xsl:value-of select="$copyright"/>.
  +                Copyright &#169; <xsl:value-of select="$book/@copyright"/>.
                   All Rights Reserved.
                  </i>
                </font>
               </td>
             </tr>
           </table>
  +
         </body>
  +
       </html>
  +    
  +  </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- "properties" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="properties">
  +    <!-- Ignore "properties" elements -->
     </xsl:template>
   
  -  <!-- 
  -       ======================================================================
  -       book section
  -       ====================================================================== 
  -  -->
  +  <!-- ==================================================================== -->
  +  <!-- Menu elements: "menu/menu-item/separator" elements -->
  +  <!-- ==================================================================== -->
  +
     <xsl:template match="menu-item">
   
       <xsl:choose>
  @@ -156,8 +210,7 @@
         <xsl:when test="not(@type) or @type!='hidden'">
           <li>
             <a>
  -            <xsl:attribute name="href"><xsl:call-template 
  -              name="get-base-directory"/><xsl:value-of 
  +            <xsl:attribute name="href"><xsl:value-of 
                 select="substring(@source,0,string-length(@source)-3)"/>.html</xsl:attribute>
               <font size="-1"><xsl:value-of select="@label"/></font>
            </a>
  @@ -181,47 +234,9 @@
       <br/>
     </xsl:template>
   
  -  <xsl:template match="project">
  -    <br/>    
  -    <a href="{@href}">
  -      <font size="+1" color="#F3510C"><xsl:value-of select="@label"/></font>
  -    </a>
  -    <br/>
  -  </xsl:template>  
  -
  -<!-- ====================================================================== -->
  -<!-- header section -->
  -<!-- ====================================================================== -->
  -
  - <xsl:template match="header">
  -<!--
  -  <center>
  -   <table width="80%">
  -    <tr>
  -     <td bgcolor="#F3DD61">
  -      <br/>
  -      <center>
  -       <b>
  -        <font face="arial,helvetica,sanserif" color="#000000">
  -         <xsl:value-of select="title"/>
  -         <xsl:if test="subtitle">
  -          : <xsl:value-of select="subtitle"/>
  -         </xsl:if>
  -        </font>
  -       </b>
  -      </center>
  -      <br/>      
  -     </td>
  -    </tr>
  -   </table>
  -  </center>
  -  <br/>
  --->
  - </xsl:template>
  -
  -<!-- ====================================================================== -->
  -<!-- body section -->
  -<!-- ====================================================================== -->
  +  <!-- ==================================================================== -->
  +  <!-- "section/s1/s2/s3/s4" elements -->
  +  <!-- ==================================================================== -->
   
     <xsl:template match="section">
     
  @@ -301,7 +316,7 @@
       <table border="0" cellspacing="0" cellpadding="2">
        <xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
        <tr>
  -      <td bgcolor="#525D76">
  +      <td bgcolor="{$body-link}">
          <font face="arial,helvetica,sanserif" color="#ffffff">
           <xsl:attribute name="size"><xsl:value-of select="$font-size"/></xsl:attribute>
           <b><xsl:value-of select="$name"/></b>
  @@ -310,30 +325,28 @@
        </tr>
        <tr>
         <td>
  -       <font face="arial,helvetica,sanserif" color="#000000"><br/><xsl:apply-templates/></font>
  +       <font face="arial,helvetica,sanserif" color="{$body-fg}">
  +         <br/><xsl:apply-templates/>
  +       </font>
         </td>
        </tr>
       </table>
      </div>
      <br/>
     </xsl:template>
  -    
  -<!-- ====================================================================== -->
  -<!-- footer section -->
  -<!-- ====================================================================== -->
  -
  - <xsl:template match="footer">
  -  <!-- ignore on general documents -->
  - </xsl:template>
   
  -<!-- ====================================================================== -->
  -<!-- paragraph section -->
  -<!-- ====================================================================== -->
  +  <!-- ==================================================================== -->
  +  <!-- "p" elements -->
  +  <!-- ==================================================================== -->
   
     <xsl:template match="p">
       <p align="justify"><xsl:apply-templates/></p>
     </xsl:template>
   
  +  <!-- ==================================================================== -->
  +  <!-- "source" elements -->
  +  <!-- ==================================================================== -->
  +
     <xsl:template match="source">
      <div align="center">
       <table border="1" cellspacing="2" cellpadding="2">
  @@ -343,67 +356,64 @@
       </table>
      </div>
     </xsl:template>
  -  
  -  <xsl:template match="fixme">
  -   <!-- ignore on documentation -->
  -  </xsl:template>
   
  -<!-- ====================================================================== -->
  -<!-- list section -->
  -<!-- ====================================================================== -->
  -
  - <xsl:template match="ul|ol|dl">
  -  <blockquote>
  -   <xsl:copy><xsl:apply-templates/></xsl:copy>
  -  </blockquote>
  - </xsl:template>
  +  <!-- ==================================================================== -->
  +  <!-- "ul/ol/dl/li/sl/dt/dd" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="ul|ol|dl">
  +    <blockquote>
  +      <xsl:copy><xsl:apply-templates/></xsl:copy>
  +    </blockquote>
  +  </xsl:template>
    
  - <xsl:template match="li">
  -  <xsl:copy><xsl:apply-templates/></xsl:copy>
  - </xsl:template>
  +  <xsl:template match="li">
  +    <xsl:copy><xsl:apply-templates/></xsl:copy>
  +  </xsl:template>
   
  - <xsl:template match="sl">
  -  <ul><xsl:apply-templates/></ul>
  - </xsl:template>
  +  <xsl:template match="sl">
  +    <ul><xsl:apply-templates/></ul>
  +  </xsl:template>
   
  - <xsl:template match="dt">
  -  <li>
  -   <strong><xsl:value-of select="."/></strong>
  -   <xsl:text> - </xsl:text>
  -   <xsl:value-of select="following::dd"/>   
  -  </li>
  - </xsl:template>
  +  <xsl:template match="dt">
  +    <li>
  +      <strong><xsl:value-of select="."/></strong>
  +      <xsl:text> - </xsl:text>
  +      <xsl:value-of select="following::dd"/>   
  +    </li>
  +  </xsl:template>
    
  - <xsl:template match="dd">
  -  <!-- ignore since already used -->
  - </xsl:template>
  +  <xsl:template match="dd">
  +    <!-- ignore since already used -->
  +  </xsl:template>
   
  -<!-- ====================================================================== -->
  -<!-- note section -->
  -<!-- ====================================================================== -->
  +  <!-- ==================================================================== -->
  +  <!-- "note" elements -->
  +  <!-- ==================================================================== -->
   
     <xsl:template match="note">
  -   <p>
  -    <table width="100%" cellspacing="3" cellpadding="0" border="0">
  -      <tr>
  -        <td width="28" valign="top">
  -          <img src="images/note.gif" width="28" height="29" vspace="0" hspace="0" border="0" alt="Note"/>
  -        </td>
  -        <td valign="top">
  -          <font size="-1" face="arial,helvetica,sanserif" color="#000000">
  -            <i>
  -              <xsl:apply-templates/>
  -            </i>
  -          </font>
  -        </td>
  -      </tr>  
  -    </table>
  -   </p>
  -  </xsl:template>
  -
  -<!-- ====================================================================== -->
  -<!-- table section -->
  -<!-- ====================================================================== -->
  +    <p>
  +      <table width="100%" cellspacing="3" cellpadding="0" border="0">
  +        <tr>
  +          <td width="28" valign="top">
  +            <img src="images/note.gif" width="28" height="29" vspace="0" 
  +              hspace="0" border="0" alt="Note"/>
  +          </td>
  +          <td valign="top">
  +            <font size="-1" face="arial,helvetica,sanserif" color="{$body-fg}">
  +              <i>
  +                <xsl:apply-templates/>
  +              </i>
  +            </font>
  +          </td>
  +        </tr>  
  +      </table>
  +    </p>
  +  </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- "table/tr/th/td/tn/caption" elements -->
  +  <!-- ==================================================================== -->
   
     <xsl:template match="table">
       <table width="100%" border="0" cellspacing="2" cellpadding="2">
  @@ -417,11 +427,8 @@
     </xsl:template>
   
     <xsl:template match="th">
  -    <td bgcolor="#039acc" 
  -        colspan="{@colspan}" 
  -        rowspan="{@rowspan}" 
  -        valign="center" 
  -        align="center">
  +    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" 
  +      valign="center" align="center">
         <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
           <b><xsl:apply-templates/></b>&#160;
         </font>
  @@ -431,7 +438,8 @@
     <xsl:template match="td">
       <xsl:choose>
         <xsl:when test="@nowrap">
  -        <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" nowrap="true" valign="top" align="left">
  +        <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" 
  +          nowrap="true" valign="top" align="left">
             <font color="#000000" size="-1" face="arial,helvetica,sanserif">
               <xsl:apply-templates/>&#160;
             </font>
  @@ -457,81 +465,314 @@
       <!-- ignore since already used -->
     </xsl:template>
   
  -<!-- ====================================================================== -->
  -<!-- markup section -->
  -<!-- ====================================================================== -->
  +  <!-- ==================================================================== -->
  +  <!-- "strong/em/filename/code" elements -->
  +  <!-- ==================================================================== -->
   
  - <xsl:template match="strong">
  -   <b><xsl:apply-templates/></b>
  - </xsl:template>
  +  <xsl:template match="strong">
  +    <b><xsl:apply-templates/></b>
  +  </xsl:template>
   
  - <xsl:template match="em">
  +  <xsl:template match="em">
       <i><xsl:apply-templates/></i>
  - </xsl:template>
  +  </xsl:template>
   
  - <xsl:template match="filename">
  +  <xsl:template match="filename">
       <filename><i><xsl:apply-templates/></i></filename>
  - </xsl:template>
  +  </xsl:template>
   
  - <xsl:template match="code">
  +  <xsl:template match="code">
       <code><font face="courier, monospaced"><xsl:apply-templates/></font></code>
  - </xsl:template>
  +  </xsl:template>
   
  -<!-- ====================================================================== -->
  -<!-- images section -->
  -<!-- ====================================================================== -->
  +  <!-- ==================================================================== -->
  +  <!-- "figure/img/icon" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="figure">
  +    <p align="center">  
  +      <xsl:choose>
  +        <xsl:when test="@width">
  +          <img src="{@src}" alt="{@alt}" width="{@width}" height="{@height}" 
  +            border="0" vspace="4" hspace="4"/>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <img src="{@src}" alt="{@alt}" border="0" vspace="4" hspace="4"/>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </p>
  +  </xsl:template>
  + 
  +  <xsl:template match="img">
  +    <img src="{@src}" alt="{@alt}" border="0" vspace="4" hspace="4" 
  +      align="right"/>
  +  </xsl:template>
   
  - <xsl:template match="figure">
  -   <p align="center">  
  -   <xsl:choose>
  -     <xsl:when test="@width">
  -       <img src="{@src}" alt="{@alt}" width="{@width}" height="{@height}" border="0" vspace="4" hspace="4"/>
  -     </xsl:when>
  -     <xsl:otherwise>
  -       <img src="{@src}" alt="{@alt}" border="0" vspace="4" hspace="4"/>
  -     </xsl:otherwise>
  -   </xsl:choose>
  -   </p>
  - </xsl:template>
  +  <xsl:template match="icon">
  +    <img src="{@src}" alt="{@alt}" border="0" align="absmiddle"/>
  +  </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- "a/link/jump/fork/anchor" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="a">
  +    <a href="{@href}"><xsl:apply-templates/></a>
  +  </xsl:template>
  +
  +  <xsl:template match="link">
  +    <a href="{@href}"><xsl:apply-templates/></a>
  +  </xsl:template>
  +
  +  <xsl:template match="jump">
  +    <a href="{@href}#{@anchor}"><xsl:apply-templates/></a>
  +  </xsl:template>
  +
  +  <xsl:template match="fork">
  +    <a href="{@href}" target="_blank"><xsl:apply-templates/></a>
  +  </xsl:template>
  +
  +  <xsl:template match="anchor">
  +    <a name="{@id}"><xsl:comment>anchor</xsl:comment></a>
  +  </xsl:template>  
  +
  +  <!-- ==================================================================== -->
  +  <!-- "br" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="br">
  +    <br/>
  +  </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- "footer/fixme" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="footer">
  +    <!-- ignore on general documents -->
  +  </xsl:template>
    
  - <xsl:template match="img">
  -   <img src="{@src}" alt="{@alt}" border="0" vspace="4" hspace="4" align="right"/>
  - </xsl:template>
  +  <xsl:template match="fixme">
  +    <!-- ignore on documentation -->
  +  </xsl:template>
  + 
  +  <!-- ==================================================================== -->
  +  <!-- Changes: "releases/release/action/devs" elements -->
  +  <!-- ==================================================================== -->
   
  - <xsl:template match="icon">
  -   <img src="{@src}" alt="{@alt}" border="0" align="absmiddle"/>
  - </xsl:template>
  +  <xsl:template match="releases">
   
  -<!-- ====================================================================== -->
  -<!-- links section -->
  -<!-- ====================================================================== -->
  +    <!-- s1 -->
  +    <xsl:call-template name="section">
  +      <xsl:with-param name="width">100%</xsl:with-param>
  +      <xsl:with-param name="font-size">+1</xsl:with-param>
  +      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +    </xsl:call-template>
   
  - <xsl:template match="a">
  -   <a href="{@href}"><xsl:apply-templates/></a>
  - </xsl:template>
  +  </xsl:template>
   
  - <xsl:template match="link">
  -   <a href="{@href}"><xsl:apply-templates/></a>
  - </xsl:template>
  +  <xsl:template match="release">
   
  - <xsl:template match="jump">
  -   <a href="{@href}#{@anchor}"><xsl:apply-templates/></a>
  - </xsl:template>
  +    <!-- s2 -->
  +    <xsl:call-template name="section">
  +      <xsl:with-param name="width">98%</xsl:with-param>
  +      <xsl:with-param name="font-size">+0</xsl:with-param>
  +      <xsl:with-param name="name">
  +        <xsl:value-of select="$book/@software"/><xsl:text> </xsl:text>
  +        <xsl:value-of select="@version"/>
  +        <xsl:if test="@date">
  +          <xsl:text> (released on </xsl:text>
  +          <xsl:value-of select="@date"/>
  +          <xsl:text>)</xsl:text>
  +        </xsl:if>
  +      </xsl:with-param>
  +    </xsl:call-template>
   
  - <xsl:template match="fork">
  -   <a href="{@href}" target="_blank"><xsl:apply-templates/></a>
  - </xsl:template>
  +  </xsl:template>
   
  - <xsl:template match="anchor">
  -   <a name="{@id}"><xsl:comment>anchor</xsl:comment></a>
  - </xsl:template>  
  +  <xsl:template match="release/action">
  +    <li>
  +      <!-- icon -->
  +      <img src="images/{@type}.jpg" alt="{@type}" border="0" align="absmiddle"/>
   
  -<!-- ====================================================================== -->
  -<!-- specials section -->
  -<!-- ====================================================================== -->
  +      <xsl:apply-templates/>
  +      <xsl:text>(</xsl:text><xsl:value-of select="@dev"/><xsl:text>)</xsl:text>
  +
  +      <xsl:if test="@due-to">
  +        <xsl:text> Thanks to </xsl:text>
  +         <!-- link -->
  +         <a href="mailto:{@due-to-email}"><xsl:value-of select="@due-to"/></a>
  +        <xsl:text>.</xsl:text>
  +      </xsl:if>
   
  - <xsl:template match="br">
  -  <br/>
  +      <xsl:if test="@fixes-bug">
  +        <xsl:text> Fixes </xsl:text>
  +         <!-- link -->
  +         <a href="http://xml.apache.org/bugs/show_bug.cgi?id={@fixes-bug}">
  +           <xsl:text>bug </xsl:text><xsl:value-of select="@fixes-bug"/>
  +        </a>
  +        <xsl:text>.</xsl:text>
  +      </xsl:if>
  +    </li>
  +  </xsl:template>
  +
  +  <xsl:template match="devs">
  +    <!-- remove -->
  +  </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- Changelog: "cvslogs/changelog/entry" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="cvslogs">
  +
  +    <!-- s1 -->
  +    <xsl:call-template name="section">
  +      <xsl:with-param name="width">100%</xsl:with-param>
  +      <xsl:with-param name="font-size">+1</xsl:with-param>
  +      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +    </xsl:call-template>
  +
  +    <xsl:variable name="cvslog" select="document($cvslogfile)/changelog"/>
  +
  +    <xsl:choose>
  +      <xsl:when test="$cvslog/entry">
  +        <!-- table -->
  +        <table width="100%" border="0" cellspacing="2" cellpadding="2">
  +          <caption><xsl:value-of select="caption"/></caption>
  +          <xsl:apply-templates select="$cvslog/entry">
  +            <xsl:sort select="concat(date,time)" order="descending"/>
  +          </xsl:apply-templates>
  +        </table>
  +      </xsl:when>
  +      <xsl:otherwise>
  +        <xsl:text>&lt;no changes&gt;</xsl:text><br/>
  +      </xsl:otherwise>
  +    </xsl:choose>
  +
  +    <br/>
  +        
  +  </xsl:template>
  +
  +  <xsl:template match="entry">
  +    <tr>
  +      <!-- td (nowrap=true) -->
  +      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" 
  +        nowrap="true" valign="top" align="left">
  +        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +          <xsl:value-of select="date"/>&#160;
  +        </font>
  +      </td>
  +      <!-- td -->
  +      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  +        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +          <xsl:for-each select="file">
  +            <link href="{concat(substring-before(name, '.'),'.html')}">
  +              <xsl:value-of select="substring-before(name, '.')"/>
  +            </link>
  +            <xsl:if test="position()!=last()">
  +              <xsl:text>, </xsl:text>
  +            </xsl:if>
  +          </xsl:for-each>&#160;
  +        </font>
  +      </td>
  +      <!-- td -->
  +      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  +        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +          <xsl:value-of select="msg"/>&#160;
  +        </font>
  +      </td>
  +    </tr>
  +  </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- Todos: "version/category/action" elements -->
  +  <!-- ==================================================================== -->
  +
  +  <xsl:template match="version">
  +    <!-- s1 -->
  +    <xsl:call-template name="section">
  +      <xsl:with-param name="width">100%</xsl:with-param>
  +      <xsl:with-param name="font-size">+1</xsl:with-param>
  +      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +    </xsl:call-template>
  +  </xsl:template>
  +
  +  <xsl:template match="category">
  +    <!-- s2 section -->
  +    <div align="right">
  +      <table border="0" cellspacing="0" cellpadding="2" width="98%">
  +        <tr>
  +          <td bgcolor="{$body-link}">
  +            <font face="arial,helvetica,sanserif" color="#ffffff" size="+0">
  +              <b><xsl:value-of select="@title"/></b>
  +            </font>
  +          </td>
  +        </tr>
  +        <tr>
  +          <td>
  +            <font face="arial,helvetica,sanserif" color="{$body-fg}">
  +              <br/>
  +                <!-- table -->
  +                <table width="100%" border="0" cellspacing="2" cellpadding="2">
  +                  <caption><xsl:value-of select="caption"/></caption>
  +                  <tr>
  +                    <!-- th -->
  +                    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" 
  +                      valign="center" align="center" width="85%">
  +                      <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
  +                        <b>Description</b>&#160;
  +                      </font>
  +                    </td>
  +                    <!-- th -->
  +                    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" 
  +                      valign="center" align="center" width="15%">
  +                      <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
  +                        <b>Volunteers</b>&#160;
  +                      </font>
  +                    </td>
  +                  </tr>
  +                  <xsl:apply-templates/>
  +                </table>
  +            </font>
  +          </td>
  +        </tr>
  +      </table>
  +    </div>
  +    <br/>
  +  </xsl:template>  
  +
  +  <xsl:template match="category/action">
  +    <tr>
  +      <!-- td -->
  +      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  +        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +          <xsl:apply-templates/>&#160;
  +        </font>
  +      </td>
  +      <!-- td -->
  +      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  +        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +          <xsl:if test="@assigned-to">
  +            <xsl:value-of select="@assigned-to"/>
  +          </xsl:if>&#160;
  +        </font>
  +      </td>
  +    </tr>
    </xsl:template>
  +
  +  <!-- ==================================================================== -->
  +  <!-- Return the document title -->
  +  <!-- ==================================================================== -->
  +  <xsl:template name="get-title">
  +    <xsl:choose>
  +      <xsl:when test="/document/properties/title">
  +        <xsl:value-of select="/document/properties/title"/>
  +      </xsl:when>
  +      <xsl:otherwise>
  +        <xsl:value-of select="$book/@title"/>
  +      </xsl:otherwise>
  +    </xsl:choose>
  +  </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.30      +0 -1      jakarta-cactus/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml	15 Dec 2002 09:53:12 -0000	1.29
  +++ build.xml	3 Jan 2003 13:41:04 -0000	1.30
  @@ -101,7 +101,6 @@
           <echo message=""/>
           <echo message="cvs.executable = ${cvs.executable}"/>
           <echo message=""/>
  -        <echo message="stylebook.jar (optional) = ${stylebook.jar}"/>
           <echo message="clover.enable (optional) = ${clover.enable}"/>
           <echo message=""/>
   
  
  
  
  1.35      +1 -5      jakarta-cactus/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.properties.sample	26 Dec 2002 13:11:50 -0000	1.34
  +++ build.properties.sample	3 Jan 2003 13:41:04 -0000	1.35
  @@ -76,10 +76,6 @@
   # If not specified here, the jar must be present in ANTHOME/lib
   aspectj-ant.jar = ${lib.repo}/aspectj/jars/aspectj-ant-1.0.6.jar
   
  -# The location of the Stylebook jar (used to generate the documentation).
  -# If not specified here, the jar must be present in ANTHOME/lib
  -stylebook.jar = ${lib.repo}/stylebook/jars/stylebook-1.0-b3_xalan-2.jar
  -
   # Dependancies for Checkstyle code auditing
   # If not specified here, the JARs must be present in ANTHOME/lib
   antlr.jar = ${lib.repo}/antlr/jars/antlr-2.7.1.jar
  
  
  
  1.29      +0 -1      jakarta-cactus/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/gump.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- gump.xml	2 Jan 2003 13:58:19 -0000	1.28
  +++ gump.xml	3 Jan 2003 13:41:04 -0000	1.29
  @@ -51,7 +51,6 @@
     
       <depend project="jakarta-ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-stylebook2"/>
       <depend project="xml-xalan2"/>
   
       <javadoc nested="documentation/dist/doc" title="Cactus Documentation"/>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>