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 cm...@apache.org on 2003/01/15 15:38:17 UTC

cvs commit: jakarta-cactus/documentation/docs/xdocs/writing howto_ejb.xml howto_ejb_j2eeri.xml howto_httpunit.xml howto_jsp.xml howto_security.xml howto_testcase.xml howto_testcase_filter.xml howto_testcase_jsp.xml howto_testcase_servlet.xml

cmlenz      2003/01/15 06:38:17

  Modified:    documentation/docs/xdocs build_result.xml cactusname.xml
                        changes.xml downloads.xml faq.xml features.xml
                        getting_started.xml goals.xml how_it_works.xml
                        how_it_works_uml.xml howto_migration.xml
                        howto_sample.xml javadoc.xml javadoc_12.xml
                        javadoc_13.xml license.xml mailinglist.xml
                        mock_vs_cactus.xml news.xml resources.xml
                        testedon.xml webalizer.xml
               documentation/docs/xdocs/participating
                        coding_conventions.xml contributing.xml
                        contributors.xml coverage.xml coverage_12.xml
                        coverage_13.xml coverage_empty.xml howto_build.xml
                        logos.xml release_checklist.xml todo.xml users.xml
               documentation/docs/xdocs/spines howto_runner.xml
               documentation/docs/xdocs/spines/ant howto_ant.xml
                        howto_ant_cactus.xml howto_ant_install.xml
                        howto_ant_primer.xml
               documentation/docs/xdocs/spines/browser howto_junitee.xml
                        howto_tomcat.xml
               documentation/docs/xdocs/spines/eclipse eclipse_plugin.xml
               documentation/docs/xdocs/spines/manual howto_classpath.xml
                        howto_config.xml howto_ide.xml
                        howto_ide_jbuilder4.xml howto_ide_jbuilder5.xml
                        howto_ide_vajava_tomcat.xml
                        howto_ide_vajava_wte.xml
               documentation/docs/xdocs/writing howto_ejb.xml
                        howto_ejb_j2eeri.xml howto_httpunit.xml
                        howto_jsp.xml howto_security.xml howto_testcase.xml
                        howto_testcase_filter.xml howto_testcase_jsp.xml
                        howto_testcase_servlet.xml
  Log:
  Replace all occurrences of <s1>, <s2> and <s3> with <section>
  
  Revision  Changes    Path
  1.6       +4 -4      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build_result.xml	12 Jan 2003 17:24:49 -0000	1.5
  +++ build_result.xml	15 Jan 2003 14:38:13 -0000	1.6
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Nightly Build Results">
  +    <section title="Nightly Build Results">
   
         <p>
           Every day, the main Cactus build is run, the cactus jars are generated,
  @@ -77,9 +77,9 @@
           <link href="ext:gump_results">here</link>.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Nightly Build results">
  +    <section title="Nightly Build results">
   
         <p>
           If the nightly build is successful, Gump posts the packaged Cactus
  @@ -96,7 +96,7 @@
           <link href="ext:gump_javadocs">here</link>.
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cactusname.xml	12 Jan 2003 17:24:50 -0000	1.3
  +++ cactusname.xml	15 Jan 2003 14:38:13 -0000	1.4
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Why Cactus ?">
  +    <section title="Why Cactus ?">
   
         <p>
           Here are some stories and reasons about the 'Cactus' name :)
  @@ -82,7 +82,7 @@
           -Vincent Massol
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.72      +2 -2      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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- changes.xml	12 Jan 2003 17:24:50 -0000	1.71
  +++ changes.xml	15 Jan 2003 14:38:13 -0000	1.72
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Summary of changes">
  +    <section title="Summary of changes">
         <ul>
           <li>
             <link href="site:news">News and Events</link>
  @@ -23,7 +23,7 @@
             <jump anchor="release_changes">Release changes</jump>
           </li>
         </ul>
  -    </s1>
  +    </section>
   
       <!-- ================================================================= -->
       <!-- Last 15 days web site changes -->
  
  
  
  1.7       +6 -6      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- downloads.xml	12 Jan 2003 17:24:49 -0000	1.6
  +++ downloads.xml	15 Jan 2003 14:38:13 -0000	1.7
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="File list">
  +    <section title="File list">
   
         <p>
           Here follows the list of files that you can download :
  @@ -72,17 +72,17 @@
           and date stamp for nightly builds.
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Releases">
  +    <section title="Releases">
   
         <p>
           Click <link href="ext:cactus_release">here</link> for Cactus releases.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Nightly builds">
  +    <section title="Nightly builds">
   
         <p>
           Click <link href="ext:cactus_nightly">here</link> for Cactus nightly 
  @@ -94,7 +94,7 @@
           result</link> page, which gives information on Cactus nightly builds.
         </note>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.10      +44 -44    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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- faq.xml	12 Jan 2003 17:24:49 -0000	1.9
  +++ faq.xml	15 Jan 2003 14:38:13 -0000	1.10
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="FAQ Content">
  +    <section title="FAQ Content">
         <ul>
   
           <li>
  @@ -49,10 +49,10 @@
             a JUnit TestRunner different from TextTestRunner</jump>
           </li>
         </ul>
  -    </s1>
  +    </section>
   
       <anchor id="faq1"/>
  -    <s1 title="Can't find resource for cactus error message">
  +    <section title="Can't find resource for cactus error message">
   
         <p>
           If you get the following stack trace :
  @@ -74,12 +74,12 @@
           <link href="site:howto_config">Configuration Howto</link> page for
           more information.
         </p>
  -    </s1>
  +    </section>
   
       <anchor id="faq2"/>
  -    <s1 title="How can I have a web.xml that is valid both for testing and for production ?">
  +    <section title="How can I have a web.xml that is valid both for testing and for production ?">
   
  -      <s2 title="Question">
  +      <section title="Question">
           <p>
             Cactus needs to have a few entries set in the <code>web.xml</code>
             file (redirector definition and mappings mostly). The application to
  @@ -87,8 +87,8 @@
             able to use the same <code>web.xml</code> file in the build process
             for both application testing and deployment to production.
           </p>
  -      </s2>
  -      <s2 title="Solution">
  +      </section>
  +      <section title="Solution">
           <p>
               Here's how I accomplished conditional inclusion
               of Cactus web.xml configuration.  My web.xml file is capable of
  @@ -140,12 +140,12 @@
   @end.cactus.config@ End Cactus Configuration -->
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="faq3"/>
  -    <s1 title="I'm getting a java.io.StreamCorruptedException error. What does it mean ?">
  +    <section title="I'm getting a java.io.StreamCorruptedException error. What does it mean ?">
   
         <note>
           This error only appears for Cactus 1.3dev (before 21/04/2002) and
  @@ -153,7 +153,7 @@
           result. It uses an XML string.
         </note>
   
  -      <s2 title="Solution">
  +      <section title="Solution">
           <p>
             This exception results when client-side Cactus code attempts to talk
             to a misconfigured installation of Cactus on the server side. The
  @@ -212,20 +212,20 @@
             (any version prior to 2.2, or using servlet.jar 2.2 with a
             Cactus-1.3 installation).
           </p>
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="faq4"/>
  -    <s1 title="How can I test the chaining of several HTTP requests ?">
  +    <section title="How can I test the chaining of several HTTP requests ?">
   
  -      <s2 title="Question">
  +      <section title="Question">
           <p>
             Let's imagine that I have one servlet that performs an HTTP redirect
             to a JSP page (or to another servlet). How do I test it with Cactus ?
           </p>
  -      </s2>
  -      <s2 title="Solution">
  +      </section>
  +      <section title="Solution">
           <p>
             Short answer : you don't !
           </p>
  @@ -247,21 +247,21 @@
             functional test than a unit test but it can still be viewed as
             unit testing the <code>doGet()</code> method of the JSP ...
           </p>
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="faq5"/>
  -    <s1 title="The Ant runservertests task hangs when my server is started">
  +    <section title="The Ant runservertests task hangs when my server is started">
   
  -      <s2 title="Question">
  +      <section title="Question">
           <p>
             When I use the <code>runservertests</code> Cactus custom Ant task,
             it starts my server allright but then hangs and the tests are not
             executed. What is happening ?
           </p>
  -      </s2>
  -      <s2 title="Solution">
  +      </section>
  +      <section title="Solution">
           <p>
             It means that the <code>testURL</code> attribute you've specified
             in <code>runservertests</code> is not a valid URL. It must be a URL
  @@ -277,14 +277,14 @@
             Of course replace <code>webapp</code> by your webapp context and
             replace the port by the one you're using.
           </p>
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="faq6"/>
  -    <s1 title="I'm getting a 'not a valid response' error message. What does it mean ?">
  +    <section title="I'm getting a 'not a valid response' error message. What does it mean ?">
   
  -      <s2 title="Question">
  +      <section title="Question">
           <p>
            When I run my Cactus test, I'm getting the following :
           </p>
  @@ -299,8 +299,8 @@
     WebTestResultParser.java;org/apache/cactus/util/log/LogAspect.java(1k):134)
   ]]></source>
   
  -      </s2>
  -      <s2 title="Solution">
  +      </section>
  +      <section title="Solution">
           <p>
             It means that Cactus could not connect to the server side properly.
             There could several reasons for this : a valid Redirector URL but
  @@ -312,19 +312,19 @@
             for how to do this). The cactus client log
             (<code>cactus_client.log</code> will clearly give the error).
           </p>
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="faq7"/>
  -    <s1 title="How to send multipart/form-data ?">
  +    <section title="How to send multipart/form-data ?">
   
  -        <s2 title="Question">
  +        <section title="Question">
             <p>
              How to send multipart/form-data to my servlet under test ?
             </p>
  -        </s2>
  -        <s2 title="Solution">
  +        </section>
  +        <section title="Solution">
             <p>
               One solution is to use the
               <link href="ext:httpclient_other">HTTPClient</link>
  @@ -356,13 +356,13 @@
   }
   ]]></source>
   
  -      </s2>
  -    </s1>
  +      </section>
  +    </section>
   
       <anchor id="faq8"/>
  -    <s1 title="I get a 'java.lang.ClassCastException: org.apache.commons.logging.impl.LogFactoryImpl' error when I use a JUnit TestRunner different from TextTestRunner">
  +    <section title="I get a 'java.lang.ClassCastException: org.apache.commons.logging.impl.LogFactoryImpl' error when I use a JUnit TestRunner different from TextTestRunner">
   
  -        <s2 title="Question">
  +        <section title="Question">
             <p>
               Cactus tests run fine when I use the JUnit TextTestRunner but 
               fails with other runners like the SwingTestRunner. I get the
  @@ -377,8 +377,8 @@
   org.apache.cactus.AbstractTestCase.runBare(AbstractTestCase.java:188) 
   ]]></source>
   
  -        </s2>
  -        <s2 title="Solution">
  +        </section>
  +        <section title="Solution">
             <p>
   	        Check the 
   	        <jump href="ext:junit_faq_runner" anchor="runners_1">JUnit 
  @@ -387,9 +387,9 @@
   	        Thus you need to put the commons-logging package in the JUnit 
   	        <code>excluded.properties</code> file (see the JUnit FAQ).
   		  </p>
  -		</s2>
  +		</section>
   
  -	</s1>
  +	</section>
   
     </body>
   </document>
  
  
  
  1.11      +6 -6      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- features.xml	12 Jan 2003 17:24:50 -0000	1.10
  +++ features.xml	15 Jan 2003 14:38:14 -0000	1.11
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Current scope and status of Cactus">
  +    <section title="Current scope and status of Cactus">
   
         <figure src="images/scope.jpg" alt="Scope and Status"/>
   
  @@ -28,9 +28,9 @@
           the <link href="site:howto_ejb">EJB Howto</link> page for more details).
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="General design features">
  +    <section title="General design features">
   
         <ul>
           <li>
  @@ -64,9 +64,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Detailed feature list">
  +    <section title="Detailed feature list">
         <p><br/></p>
         <ul>
           <li>
  @@ -243,7 +243,7 @@
             be protected.
           </li>
         </ul>
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.8       +10 -10    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- getting_started.xml	12 Jan 2003 17:24:50 -0000	1.7
  +++ getting_started.xml	15 Jan 2003 14:38:14 -0000	1.8
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Forewords">
  +    <section title="Forewords">
         <p>
           If you want to quickly get a feeling of Cactus, there is a
           <link href="site:howto_tomcat">20 minutes tutorial</link> that take you
  @@ -25,9 +25,9 @@
           in action and will be ready to understand the concepts behind it and
           its full power.
         </p>
  -    </s1>
  +    </section>
   
  -    <s1 title="Installing Cactus">
  +    <section title="Installing Cactus">
   
         <p>
           There is not really an installation of Cactus per see, as Cactus is
  @@ -56,9 +56,9 @@
           (continuous) builds (including running the Cactus tests).
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="System Requirements">
  +    <section title="System Requirements">
   
         <p>
           In order to run Cactus tests you need to have the following
  @@ -87,9 +87,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="The Cactus files">
  +    <section title="The Cactus files">
   
         <p>
           At this point, you should have
  @@ -150,9 +150,9 @@
           <link href="site:howto_config">Configuration Howto</link> tutorial.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="What's next ?">
  +    <section title="What's next ?">
   
         <p>
           At this point you should understand what Cactus is and how it works.
  @@ -175,7 +175,7 @@
           Enjoy !
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.7       +12 -12    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- goals.xml	12 Jan 2003 17:24:49 -0000	1.6
  +++ goals.xml	15 Jan 2003 14:38:14 -0000	1.7
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="General goals">
  +    <section title="General goals">
   
         <ul>
           <li>
  @@ -29,9 +29,9 @@
           </li>
         </ul>          
           
  -    </s1>
  +    </section>
   
  -    <s1 title="Short terms goals">
  +    <section title="Short terms goals">
   
         <p>
           The short term goals for Cactus are to continue providing and improving
  @@ -103,11 +103,11 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Long term goals">
  +    <section title="Long term goals">
   
  -      <s2 title="The Future of Component Unit Testing">
  +      <section title="The Future of Component Unit Testing">
   
           <p>
             We believe unit testing server side components is going to get harder
  @@ -139,9 +139,9 @@
             </li>
           </ul>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Long term goals for Cactus">
  +      <section title="Long term goals for Cactus">
   
           <p>
             Consequently to the above predictions, there are 2 long term goals
  @@ -179,11 +179,11 @@
             </li>        
           </ul>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Feedback needed !">
  +    <section title="Feedback needed !">
   
         <p>
           Cactus is an open source project where everyone is free to participate
  @@ -207,7 +207,7 @@
           Thanks.
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- how_it_works.xml	12 Jan 2003 17:24:49 -0000	1.5
  +++ how_it_works.xml	15 Jan 2003 14:38:14 -0000	1.6
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="How it works">
  +    <section title="How it works">
   
         <p>
           Click <link href="site:how_it_works_uml">here</link> for a UML
  @@ -132,7 +132,7 @@
           </li>
         </ol>
   
  -      <s2 title="Redirector Proxies">
  +      <section title="Redirector Proxies">
   
           <p>
             Cactus provides 3 implementations of Redirector Proxies
  @@ -158,7 +158,7 @@
             </li>
           </ul>
   
  -        <s3 title="Servlet Redirector Proxy">
  +        <section title="Servlet Redirector Proxy">
   
             <figure src="images/archi_servlet.jpg"
               alt="Servlet Redirector Architecture"/>
  @@ -173,9 +173,9 @@
               connection.
             </p>
   
  -        </s3>
  +        </section>
   
  -        <s3 title="JSP Redirector Proxy">
  +        <section title="JSP Redirector Proxy">
   
             <figure src="images/archi_jsp.jpg" alt="JSP Redirector Architecture"/>
   
  @@ -189,9 +189,9 @@
               connection.
             </p>
   
  -        </s3>
  +        </section>
   
  -        <s3 title="Filter Redirector Proxy">
  +        <section title="Filter Redirector Proxy">
   
             <figure src="images/archi_filter.jpg" alt="Filter Redirector Architecture"/>
   
  @@ -205,11 +205,11 @@
               connection.
             </p>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- how_it_works_uml.xml	12 Jan 2003 17:24:49 -0000	1.3
  +++ how_it_works_uml.xml	15 Jan 2003 14:38:14 -0000	1.4
  @@ -11,11 +11,11 @@
   
     <body>
   
  -    <s1 title="UML Sequence Diagram">
  +    <section title="UML Sequence Diagram">
   
         <figure src="images/sequence.jpg" alt="UML Sequence Diagram"/>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.6       +4 -4      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- howto_migration.xml	12 Jan 2003 17:24:50 -0000	1.5
  +++ howto_migration.xml	15 Jan 2003 14:38:14 -0000	1.6
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="From Cactus 1.3 to 1.4">
  +    <section title="From Cactus 1.3 to 1.4">
   
         <p>
           See the 
  @@ -57,9 +57,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="From Cactus 1.2 to 1.3">
  +    <section title="From Cactus 1.2 to 1.3">
   
         <p>
           Here are the steps to migrate from Cactus 1.2 to 1.3
  @@ -113,7 +113,7 @@
           failing line (it is an optional line).
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.5       +10 -10    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- howto_sample.xml	12 Jan 2003 17:24:49 -0000	1.4
  +++ howto_sample.xml	15 Jan 2003 14:38:14 -0000	1.5
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Introduction">
  +    <section title="Introduction">
   
         <p>
           This tutorial explains where to get Cactus samples and how to use
  @@ -42,11 +42,11 @@
           tutorial.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Running the Cactus Samples using Ant">
  +    <section title="Running the Cactus Samples using Ant">
   
  -      <s2 title="Prerequisites">
  +      <section title="Prerequisites">
   
           <p>
             You need to install the following items prior to building the Cactus
  @@ -108,9 +108,9 @@
             </li>
           </ul>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Installing the Cactus Sample">
  +      <section title="Installing the Cactus Sample">
   
           <p>
             Follow these steps :
  @@ -132,9 +132,9 @@
             </li>
           </ul>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Running the samples">
  +      <section title="Running the samples">
   
           <p>
             Open a shell, cd to the <em><code>sampleroot</code></em>
  @@ -143,9 +143,9 @@
             defined in the <code>build.properties</code> file you have edited.
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- javadoc.xml	12 Jan 2003 17:24:49 -0000	1.4
  +++ javadoc.xml	15 Jan 2003 14:38:14 -0000	1.5
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Javadocs">
  +    <section title="Javadocs">
   
         <p>
           These are the generated Cactus javadocs.
  @@ -43,7 +43,7 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- javadoc_12.xml	12 Jan 2003 17:24:50 -0000	1.3
  +++ javadoc_12.xml	15 Jan 2003 14:38:14 -0000	1.4
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Javadocs">
  +    <section title="Javadocs">
   
         <p>
           These are the generated Cactus javadocs.
  @@ -37,7 +37,7 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- javadoc_13.xml	12 Jan 2003 17:24:49 -0000	1.3
  +++ javadoc_13.xml	15 Jan 2003 14:38:14 -0000	1.4
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Javadocs">
  +    <section title="Javadocs">
   
         <p>
           These are the generated Cactus javadocs.
  @@ -37,7 +37,7 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- license.xml	12 Jan 2003 17:24:50 -0000	1.3
  +++ license.xml	15 Jan 2003 14:38:14 -0000	1.4
  @@ -11,7 +11,7 @@
   
     <body>
     
  -    <s1 title="Cactus Public License">
  +    <section title="Cactus Public License">
   
   <source><![CDATA[
   /* ====================================================================
  @@ -69,7 +69,7 @@
    */
   ]]></source>
   
  -    </s1>
  +    </section>
     </body>
   
   </document>
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mailinglist.xml	12 Jan 2003 17:24:50 -0000	1.4
  +++ mailinglist.xml	15 Jan 2003 14:38:14 -0000	1.5
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Mailing List directions">
  +    <section title="Mailing List directions">
   
         <p>
           General information about the jakarta mailing lists can be found
  @@ -51,7 +51,7 @@
         <note>
           The same applies for the dev mailing list; replace "user" by "dev".
         </note>
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +12 -12    jakarta-cactus/documentation/docs/xdocs/mock_vs_cactus.xml
  
  Index: mock_vs_cactus.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/mock_vs_cactus.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mock_vs_cactus.xml	13 Jan 2003 11:45:55 -0000	1.2
  +++ mock_vs_cactus.xml	15 Jan 2003 14:38:14 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Mock Objects vs In-Container testing">
  +    <section title="Mock Objects vs In-Container testing">
         <note>
           Throughout this article, we'll use the abbreviations MO for Mock
           Objects and IC for In-Container strategy.
  @@ -33,10 +33,10 @@
             <jump anchor="mo_resources">MO resources</jump>
           </li>
         </ul>
  -    </s1>
  +    </section>
   
       <anchor id="mo_serverside"/>
  -    <s1 title="MO and Server-side tests">
  +    <section title="MO and Server-side tests">
   
         <p>
           MO is a strategy to unit test java classes in general. As such
  @@ -79,10 +79,10 @@
           Let's start first by an example to understand better what are MO.
         </p>
   
  -    </s1>
  +    </section>
   
       <anchor id="mo_example"/>
  -    <s1 title="An example">
  +    <section title="An example">
   
         <p>
           Simple test case using Cactus :
  @@ -143,10 +143,10 @@
   }
   ]]></source>
   
  -    </s1>
  +    </section>
   
       <anchor id="mo_differences"/>
  -    <s1 title="Differences between MO and IC">
  +    <section title="Differences between MO and IC">
   
         <p>
           Comparison of pros and cons of MO versus IC.
  @@ -342,10 +342,10 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
       <anchor id="mo_conclusion"/>
  -    <s1 title="Conclusion">
  +    <section title="Conclusion">
   
         <p>
           Mock Objects are a very interesting way of doing unit testing which
  @@ -406,10 +406,10 @@
           Thanks a lot.
         </p>
   
  -    </s1>
  +    </section>
   
       <anchor id="mo_resources"/>
  -    <s1 title="Resources on MO">
  +    <section title="Resources on MO">
   
         <p>
           Some links :
  @@ -450,7 +450,7 @@
           </ul>
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.22      +6 -6      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- news.xml	12 Jan 2003 17:24:50 -0000	1.21
  +++ news.xml	15 Jan 2003 14:38:14 -0000	1.22
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="News and Events">
  +    <section title="News and Events">
   
         <ul>
           <li>
  @@ -23,10 +23,10 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
       <anchor id="who_talks_news"/>
  -    <s1 title="Who talks about Cactus">
  +    <section title="Who talks about Cactus">
   
         <table>
   
  @@ -167,10 +167,10 @@
   
         </table>
   
  -    </s1>
  +    </section>
   
       <anchor id="internal_news"/>
  -    <s1 title="Internal Cactus project News (big headlines)">
  +    <section title="Internal Cactus project News (big headlines)">
   
         <table>
   
  @@ -383,7 +383,7 @@
   
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.16      +4 -4      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- resources.xml	13 Jan 2003 11:45:55 -0000	1.15
  +++ resources.xml	15 Jan 2003 14:38:14 -0000	1.16
  @@ -12,7 +12,7 @@
   
     <body>
   
  -    <s1 title="External resources related to Cactus">
  +    <section title="External resources related to Cactus">
   
         <note>
           Recent entries comes first in the table.
  @@ -205,9 +205,9 @@
   
         </table>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="External resources related to testing in general">
  +    <section title="External resources related to testing in general">
   
         <note>
           Recent entries comes first in the table.
  @@ -273,7 +273,7 @@
   
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.24      +10 -10    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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- testedon.xml	13 Jan 2003 13:08:53 -0000	1.23
  +++ testedon.xml	15 Jan 2003 14:38:14 -0000	1.24
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="What containers has Cactus been tested on ?">
  +    <section title="What containers has Cactus been tested on ?">
   
         <ul>
           <li>
  @@ -22,10 +22,10 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
       <anchor id="tested_on"/>
  -    <s1 title="Tested on ...">
  +    <section title="Tested on ...">
   
         <note>
           Cactus is supposed to work on any J2EE 1.2 and 1.3 compliant servers.
  @@ -47,7 +47,7 @@
           <code>[TestedOn]</code> in the subject.
         </p>
   
  -      <s2 title="Cactus 1.4">
  +      <section title="Cactus 1.4">
   
           <table>
             <tr>
  @@ -387,9 +387,9 @@
   
           </table>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Cactus 1.3">
  +      <section title="Cactus 1.3">
   
           <table>
             <tr>
  @@ -683,12 +683,12 @@
   
           </table>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="fails_on"/>
  -    <s1 title="Fails on ...">
  +    <section title="Fails on ...">
   
         <p>
           Some containers have some issues which prevent them from running the
  @@ -736,7 +736,7 @@
   
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.4       +4 -4      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- webalizer.xml	12 Jan 2003 17:24:49 -0000	1.3
  +++ webalizer.xml	15 Jan 2003 14:38:14 -0000	1.4
  @@ -11,14 +11,14 @@
   
     <body>
   
  -    <s1 title="Webalizer">
  +    <section title="Webalizer">
   
         <p>
           Webalizer is an httpd logfile analysis tool, which the Cactus web site
           uses to track website traffic.
         </p>
   
  -      <s2 title="Webalizer Definitions">
  +      <section title="Webalizer Definitions">
   
           <p>
             From the
  @@ -106,9 +106,9 @@
             Note: A kilobyte is 1024 bytes, not 1000 :)
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +33 -33    jakarta-cactus/documentation/docs/xdocs/participating/coding_conventions.xml
  
  Index: coding_conventions.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/coding_conventions.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coding_conventions.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ coding_conventions.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -12,7 +12,7 @@
   
     <body>
   
  -    <s1 title="Forewords">
  +    <section title="Forewords">
   
         <p>
           This document describes a list of coding conventions that are
  @@ -34,9 +34,9 @@
            Conventions</link>.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="How to apply ?">
  +    <section title="How to apply ?">
   
         <p>
           Having coding conventions is nice but having a way to ensure they are
  @@ -53,11 +53,11 @@
           Please run this target before committing any code.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Cactus specific coding conventions">
  +    <section title="Cactus specific coding conventions">
   
  -      <s2 title="1. Brackets">
  +      <section title="1. Brackets">
   
           <p>
             All brackets should begin and end on a <strong>new</strong> line. Example:
  @@ -92,9 +92,9 @@
   }
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="2. Blank Spaces">
  +      <section title="2. Blank Spaces">
   
           <p>
              keywords followed by a parenthesis should be separated by a space.
  @@ -125,9 +125,9 @@
   printSize("size is " + foo + "\n");
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="3. Indentations">
  +      <section title="3. Indentations">
   
           <p>
             <strong>4 spaces. NO tabs</strong>. Period. We understand that a lot
  @@ -137,9 +137,9 @@
             mailing list, they are almost impossible to read if you use tabs.
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="4. Comments">
  +      <section title="4. Comments">
   
           <p>
             Javadoc SHOULD exist on all your class members (methods + class
  @@ -153,18 +153,18 @@
             assumptions), especially when the code is not obvious.
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="5. License">
  +      <section title="5. License">
   
           <p>
             The Jakarta Apache/Cactus License MUST be placed at the top of each
             and every file.
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="6. Author references">
  +      <section title="6. Author references">
   
           <p>
             If you contribute to a file (code or documentation), add yourself to
  @@ -176,9 +176,9 @@
   @author <a href="mailto:user@domain.com">John Doe</a>
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="7. Class variables">
  +      <section title="7. Class variables">
   
           <p>
             Class variables should not have any prefix and <strong>must</strong>
  @@ -197,9 +197,9 @@
   }
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="8. Parameter names">
  +      <section title="8. Parameter names">
   
           <p>
             Method parameters should be prefixed by "<code>the</code>" (for
  @@ -213,17 +213,17 @@
   }
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="9. Line length">
  +      <section title="9. Line length">
   
           <p>
             Avoid lines longer than 80 characters for Code, comments, ...
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="10. Versioning">
  +      <section title="10. Versioning">
   
           <p>
             All .java files should have a <code>@version</code> tag like the one
  @@ -234,9 +234,9 @@
   @version $Id$
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="11. Logging">
  +      <section title="11. Logging">
   
           <p>
             Do <strong>not</strong> use <code>System.out</code> to log. Instead,
  @@ -259,9 +259,9 @@
             As of Cactus 1.3, LogAspect autmatically logs all method entries and
             exits.
           </note>
  -      </s2>
  +      </section>
   
  -      <s2 title="12. Exception handling">
  +      <section title="12. Exception handling">
   
           <p>
             Managing exceptions correctly requires experience. This is not
  @@ -312,9 +312,9 @@
   }
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="13. Qualified imports">
  +      <section title="13. Qualified imports">
   
           <p>
             All <code>import</code> statements should containing the full class
  @@ -336,9 +336,9 @@
   ]]></source>
   
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +8 -8      jakarta-cactus/documentation/docs/xdocs/participating/contributing.xml
  
  Index: contributing.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/contributing.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- contributing.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ contributing.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -  <s1 title="Introduction">
  +  <section title="Introduction">
   
       <p>
         The Cactus Project is an <link href="ext:opensource">Open Source</link>
  @@ -37,9 +37,9 @@
         in.
       </p>
   
  -  </s1>
  +  </section>
   
  -  <s1 title="Help Wanted Here">
  +  <section title="Help Wanted Here">
   
       <p>
         The rest of this document is mainly about
  @@ -92,9 +92,9 @@
         Thank you very much.
       </p>
   
  -  </s1>
  +  </section>
   
  -  <s1 title="Contributions of Code and Documentation">
  +  <section title="Contributions of Code and Documentation">
     
       <p>
         We are starting to use an informal system for accepting contributions to
  @@ -116,7 +116,7 @@
         <code>diff</code> of your patch against the latest CVS version of the code.
       </p>
     
  -    <s2 title="Licensing Requirements for the Cactus Distribution">
  +    <section title="Licensing Requirements for the Cactus Distribution">
     
         <p>
           To avoid legal problems, the Apache Project Management Committee (PMC) 
  @@ -142,9 +142,9 @@
           statements from all contributors!
         </p>
      
  -    </s2>
  +    </section>
    
  -  </s1>
  +  </section>
   
     </body>
   
  
  
  
  1.2       +12 -12    jakarta-cactus/documentation/docs/xdocs/participating/contributors.xml
  
  Index: contributors.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/contributors.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- contributors.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ contributors.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -12,7 +12,7 @@
   
     <body>
   
  -    <s1 title="Meritocracy">
  +    <section title="Meritocracy">
   
         <p>
           All work on Cactus is contributed by volunteers whose only motivation
  @@ -29,9 +29,9 @@
           Jakarta Website.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Source code contributors">
  +    <section title="Source code contributors">
   
         <ul>
           <li>
  @@ -74,9 +74,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Documentation contributors">
  +    <section title="Documentation contributors">
   
         <ul>
           <li>
  @@ -119,10 +119,10 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
       <anchor id="committers"/>
  -    <s1 title="Committers">
  +    <section title="Committers">
   
         <ul>
           <li>
  @@ -144,9 +144,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Special thanks">
  +    <section title="Special thanks">
   
         <p>
           Thanks to all that have reported bugs or suggested ideas for Cactus.
  @@ -168,9 +168,9 @@
           it a home and more importantly a family.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="More about us">
  +    <section title="More about us">
   
         <p>
           <strong><link href="mailto:vmassol@apache.org">Vincent Massol</link>
  @@ -304,7 +304,7 @@
   		phase in in-container testing by providing a more abstract framework for
   		interacting with a wider variety of containers (EJB, JMS, etc. ).
         </p>
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +2 -2      jakarta-cactus/documentation/docs/xdocs/participating/coverage.xml
  
  Index: coverage.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/coverage.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ coverage.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Test Coverage Reports">
  +    <section title="Test Coverage Reports">
   
         <p>
           These are test coverage reports for Cactus. They were generated using
  @@ -50,7 +50,7 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +2 -2      jakarta-cactus/documentation/docs/xdocs/participating/coverage_12.xml
  
  Index: coverage_12.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/coverage_12.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage_12.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ coverage_12.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Test Coverage Reports">
  +    <section title="Test Coverage Reports">
   
         <p>
           These are test coverage reports for Cactus. They were generated using
  @@ -44,7 +44,7 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +2 -2      jakarta-cactus/documentation/docs/xdocs/participating/coverage_13.xml
  
  Index: coverage_13.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/coverage_13.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage_13.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ coverage_13.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Test Coverage Reports">
  +    <section title="Test Coverage Reports">
   
         <p>
           These are test coverage reports for Cactus. They were generated using
  @@ -44,7 +44,7 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +2 -2      jakarta-cactus/documentation/docs/xdocs/participating/coverage_empty.xml
  
  Index: coverage_empty.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/coverage_empty.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coverage_empty.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ coverage_empty.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,14 +11,14 @@
   
     <body>
   
  -    <s1 title="Test Coverage Reports">
  +    <section title="Test Coverage Reports">
   
         <p>
           Sorry ! No test coverage report was created as this site was generated
           without coverage report enabled.
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +20 -20    jakarta-cactus/documentation/docs/xdocs/participating/howto_build.xml
  
  Index: howto_build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/howto_build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_build.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ howto_build.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Introduction">
  +    <section title="Introduction">
         <p>
           This tutorial explains how to build Cactus from CVS or from a source
           download.
  @@ -22,15 +22,15 @@
           latest and greatest), or the latest 
           <link href="site:downloads">stable release</link> otherwise.
         </note>
  -    </s1>
  +    </section>
   
  -    <s1 title="Getting the Source">
  +    <section title="Getting the Source">
         <p>
           There are two ways to obtain the source code for Cactus: either 
           directly from CVS, or by downloading a prepackaged source archive.
         </p>
   
  -      <s2 title="CVS">
  +      <section title="CVS">
         	<p>
             To get the current development version of the Cactus source code,
             you'll need to download the source from CVS. To do this, you'll need
  @@ -42,9 +42,9 @@
             <link href="ext:cvs">here</link>. The module name for Cactus is 
             <code>jakarta-cactus</code>.
           </p>
  -      </s2>
  +      </section>
   
  -      <s2 title="Prepackaged Source Archives">
  +      <section title="Prepackaged Source Archives">
           <p>
             If you don't have access to the Apache CVS repository (because you're
             behind a firewall, for example), or you don't need to be absolutely 
  @@ -56,11 +56,11 @@
             nightly builds. Go <link href="site:downloads">here</link> to find 
             out about the download locations.
           </p>
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Prerequisites">
  +    <section title="Prerequisites">
         <p>
           To build Cactus from source, you'll need to have
           <link href="ext:ant">Ant</link> 1.5 (or later)
  @@ -79,7 +79,7 @@
           distribution.
         </p>
   
  -      <s2 title="Required Libraries">
  +      <section title="Required Libraries">
           <table>
             <tr>
               <th>Name</th>
  @@ -122,9 +122,9 @@
               </td>
             </tr>
           </table>
  -      </s2>
  +      </section>
   
  -      <s2 title="Optional Libraries">
  +      <section title="Optional Libraries">
           <table>
             <tr>
               <th>Name</th>
  @@ -195,7 +195,7 @@
               </td>
             </tr>
           </table>
  -      </s2>
  +      </section>
   
         <note>
           <strong>If you don't want to have problems with versions, you need 
  @@ -217,9 +217,9 @@
           you will need to remove it.
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Understanding the directory structure">
  +    <section title="Understanding the directory structure">
         <p>
           The Cactus project is divided into several subprojects, each having 
           its own build. Examples of subprojects are:
  @@ -249,9 +249,9 @@
           All projects follow the same directory structure and they all use
           Ant as the build tool.
         </p>        
  -    </s1>
  +    </section>
   
  -    <s1 title="Building a Cactus project">
  +    <section title="Building a Cactus project">
         <p>
           First, you need to create a <code>build.properties</code> file
           in the directory for the project you wish to build. You will find 
  @@ -278,14 +278,14 @@
           for those projects before. The order is as follows: anttasks, then
           framework (or documentation), then sample projects.
         </note>
  -    </s1>
  +    </section>
   
  -    <s1 title="Building the full Cactus distribution">
  +    <section title="Building the full Cactus distribution">
         <p>
           Go to the top level directory, create a <code>build.properties</code>
           and type <code>ant release</code>.
         </p>
  -    </s1>
  +    </section>
           
     </body>
   </document>
  
  
  
  1.2       +22 -22    jakarta-cactus/documentation/docs/xdocs/participating/logos.xml
  
  Index: logos.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/logos.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logos.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ logos.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Propositions of logos for Cactus">
  +    <section title="Propositions of logos for Cactus">
   
         <p>
           Here are contributions for a Cactus logo and associated slogan. Thanks
  @@ -31,7 +31,7 @@
           official Cactus logo in the top right corner of the Cactus web site ...
         </p>
   
  -      <s2 title="Proposition 1 : Classic">
  +      <section title="Proposition 1 : Classic">
   
           <p>
             This is the current logo being displayed on the Cactus web site. It
  @@ -42,9 +42,9 @@
   
           <figure src="images/logocactus.gif" alt="Proposition 1: Classic"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 2 : Tomahawk">
  +      <section title="Proposition 2 : Tomahawk">
   
           <p>
             This is a proposition from
  @@ -55,9 +55,9 @@
           <link href="images/logos/vgritsenko.jpg"><figure src="images/logos/vgritsenko.jpg" height="185" width="119"
           alt="Proposition 2: Tomahawk"/></link>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 3 : A happy cactus">
  +      <section title="Proposition 3 : A happy cactus">
   
           <p>
             This is a proposition from
  @@ -67,9 +67,9 @@
   
           <figure src="images/logos/harishsk.jpg" alt="Proposition 3: A happy cactus"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 4 : Severe testing">
  +      <section title="Proposition 4 : Severe testing">
   
           <p>
             This is a proposition from
  @@ -81,9 +81,9 @@
           <figure src="images/logos/vgritsenko2.jpg" alt="Proposition 3: Severe testing"
           height="64" width="311"/></link>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 4">
  +      <section title="Proposition 4">
   
           <p>
             This is a proposition from
  @@ -93,9 +93,9 @@
   
           <figure src="images/logos/aceglia1.jpg" alt="Proposition 4"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 5">
  +      <section title="Proposition 5">
   
           <p>
             This is a proposition from
  @@ -105,9 +105,9 @@
   
           <figure src="images/logos/bogglins.gif" alt="Proposition 5"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 6">
  +      <section title="Proposition 6">
   
           <p>
             This is a proposition from
  @@ -117,9 +117,9 @@
   
           <figure src="images/logos/aceglia2.jpg" alt="Proposition 6"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 7">
  +      <section title="Proposition 7">
   
           <p>
             This is a proposition from
  @@ -129,9 +129,9 @@
   
           <figure src="images/logos/aceglia3.jpg" alt="Proposition 7"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 8">
  +      <section title="Proposition 8">
   
           <p>
             This is a proposition from
  @@ -140,9 +140,9 @@
   
           <figure src="images/logos/ajasso.gif" alt="Proposition 8"/>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Proposition 9">
  +      <section title="Proposition 9">
   
           <p>
             This is a proposition from
  @@ -151,9 +151,9 @@
   
           <figure src="images/logos/outoftheboxweb.gif" alt="Proposition 9"/>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +4 -4      jakarta-cactus/documentation/docs/xdocs/participating/release_checklist.xml
  
  Index: release_checklist.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/release_checklist.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- release_checklist.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ release_checklist.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Release Checklist">
  +    <section title="Release Checklist">
   
         <p>
           Checklist of tasks to perform for each release:
  @@ -111,9 +111,9 @@
           </li>
         </ol>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Announcement template">
  +    <section title="Announcement template">
   
   <source><![CDATA[
   The Cactus project is pleased to announce the release of Version <version>
  @@ -130,7 +130,7 @@
   For more information about Cactus, please visit: http://jakarta.apache.org/cactus/.
   ]]></source>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +2 -2      jakarta-cactus/documentation/docs/xdocs/participating/todo.xml
  
  Index: todo.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/todo.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- todo.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ todo.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Forewords">
  +    <section title="Forewords">
         <p>
           As is stated on the Cactus <link href="site:goals">goals</link> page, 
           the intention is to explore as much as possible in the realm of unit 
  @@ -36,7 +36,7 @@
         <p>
           The game has just begun ... !
         </p>
  -    </s1>
  +    </section>
   
     <version title="Version 1.5">
   
  
  
  
  1.2       +2 -2      jakarta-cactus/documentation/docs/xdocs/participating/users.xml
  
  Index: users.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/users.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- users.xml	12 Jan 2003 17:24:52 -0000	1.1
  +++ users.xml	15 Jan 2003 14:38:15 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Who is using Cactus ?">
  +    <section title="Who is using Cactus ?">
   
         <p>
           This page is dedicated for Cactus users who want to share with other
  @@ -26,7 +26,7 @@
           Cactus ?</link></strong>
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +18 -18    jakarta-cactus/documentation/docs/xdocs/spines/howto_runner.xml
  
  Index: howto_runner.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/howto_runner.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_runner.xml	13 Jan 2003 11:55:21 -0000	1.2
  +++ howto_runner.xml	15 Jan 2003 14:38:15 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Starting Cactus tests">
  +    <section title="Starting Cactus tests">
   
         <p>
           The Cactus tests are started using a JUnit Test Runner. There are
  @@ -36,19 +36,19 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
       <anchor id="from_ant"/>
  -    <s1 title="Running Cactus tests from Ant">
  +    <section title="Running Cactus tests from Ant">
   
         <p>
           Refer to the <link href="site:howto_ant">Ant Howto</link>.
         </p>
   
  -    </s1>
  +    </section>
   
       <anchor id="from_command_line"/>
  -    <s1 title="Running Cactus tests from the command line">
  +    <section title="Running Cactus tests from the command line">
   
         <p>
           You need to set up your classpath in the same way as when you run
  @@ -60,25 +60,25 @@
           <code>junit.swingui.TestRunner.main [test case class]</code>
         </p>
   
  -    </s1>
  +    </section>
   
       <anchor id="from_ide"/>
  -    <s1 title="Running Cactus tests from an IDE">
  +    <section title="Running Cactus tests from an IDE">
   
         <p>
           Refer to the <link href="site:howto_ide">IDE Howto</link>.
         </p>
   
  -    </s1>
  +    </section>
   
       <anchor id="from_browser"/>
  -    <s1 title="Running Cactus tests from a browser">
  +    <section title="Running Cactus tests from a browser">
   
         <note>
           This section only applies for Cactus 1.4 and greater.
         </note>
   
  -      <s2 title="Step 1 : Setting up the classpath">
  +      <section title="Step 1 : Setting up the classpath">
   
           <p>
             In order to run Cactus tests from a browser you need to have a webapp
  @@ -94,9 +94,9 @@
             guide for the exact list of jars.
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 2 : Mapping the Cactus Servlet Test Runner">
  +      <section title="Step 2 : Mapping the Cactus Servlet Test Runner">
   
           <p>
             Then, in addition to the Cactus redirectors that you have mapped in
  @@ -121,9 +121,9 @@
   [...]
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 3 : Executing the tests">
  +      <section title="Step 3 : Executing the tests">
   
           <p>
             Open a browser and type <code>http://server:port/mywebapp/ServletTestRunner?suite=mytestcase</code>
  @@ -176,9 +176,9 @@
             about other browsers.
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Enabling Server-Side XSLT Transformations">
  +      <section title="Enabling Server-Side XSLT Transformations">
   
           <p>
             In the previous section, the XSLT transformation was performed on the 
  @@ -239,9 +239,9 @@
             not get picked up until the web-application is reloaded.
           </note>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +2 -2      jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant.xml
  
  Index: howto_ant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant.xml	13 Jan 2003 11:45:55 -0000	1.2
  +++ howto_ant.xml	15 Jan 2003 14:38:15 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -  <s1 title="Ant integration">
  +  <section title="Ant integration">
   
       <p>
         This tutorial has several trails :
  @@ -36,7 +36,7 @@
         </li>
       </ul>
   
  -  </s1>
  +  </section>
   
     </body>
   </document>
  
  
  
  1.3       +14 -14    jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant_cactus.xml
  
  Index: howto_ant_cactus.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant_cactus.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant_cactus.xml	13 Jan 2003 11:45:55 -0000	1.2
  +++ howto_ant_cactus.xml	15 Jan 2003 14:38:15 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Introduction">
  +    <section title="Introduction">
   
         <note>
           <strong>You need to have a good understanding of Ant before
  @@ -62,9 +62,9 @@
             Cactus distribution.
           </p>
   
  -     </s1>
  +     </section>
   
  -     <s1 title="The 'runservertests' task">
  +     <section title="The 'runservertests' task">
   
           <p>
             This task will perform several actions, in the following order :
  @@ -180,9 +180,9 @@
            property is not defined we don't run the tests.
          </note>
   
  -     </s1>
  +     </section>
   
  -     <s1 title="Step 0: Deploy container configuration files">
  +     <section title="Step 0: Deploy container configuration files">
   
          <p>
            There are 2 possibilities for configuring your application server :
  @@ -321,9 +321,9 @@
            <code>server.xml</code>).
          </note>
   
  -     </s1>
  +     </section>
   
  -     <s1 title="Step 1: create and deploy test WAR file">
  +     <section title="Step 1: create and deploy test WAR file">
   
           <p>
             Creating a WAR file is the preferred way of deploying Cactus tests
  @@ -391,9 +391,9 @@
            into the <code>${target.classes.*.dir}</code> directory.
          </note>
   
  -     </s1>
  +     </section>
   
  -     <s1 title="Step 2: Start the container">
  +     <section title="Step 2: Start the container">
   
          <p>
            Example :
  @@ -422,9 +422,9 @@
   </target>
   ]]></source>
   
  -     </s1>
  +     </section>
   
  -     <s1 title="Step 3: Run the unit tests">
  +     <section title="Step 3: Run the unit tests">
   
          <p>
            We start the unit test by calling a JUnit test runner (we use the
  @@ -466,9 +466,9 @@
            Howto</link> guide.
          </note>
   
  -     </s1>
  +     </section>
   
  -     <s1 title="Step 4: Stop the container">
  +     <section title="Step 4: Stop the container">
   
          <p>
            Example :
  @@ -496,7 +496,7 @@
   </target>
   ]]></source>
   
  -     </s1>
  +     </section>
   
     </body>
   </document>
  
  
  
  1.3       +6 -6      jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant_install.xml
  
  Index: howto_ant_install.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant_install.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant_install.xml	13 Jan 2003 11:45:55 -0000	1.2
  +++ howto_ant_install.xml	15 Jan 2003 14:38:15 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Forewords">
  +    <section title="Forewords">
   
         <note>
           <strong>You need to have a good understanding of Ant before
  @@ -26,9 +26,9 @@
           also build the Cactus distribution from the sources.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Ant tasks needed by Cactus">
  +    <section title="Ant tasks needed by Cactus">
   
         <p>
           Cactus uses the following optional tasks of Ant :
  @@ -61,9 +61,9 @@
           the <link href="site:downloads">downloads</link> section.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Installing Ant on Windows systems">
  +    <section title="Installing Ant on Windows systems">
   
         <p>
           Follow the steps below to install Ant :
  @@ -111,7 +111,7 @@
           </li>
         </ol>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +38 -38    jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant_primer.xml
  
  Index: howto_ant_primer.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/ant/howto_ant_primer.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ant_primer.xml	13 Jan 2003 11:45:55 -0000	1.2
  +++ howto_ant_primer.xml	15 Jan 2003 14:38:15 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Continuous integration">
  +    <section title="Continuous integration">
   
         <note>
           <strong>This tutorial was written when I wrote Cactus 1.2. Since then
  @@ -40,9 +40,9 @@
           the perfect tool for this task.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Ant benefits">
  +    <section title="Ant benefits">
   
         <p>
           The benefits of using Ant for running unit tests are as follows :
  @@ -83,9 +83,9 @@
           </tr>
         </table>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Writing an Ant build script tutorial">
  +    <section title="Writing an Ant build script tutorial">
   
         <p>
           The sample Ant build file described below is taken from the
  @@ -101,7 +101,7 @@
           you are free to adapt/modify it to suit your needs.
         </note>
   
  -      <s2 title="Project directory structure">
  +      <section title="Project directory structure">
   
           <p>
             Create the following directories :
  @@ -214,9 +214,9 @@
             you are in trouble !), ...
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Ant Target List">
  +      <section title="Ant Target List">
   
           <p>
             Define the following targets in your <code>build.xml</code>.
  @@ -371,11 +371,11 @@
             </tr>
           </table>
   
  -      </s2>
  +      </section>
   
         <anchor id="basedir"/>
   
  -      <s2 title="Step 1 : The Ant project basedir">
  +      <section title="Step 1 : The Ant project basedir">
   
           <p>
             You <code>build.xml</code> file being in located in
  @@ -396,9 +396,9 @@
   <project name="Cactus Sample" default="war" basedir="..">
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 2 : initialization of project properties">
  +      <section title="Step 2 : initialization of project properties">
   
           <p>
             You should define as properties all values that can be factorized
  @@ -525,11 +525,11 @@
       </patternset>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="init"/>
   
  -      <s2 title="Step 3 : 'init' target">
  +      <section title="Step 3 : 'init' target">
   
           <p>
             Useful for initializing a timestamp (DSTAMP, TODAY, TSTAMP), defining
  @@ -579,11 +579,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="usage"/>
   
  -      <s2 title="Step 4 : 'usage' targets">
  +      <section title="Step 4 : 'usage' targets">
   
           <p>
             Display a usage message.
  @@ -621,11 +621,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="prepare"/>
   
  -      <s2 title="Step 5 : 'prepare' target">
  +      <section title="Step 5 : 'prepare' target">
   
           <p>
             This target is needed for both compiling and generating the javadoc.
  @@ -660,11 +660,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="compile"/>
   
  -      <s2 title="Step 6 : 'compile' target">
  +      <section title="Step 6 : 'compile' target">
   
           <p>
             The <code>compile</code> target simply compiles the java files into
  @@ -727,11 +727,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="source"/>
   
  -      <s2 title="Step 7 : 'source' target">
  +      <section title="Step 7 : 'source' target">
   
           <p>
             Zip up the sources for distribution.
  @@ -758,11 +758,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="javadoc"/>
   
  -      <s2 title="Step 8 : 'javadoc' target">
  +      <section title="Step 8 : 'javadoc' target">
   
           <p>
             Generate the project's javadoc.
  @@ -807,11 +807,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="doc"/>
   
  -      <s2 title="Step 9 : 'doc' target">
  +      <section title="Step 9 : 'doc' target">
   
           <p>
             Generate the project's documentation. It includes the javadoc,
  @@ -844,11 +844,11 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <anchor id="clean"/>
   
  -      <s2 title="Step 10 : 'clean' target">
  +      <section title="Step 10 : 'clean' target">
   
           <p>
             Removes all build generated files.
  @@ -880,13 +880,13 @@
       </target>
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 11 : 'jar', 'war' targets">
  +      <section title="Step 11 : 'jar', 'war' targets">
   
           <anchor id="jar"/>
   
  -        <s3 title="'jar' target">
  +        <section title="'jar' target">
   
             <p>
               This target is useful if your project is a framework for example and
  @@ -936,11 +936,11 @@
       </target>
   ]]></source>
   
  -        </s3>
  +        </section>
   
           <anchor id="war"/>
   
  -        <s3 title="'war' target">
  +        <section title="'war' target">
   
             <p>
               This target is useful if you're building a web application.
  @@ -997,13 +997,13 @@
       </target>
   ]]></source>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
         <anchor id="tests"/>
   
  -      <s2 title="Step 12 : 'tests_XXX' target">
  +      <section title="Step 12 : 'tests_XXX' target">
   
           <p>
             The <code>tests_XXX</code> target is in charge of running the
  @@ -1018,9 +1018,9 @@
             Ant</link> tutorial for details on to do this.
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +8 -8      jakarta-cactus/documentation/docs/xdocs/spines/browser/howto_junitee.xml
  
  Index: howto_junitee.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/browser/howto_junitee.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_junitee.xml	13 Jan 2003 11:45:55 -0000	1.2
  +++ howto_junitee.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -12,7 +12,7 @@
   
     <body>
   
  -    <s1 title="JUnitEE, a TestRunner inside the Container">
  +    <section title="JUnitEE, a TestRunner inside the Container">
   
         <note>
           Since Version 1.4 Cactus contains a new Servlet Test Runner that
  @@ -75,9 +75,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="How to install JUnitEE">
  +    <section title="How to install JUnitEE">
   
         <p>
           Download the
  @@ -105,9 +105,9 @@
           i.e. the JUnitEE interface.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Executing the tests with JUnitEE">
  +    <section title="Executing the tests with JUnitEE">
         <p>
           You request the tests from an html-page in your container. You can
           write the name of your testclasses according to the examples with
  @@ -129,9 +129,9 @@
             form-element
           </li>
         </ul>
  -    </s1>
  +    </section>
   
  -    <s1 title="Tell JUnitEE to use Cactus redirector">
  +    <section title="Tell JUnitEE to use Cactus redirector">
   
         <p>
           The
  @@ -139,7 +139,7 @@
           container can find it e.g. in your containers classpath.
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +14 -14    jakarta-cactus/documentation/docs/xdocs/spines/browser/howto_tomcat.xml
  
  Index: howto_tomcat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/browser/howto_tomcat.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_tomcat.xml	13 Jan 2003 11:54:13 -0000	1.2
  +++ howto_tomcat.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Tomcat Quickstart forewords">
  +    <section title="Tomcat Quickstart forewords">
   
         <note>
           This tutorial applies to Cactus 1.4 or greater and Tomcat 4.0 or
  @@ -51,17 +51,17 @@
           only once to be able to run Cactus tests within Tomcat.
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 1 : Install Tomcat">
  +    <section title="Step 1 : Install Tomcat">
         <p>
           Download <link href="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/">Tomcat</link>
           4.0 or greater and unzip it in any directory. Let's call this directory
           <code>[tomcat root]</code>.
         </p>
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 2 : Copy the Cactus jars">
  +    <section title="Step 2 : Copy the Cactus jars">
         <p>
           Download the Cactus jars from the <link href="site:downloads">Cactus
           download page</link>. They are located in the <code>lib/</code>
  @@ -92,9 +92,9 @@
           Cactus <link href="site:howto_httpunit">HttpUnit integration</link>
           you'll also need to copy <code>httpunit.jar</code>.
         </note>
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 3 : Modify Tomcat web.xml">
  +    <section title="Step 3 : Modify Tomcat web.xml">
         <p>
           Edit <code>[tomcat root]/conf/web.xml</code> and add the following at
           the beginning of the file, after the <code>&lt;webapp&gt;</code> tag :
  @@ -132,9 +132,9 @@
   </servlet-mapping>
   ]]></source>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 4 : Creating a sample applicaton to test">
  +    <section title="Step 4 : Creating a sample applicaton to test">
         <p>
           We're now going to create a very very simple application to server
           so that we can unit test it.
  @@ -221,9 +221,9 @@
   }
   ]]></source>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 5 : Run the test">
  +    <section title="Step 5 : Run the test">
   
         <p>
           Time to enjoy our hard work ! Start Tomcat by running
  @@ -238,9 +238,9 @@
         </p>
         <figure src="images/tomcat_xml.jpg" alt="XML output of ServletTestRunner"/>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 6 : Even more fun !">
  +    <section title="Step 6 : Even more fun !">
         <p>
           Ok, that's nice ... But what if I want HTML instead of XML ? Don't
           worry there is a solution. Grab the following
  @@ -258,7 +258,7 @@
           performed on the client side (i.e by the browser). I'm not sure
           about other browsers.
         </note>
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +18 -18    jakarta-cactus/documentation/docs/xdocs/spines/eclipse/eclipse_plugin.xml
  
  Index: eclipse_plugin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/eclipse/eclipse_plugin.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- eclipse_plugin.xml	12 Jan 2003 17:24:51 -0000	1.1
  +++ eclipse_plugin.xml	15 Jan 2003 14:38:16 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Overview">
  +    <section title="Overview">
         <p>
           Cactus uses and extends JUnit. It might then seem natural
           that the Cactus plugin for Eclipse extends in a certain manner
  @@ -29,10 +29,10 @@
           container setup and teardown.
         </p>
   
  -    </s1>
  -    <s1 title="How it works">
  +    </section>
  +    <section title="How it works">
   
  -      <s2 title="Extension points">
  +      <section title="Extension points">
           <ul>
             <li>
               <em>org.eclipse.debug.core.launchConfigurationTypes</em>
  @@ -49,8 +49,8 @@
               adds the Cactus preference page to the preferences.
             </li>
           </ul>
  -      </s2>
  -      <s2 title="GUI : preference page">
  +      </section>
  +      <section title="GUI : preference page">
           <p>
             A preference page is contributed to the Eclipse
             preferences. It shows the following entries :
  @@ -63,9 +63,9 @@
             </li>
             <li>setting of the container homes</li>
           </ul>
  -      </s2>
  +      </section>
   
  -      <s2 title="IContainerProvider">
  +      <section title="IContainerProvider">
           <p>
             To enable different ways to setup, start, and stop
             containers the idea of container providers has been
  @@ -86,8 +86,8 @@
             <code>GenericAntProvider</code>
             and may be used to execute tests on Tomcat 4.0 and Weblogic 7.0.
           </p>
  -      </s2>
  -      <s2 title="What happens when a test is launched">
  +      </section>
  +      <section title="What happens when a test is launched">
           <p>
             The
             <code>launch(IType theType, String theMode)</code>
  @@ -172,15 +172,15 @@
               </p>
             </li>
           </ul>
  -      </s2>
  -    </s1>
  -    <s1 title="What has been done so far">
  +      </section>
  +    </section>
  +    <section title="What has been done so far">
         <p>
           In its actual state the plugin is a proof of concept. It is
           able to run the distribution sample tests.
         </p>
  -    </s1>
  -    <s1 title="Features">
  +    </section>
  +    <section title="Features">
         <ul>
           <li>a minimalistic launch configuration</li>
           <li>a minimalistic launch shortcut</li>
  @@ -215,9 +215,9 @@
           </li>
           <li>Minimal plugin documentation</li>
         </ul>
  -    </s1>
  +    </section>
   
  -    <s1 title="What is next">
  +    <section title="What is next">
         <p>
           In order to have a production-quality tool the following
           points must be done :
  @@ -232,6 +232,6 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
     </body>
   </document>
  
  
  
  1.3       +6 -6      jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_classpath.xml
  
  Index: howto_classpath.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_classpath.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_classpath.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_classpath.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Setting up Cactus Classpaths">
  +    <section title="Setting up Cactus Classpaths">
   
         <p>
           You must understand that your Cactus tests are started by a JUnit
  @@ -36,7 +36,7 @@
   
         <figure src="images/classpath.jpg" alt="Classpaths"/>
   
  -      <s2 title="Client side classpath">
  +      <section title="Client side classpath">
   
           <p>
             The Cactus tests are started by running a JUnit Test Runner (For
  @@ -131,9 +131,9 @@
             <link href="site:howto_config">Config Howto</link> tutorial).
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Server side classpath">
  +      <section title="Server side classpath">
   
           <p>
             The server side part is a webapp. It can be packaged as a .war file
  @@ -195,9 +195,9 @@
             <code>WEB-INF/classes</code>).
           </note>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +10 -10    jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_config.xml
  
  Index: howto_config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_config.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_config.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_config.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Cactus Configuration">
  +    <section title="Cactus Configuration">
   
         <note>
           You should read the <link href="site:getting_started">Getting
  @@ -70,7 +70,7 @@
         </note>
   
         <anchor id="clientside"/>
  -      <s2 title="Client side configuration">
  +      <section title="Client side configuration">
   
           <p>
             The following table lists the properties that can be defined on
  @@ -244,10 +244,10 @@
             </tr>
           </table>
   
  -      </s2>
  +      </section>
   
         <anchor id="serverside"/>
  -      <s2 title="Server side configuration">
  +      <section title="Server side configuration">
   
           <p>
             On Cactus server side, you only need to properly configure your
  @@ -362,10 +362,10 @@
             <link href="site:howto_security">Security Howto</link>.
           </p>
   
  -      </s2>
  +      </section>
   
         <anchor id="logging"/>
  -      <s2 title="Cactus logging configuration">
  +      <section title="Cactus logging configuration">
   
           <p>
             Since Cactus 1.4, we have switched to using the
  @@ -389,7 +389,7 @@
             easily configure Log4j.
           </p>
   
  -        <s3 title="Log4J configuration">
  +        <section title="Log4J configuration">
   
             <p>
               Create a <code>log4j.properties</code> file and drop it in both
  @@ -448,11 +448,11 @@
               thus not appending is usually a good choice.
             </note>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +2 -2      jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide.xml
  
  Index: howto_ide.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_ide.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="IDE integration">
  +    <section title="IDE integration">
   
         <p>
           In order to simplify Cactus integration within your IDE (i.e. running
  @@ -53,7 +53,7 @@
           and do the same for yours.
         </p>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +24 -24    jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_jbuilder4.xml
  
  Index: howto_ide_jbuilder4.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_jbuilder4.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide_jbuilder4.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_ide_jbuilder4.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -13,14 +13,14 @@
   
     <body>
   
  -    <s1 title="Forewords and Requirements">
  +    <section title="Forewords and Requirements">
         <p>
           First of all, you need to download the
           <link href="site:downloads">Cactus distribution</link>
         </p>
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 1 : Create JBuilder libraries">
  +    <section title="Step 1 : Create JBuilder libraries">
   
         <p>
           Let's assume the following conventions :
  @@ -31,15 +31,15 @@
   
         <figure src="images/jb_libraries.gif" alt="jbuilder libraries" />
   
  -      <s2 title="Create the JUnit library">
  +      <section title="Create the JUnit library">
   
           <p>
             Create a JUnit library and include <code>junit.jar</code>.
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Create the Cactus library">
  +      <section title="Create the Cactus library">
   
           <p>
             Create a Cactus library containing <code>cactus.jar</code> and
  @@ -52,9 +52,9 @@
             This way, you will be able to debug inside cactus sources.
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Create the tomcat library">
  +      <section title="Create the tomcat library">
           <p>
             Create another library named <code>tomcat</code>
             and add all the jar files from <code>{Tomcat dir}/lib</code>.
  @@ -65,10 +65,10 @@
             this library because Tomcat 3.1 is provided with those versions.
           </note>
   
  -      </s2>
  -    </s1>
  +      </section>
  +    </section>
   
  -    <s1 title="Step 2 : Set up the cactus.properties file">
  +    <section title="Step 2 : Set up the cactus.properties file">
   
         <p>
           Edit a new file named <code>cactus.properties</code>
  @@ -81,11 +81,11 @@
           directory in the class tab of the cactus library.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 3 : Configure Tomcat Environment">
  +    <section title="Step 3 : Configure Tomcat Environment">
   
  -      <s2 title="Create a cactus webapp">
  +      <section title="Create a cactus webapp">
   
           <p>
             Create and edit the file
  @@ -113,7 +113,7 @@
   </web-app>
   ]]></source>
   
  -      </s2>
  +      </section>
   
         <note>
           You can edit <code>{Tomcat dir}/conf/web.xml</code> instead if you
  @@ -122,9 +122,9 @@
           located the servlet(s) you want to test. <br/>
           Don't forget to modify <code>cactus.properties</code> file accordingly.
         </note>
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 4 : Configure your project">
  +    <section title="Step 4 : Configure your project">
         <ol>
           <li>
             Put <code>-classic -Dtomcat.home="{Tomcat dir}"</code> as the VM
  @@ -143,11 +143,11 @@
             <figure src="images/jb_paths.gif" alt="jbuilder libraries" />
           </li>
         </ol>
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 5 : Test and debug your servlet">
  +    <section title="Step 5 : Test and debug your servlet">
   
  -      <s2 title="Test your servlet">
  +      <section title="Test your servlet">
           <ol>
             <li>
               Start Tomcat using the <code>Run/Run Project</code> menu.
  @@ -157,9 +157,9 @@
               case and click on <code>run</code>
             </li>
           </ol>
  -      </s2>
  +      </section>
   
  -      <s2 title="Debug your servlet and your tests">
  +      <section title="Debug your servlet and your tests">
           <p>
             You can easily print the results of the methods on the server-side
             itself.
  @@ -177,8 +177,8 @@
             <code>void endXXX(WebResponse)</code> or
             <code>void beginXXX(WebRequest)</code>
           </p>
  -      </s2>
  -    </s1>
  +      </section>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +10 -10    jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_jbuilder5.xml
  
  Index: howto_ide_jbuilder5.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_jbuilder5.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide_jbuilder5.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_ide_jbuilder5.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -12,7 +12,7 @@
   
     <body>
   
  -    <s1 title="Forewords and Requirements">
  +    <section title="Forewords and Requirements">
   
         <p>
           This document describes steps to setup Cactus to unit test Server side
  @@ -26,9 +26,9 @@
           (which means that you can run sample successfully).
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 1 : Create cactus.properties file">
  +    <section title="Step 1 : Create cactus.properties file">
   
         <p>
           Create cactus.properties file : Add entry to identify the URL of the
  @@ -36,9 +36,9 @@
           Howto</link> for details).
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 2 : Configure Cactus to work with JBuilder5">
  +    <section title="Step 2 : Configure Cactus to work with JBuilder5">
   
         <p>
           Follow these steps :
  @@ -98,9 +98,9 @@
           </li>
         </ol>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 3 : Configure Cactus for Weblogic6.1">
  +    <section title="Step 3 : Configure Cactus for Weblogic6.1">
   
         <ol>
           <li>
  @@ -123,9 +123,9 @@
           </li>
         </ol>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 4 : Run the test">
  +    <section title="Step 4 : Run the test">
   
         <ol>
           <li>
  @@ -143,7 +143,7 @@
           </li>
         </ol>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +4 -4      jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_vajava_tomcat.xml
  
  Index: howto_ide_vajava_tomcat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/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	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_ide_vajava_tomcat.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Forewords and Requirements">
  +    <section title="Forewords and Requirements">
   
         <note>
           <strong>This tutorial is written for Cactus 1.2 only. It will need
  @@ -28,9 +28,9 @@
           with other versions.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Steps">
  +    <section title="Steps">
   
         <p>
           Let's call <strong><code>{VAJava dir}</code></strong> the directory
  @@ -71,7 +71,7 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +22 -22    jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_vajava_wte.xml
  
  Index: howto_ide_vajava_wte.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/spines/manual/howto_ide_vajava_wte.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ide_vajava_wte.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_ide_vajava_wte.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Forewords and Requirements">
  +    <section title="Forewords and Requirements">
   
         <note>
           <strong>This tutorial is written for Cactus 1.2 only. It will need
  @@ -28,9 +28,9 @@
           other versions.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 1 : Import the correct packages in VAJava">
  +    <section title="Step 1 : Import the correct packages in VAJava">
   
         <p>
           Let's assume the following conventions :
  @@ -66,9 +66,9 @@
           then they have been automatically imported for you.
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 2 : Set up the cactus.properties file">
  +    <section title="Step 2 : Set up the cactus.properties file">
   
         <p>
           Copy your <code>cactus.properties</code> file (see the
  @@ -90,11 +90,11 @@
           if you have test cases that extend <code>JspTestCase</code>.
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 3 : Modify WebSphere Test Environment">
  +    <section title="Step 3 : Modify WebSphere Test Environment">
   
  -      <s2 title="Edit default.servlet_engine">
  +      <section title="Edit default.servlet_engine">
   
           <p>
             Edit <code>{WTE dir}/properties/default.servlet_engine</code> and
  @@ -121,9 +121,9 @@
             used by a test case.
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Create a test directory">
  +      <section title="Create a test directory">
   
           <p>
             Create a directory called <code>test</code> under
  @@ -132,9 +132,9 @@
             <code>web</code>.
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Create a test.webapp file">
  +      <section title="Create a test.webapp file">
   
           <p>
             Create a test.webapp file in
  @@ -222,20 +222,20 @@
   </webapp>
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Copy the Cactus JSP Redirector file">
  +      <section title="Copy the Cactus JSP Redirector file">
   
           <p>
             Copy the <code>{Cactus dir}/sample/web/test/jspRedirector.jsp</code>
             file to <code>{WTE dir}/hosts/default_host/test/web</code>.
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 4 : Edit VAJava workspace classpath">
  +    <section title="Step 4 : Edit VAJava workspace classpath">
   
         <p>
           Add the following to the VAJava workspace classpath (select menu
  @@ -250,9 +250,9 @@
   {VAJava dir}\ide\project_resources\Servlet API Classes\;
   ]]></source>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 5 : Edit VAJava workspace classpath">
  +    <section title="Step 5 : Edit VAJava workspace classpath">
   
         <p>
           In the WebSphere Test Environment under Servlet Engine, add Cactus,
  @@ -260,9 +260,9 @@
           the classpath.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Final note">
  +    <section title="Final note">
   
         <note>
           With this configuration, you'll find <code>cactus_client.log</code>
  @@ -279,7 +279,7 @@
           returned in suite(), for your test case.
         </note>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +10 -10    jakarta-cactus/documentation/docs/xdocs/writing/howto_ejb.xml
  
  Index: howto_ejb.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_ejb.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_ejb.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_ejb.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -  <s1 title="Introduction">
  +  <section title="Introduction">
   
       <p>
         This document explains how to unit test EJBs with Cactus. It is
  @@ -35,12 +35,12 @@
         EJB unit testing works with Cactus 1.0 or later.
       </note>
   
  -  </s1>
  +  </section>
   
     <anchor id="ejb_general"/>
  -  <s1 title="General Concepts">
  +  <section title="General Concepts">
   
  -    <s2 title="Why use Cactus for testing EJBs ?">
  +    <section title="Why use Cactus for testing EJBs ?">
   
         <p>
           You might be wondering why you would use Cactus to unit test your
  @@ -78,9 +78,9 @@
           </li>
         </ul>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="The process">
  +    <section title="The process">
   
         <p>
           You can unit test your EJBs from any of Cactus redirectors :
  @@ -99,12 +99,12 @@
           this, right ?
         </p>
   
  -    </s2>
  +    </section>
   
  -  </s1>
  +  </section>
   
     <anchor id="ejb_j2eeri"/>
  -  <s1 title="J2EE RI Tutorial">
  +  <section title="J2EE RI Tutorial">
   
       <p>
         This <link href="site:howto_ejb_j2eeri">J2EE RI tutorial</link>
  @@ -112,7 +112,7 @@
         Sun J2EE RI server.
       </p>
   
  -  </s1>
  +  </section>
   
     </body>
   </document>
  
  
  
  1.2       +28 -28    jakarta-cactus/documentation/docs/xdocs/writing/howto_ejb_j2eeri.xml
  
  Index: howto_ejb_j2eeri.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_ejb_j2eeri.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_ejb_j2eeri.xml	12 Jan 2003 17:24:51 -0000	1.1
  +++ howto_ejb_j2eeri.xml	15 Jan 2003 14:38:16 -0000	1.2
  @@ -12,7 +12,7 @@
   
     <body>
   
  -  <s1 title="Forewords">
  +  <section title="Forewords">
   
       <p>
         This tutorial shows how to write test cases for unit testing
  @@ -30,18 +30,18 @@
         EJB 2.0
       </note>
   
  -  </s1>
  +  </section>
   
  -  <s1 title="EJB Jar">
  +  <section title="EJB Jar">
   
  -    <s2 title="Step 1 : Prepare the Sample EJB">
  +    <section title="Step 1 : Prepare the Sample EJB">
   
         <p>
           The EJB used in this tutorial is a simple Session Bean with a method
           for converting Yen to Dollar.
         </p>
   
  -      <s3 title="EJB Remote">
  +      <section title="EJB Remote">
   
   <source><![CDATA[
   package org.apache.cactus.sample.ejb;
  @@ -55,9 +55,9 @@
   }
   ]]></source>
   
  -      </s3>
  +      </section>
   
  -      <s3 title="EJB Home">
  +      <section title="EJB Home">
   
   <source><![CDATA[
   package org.apache.cactus.sample.ejb;
  @@ -71,9 +71,9 @@
   }
   ]]></source>
   
  -      </s3>
  +      </section>
   
  -      <s3 title="EJB Bean">
  +      <section title="EJB Bean">
   
   <source><![CDATA[
   package org.apache.cactus.sample.ejb;
  @@ -116,11 +116,11 @@
   }
   ]]></source>
   
  -      </s3>
  +      </section>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="Step 2 : Prepare EJB Deployment Descriptor (ejb-jar.xml)">
  +    <section title="Step 2 : Prepare EJB Deployment Descriptor (ejb-jar.xml)">
   
         <p>
           Prepare the standard EJB Deployment Descriptor for the Session EJB :
  @@ -160,9 +160,9 @@
   </ejb-jar>
   ]]></source>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="Step 3 : Prepare EJB Runtime (only valid for J2EE RI)">
  +    <section title="Step 3 : Prepare EJB Runtime (only valid for J2EE RI)">
   
   <source><![CDATA[
   <?xml version="1.0" encoding="ISO-8859-1"?>
  @@ -181,13 +181,13 @@
   </j2ee-ri-specific-information>
   ]]></source>
   
  -    </s2>
  +    </section>
   
  -  </s1>
  +  </section>
   
  -  <s1 title="Cactus Web Application">
  +  <section title="Cactus Web Application">
   
  -    <s2 title="Step 1 : Prepare test code">
  +    <section title="Step 1 : Prepare test code">
   
   <source><![CDATA[
   package org.apache.cactus.sample.ejb;
  @@ -229,9 +229,9 @@
   }
   ]]></source>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="Step 2 : Prepare Web Application Deployment Descriptor (web.xml)">
  +    <section title="Step 2 : Prepare Web Application Deployment Descriptor (web.xml)">
   
   <source><![CDATA[
   <?xml version="1.0" encoding="UTF-8"?>
  @@ -264,9 +264,9 @@
   </web-app>
   ]]></source>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="Step 3 : Package Web Application">
  +    <section title="Step 3 : Package Web Application">
   
         <p>
           Package the web application into a war and then deploy it. Please
  @@ -274,9 +274,9 @@
           need to match with the JNDI name of the test EJB.
         </p>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="Step 4 : (Only valid to J2EE RI 1.2.1): War Runtime">
  +    <section title="Step 4 : (Only valid to J2EE RI 1.2.1): War Runtime">
   
   <source><![CDATA[
   <j2ee-ri-specific-information>
  @@ -296,9 +296,9 @@
   </j2ee-ri-specific-information>
   ]]></source>
   
  -    </s2>
  +    </section>
   
  -    <s2 title="Step 5 : Deploy">
  +    <section title="Step 5 : Deploy">
   
         <p>
           You need to deploy the war and the <code>ejb-jar.xml</code> based on
  @@ -306,9 +306,9 @@
           container.
         </p>
   
  -    </s2>
  +    </section>
   
  -  </s1>
  +  </section>
   
     </body>
   </document>
  
  
  
  1.2       +8 -8      jakarta-cactus/documentation/docs/xdocs/writing/howto_httpunit.xml
  
  Index: howto_httpunit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_httpunit.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_httpunit.xml	12 Jan 2003 17:24:51 -0000	1.1
  +++ howto_httpunit.xml	15 Jan 2003 14:38:16 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="HttpUnit integration">
  +    <section title="HttpUnit integration">
   
         <note>
           <strong>The HttpUnit integration is only available for Cactus v1.2 and
  @@ -50,9 +50,9 @@
           method you want to use.
         </p>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Usage">
  +    <section title="Usage">
   
         <p>
           The signature of an <code>endXXX()</code> method is always :
  @@ -80,7 +80,7 @@
           </li>
         </ul>
   
  -      <s2 title="Method 1 : Cactus provided WebResponse object">
  +      <section title="Method 1 : Cactus provided WebResponse object">
   
            <p>
              An example :
  @@ -106,9 +106,9 @@
             <code>WebResponse</code> object, see the associated Javadoc.
           </note>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Method 2 : HttpUnit provided WebResponse object">
  +      <section title="Method 2 : HttpUnit provided WebResponse object">
   
            <p>
              An example :
  @@ -131,9 +131,9 @@
             documentation.
           </note>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +12 -12    jakarta-cactus/documentation/docs/xdocs/writing/howto_jsp.xml
  
  Index: howto_jsp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_jsp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_jsp.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_jsp.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="JSP Testing in Cactus">
  +    <section title="JSP Testing in Cactus">
   
         <p>
           This tutorial explains how Cactus can be used to test JSP.        
  @@ -39,10 +39,10 @@
   	    </li>
   	  </ul>
   	      
  -    </s1>
  +    </section>
   
       <anchor id="jsp_type1"/>
  -    <s1 title="Type 1: verifying JSP result">
  +    <section title="Type 1: verifying JSP result">
   
         <p>
         	This is easily done by implementing a
  @@ -77,10 +77,10 @@
   }        
   ]]></source>
         
  -    </s1>
  +    </section>
   
       <anchor id="jsp_type2"/>
  -    <s1 title="Type 2: testing JSP taglibs">
  +    <section title="Type 2: testing JSP taglibs">
   
         <p>
         	This is easily done by creating a test case class that extends
  @@ -89,10 +89,10 @@
           tutorial</link>.
         </p>
         
  -    </s1>
  +    </section>
   
       <anchor id="jsp_type3"/>
  -    <s1 title="Type 3: testing JSP in isolation">
  +    <section title="Type 3: testing JSP in isolation">
   
         <p>
           This type of testing depends mostly on your architecture. The general
  @@ -108,7 +108,7 @@
         	some mock code logic that you would write for your tests.
         </p>
         
  -      <s2 title="Example1">
  +      <section title="Example1">
   
   <source><![CDATA[
   public class MyTestCase extends JspTestCase
  @@ -165,9 +165,9 @@
   </HTML>
   ]]></source>
           
  -      </s2>
  +      </section>
         
  -      <s2 title="Example2: Struts application">
  +      <section title="Example2: Struts application">
   
           <p>
             See the 
  @@ -175,9 +175,9 @@
             project.
           </p>
           
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.2       +8 -8      jakarta-cactus/documentation/docs/xdocs/writing/howto_security.xml
  
  Index: howto_security.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_security.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_security.xml	12 Jan 2003 17:24:51 -0000	1.1
  +++ howto_security.xml	15 Jan 2003 14:38:16 -0000	1.2
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Introduction to testing secure code">
  +    <section title="Introduction to testing secure code">
   
         <p>
           Beginning with version 1.3, Cactus is able to unit test Servlet code
  @@ -34,9 +34,9 @@
           that is explained here.
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 1 : Passing credentials in beginXXX()">
  +    <section title="Step 1 : Passing credentials in beginXXX()">
   
         <p>
           Let's start with an example :
  @@ -84,9 +84,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 2 : Securing the Cactus Redirector">
  +    <section title="Step 2 : Securing the Cactus Redirector">
   
         <p>
          All calls to the server side go through the Cactus Servlet Redirector
  @@ -156,9 +156,9 @@
   </web-app>
   ]]></source>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Step 3 : Map Users/Roles">
  +    <section title="Step 3 : Map Users/Roles">
   
         <p>
           This step consists in defining authorized users and mapping them to the
  @@ -189,7 +189,7 @@
   </tomcat-users>
   ]]></source>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +20 -20    jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase.xml
  
  Index: howto_testcase.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_testcase.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_testcase.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="Introduction">
  +    <section title="Introduction">
   
         <p>
           This tutorial explains how to write a test case, using Cactus. There
  @@ -37,16 +37,16 @@
           as they are in essence JUnit test cases.
         </note>
   
  -    </s1>
  +    </section>
   
       <anchor id="general_principles"/>
  -    <s1 title="General principles">
  +    <section title="General principles">
   
         <p>
           To write a test case, please follow the steps defined below.
         </p>
   
  -      <s2 title="Step 1 : Imports">
  +      <section title="Step 1 : Imports">
   
           <p>
             You need to include the following imports in your test class (
  @@ -59,9 +59,9 @@
   import junit.framework.*;
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 2 : Extend a Cactus TestCase class">
  +      <section title="Step 2 : Extend a Cactus TestCase class">
   
           <p>
             Now, we need to create a class (our test class) that extends one of
  @@ -109,9 +109,9 @@
             </li>
           </ul>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 3 : Standard JUnit methods">
  +      <section title="Step 3 : Standard JUnit methods">
   
           <p>
             As in a normal JUnit test case, define the following standard JUnit
  @@ -152,9 +152,9 @@
   }
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 4 (optional) : setUp() and tearDown() methods">
  +      <section title="Step 4 (optional) : setUp() and tearDown() methods">
   
           <p>
             As in JUnit, you can define a <code>setUp()</code> and a
  @@ -172,9 +172,9 @@
             methods are optional.
           </p>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 5 : testXXX() methods">
  +      <section title="Step 5 : testXXX() methods">
   
           <p>
             As in JUnit, the main method for a test is the
  @@ -235,9 +235,9 @@
   }
   ]]></source>
   
  -      </s2>
  +      </section>
   
  -      <s2 title="Step 6 (optional) : beginXXX() methods">
  +      <section title="Step 6 (optional) : beginXXX() methods">
   
           <p>
             For each XXX test case, you can define a corresponding
  @@ -277,10 +277,10 @@
             represent API objects (their values are <code>null</code>)
           </p>
   
  -      </s2>
  +      </section>
   
         <anchor id="endxxx"/>
  -      <s2 title="Step 7 (optional) : endXXX() methods">
  +      <section title="Step 7 (optional) : endXXX() methods">
   
           <p>
             For each XXX test case, you can define a corresponding
  @@ -324,12 +324,12 @@
             represent API objects (their values are <code>null</code>)
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
       <anchor id="specific_details"/>
  -    <s1 title="TestCase specific details">
  +    <section title="TestCase specific details">
   
         <p>
           <strong>Before reading any of the following detailed tutorials,
  @@ -350,7 +350,7 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +20 -20    jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase_filter.xml
  
  Index: howto_testcase_filter.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase_filter.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_testcase_filter.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_testcase_filter.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="When to use ?">
  +    <section title="When to use ?">
   
         <p>
           Your test case class should extend <code>FilterTestCase</code>
  @@ -37,9 +37,9 @@
           above.</strong>
         </note>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Provided Implicit Objects">
  +    <section title="Provided Implicit Objects">
   
         <p>
           Cactus automatically initializes the implicit objects for you and
  @@ -60,7 +60,7 @@
         </p>
   
         <anchor id="filter_request"/>
  -      <s2 title="request">
  +      <section title="request">
   
           <p>
            See <code>ServletTestCase</code><code>
  @@ -68,10 +68,10 @@
            </jump></code> implicit object for documentation.
          </p>
   
  -      </s2>
  +      </section>
   
         <anchor id="filter_response"/>
  -      <s2 title="response">
  +      <section title="response">
   
           <p>
            See <code>ServletTestCase</code><code>
  @@ -79,10 +79,10 @@
            </jump></code> implicit object for documentation.
          </p>
   
  -      </s2>
  +      </section>
   
         <anchor id="filter_config"/>
  -      <s2 title="config">
  +      <section title="config">
   
           <table>
             <tr>
  @@ -135,7 +135,7 @@
             samples provided in the Cactus distribution.
           </p>
   
  -        <s3 title="Additional methods">
  +        <section title="Additional methods">
   
             <p>
               Additional methods provided:
  @@ -153,12 +153,12 @@
               </li>
             </ul>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
         <anchor id="filter_filterChain"/>
  -      <s2 title="filterChain">
  +      <section title="filterChain">
   
           <table>
             <tr>
  @@ -183,13 +183,13 @@
             Cactus does not wrap the filter chain.
           </note>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Tips and Tricks">
  +    <section title="Tips and Tricks">
   
  -      <s2 title="Simulating the next fitler in chain">
  +      <section title="Simulating the next fitler in chain">
   
           <p>
             As you are performing unit testing of your filter, you may wish
  @@ -230,11 +230,11 @@
             See the samples provided as part of the Cactus distribution.
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Sample">
  +    <section title="Sample">
   
         <p>
           This is a very basic sample intended to give you a flavour of Filter
  @@ -278,7 +278,7 @@
   }
   ]]></source>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  
  1.3       +56 -56    jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase_jsp.xml
  
  Index: howto_testcase_jsp.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase_jsp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_testcase_jsp.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_testcase_jsp.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -12,7 +12,7 @@
   
     <body>
   
  -    <s1 title="When to use ?">
  +    <section title="When to use ?">
   
         <p>
           Your test case class should extend <code>JspTestCase</code>
  @@ -32,9 +32,9 @@
           code which uses the JSP API objects. Future versions of this tutorial
           will expand upon testing actual JSPs.
         </p>
  -    </s1>
  +    </section>
   
  -    <s1 title="Overview of Tag Library Testing">
  +    <section title="Overview of Tag Library Testing">
           <p>
               Custom tags consist of entries in a Tag Library Descriptor file 
               (TLD) and a tag handler class. Cactus provides the facility to test 
  @@ -69,9 +69,9 @@
             Currently, <code>JspTagLifecycle</code> is only available for
             JSP 1.2.
           </note>
  -    </s1>
  +    </section>
   
  -    <s1 title="Provided Implicit Objects">
  +    <section title="Provided Implicit Objects">
   
         <p>
           Cactus automatically initializes the following implicit objects.
  @@ -90,7 +90,7 @@
         </p>
   
         <anchor id="jsp_request"/>
  -      <s2 title="request">
  +      <section title="request">
   
           <p>
            See <code>ServletTestCase</code><code>
  @@ -98,10 +98,10 @@
            </jump></code> implicit object for documentation.
          </p>
   
  -      </s2>
  +      </section>
   
         <anchor id="jsp_response"/>
  -      <s2 title="response">
  +      <section title="response">
   
           <p>
            See <code>ServletTestCase</code><code>
  @@ -109,30 +109,30 @@
            </jump></code> implicit object for documentation.
           </p>
   
  -      </s2>
  +      </section>
   
         <anchor id="jsp_config"/>
  -      <s2 title="config">
  +      <section title="config">
   
           <p>
            See <code>ServletTestCase</code><code>
            <jump href="site:howto_testcase_servlet" anchor="servlet_config">config
            </jump></code> implicit object for documentation.
           </p>
  -      </s2>
  +      </section>
   
         <anchor id="jsp_session"/>
  -      <s2 title="session">
  +      <section title="session">
   
           <p>
            See <code>ServletTestCase</code><code>
            <jump href="site:howto_testcase_servlet" anchor="servlet_session">session
            </jump></code> implicit object for documentation.
           </p>
  -      </s2>
  +      </section>
   
         <anchor id="jsp_out"/>
  -      <s2 title="out">
  +      <section title="out">
   
           <table>
             <tr>
  @@ -164,10 +164,10 @@
            See <jump anchor="body_content"><code>bodyContent</code></jump> for
            details.
           </p>
  -      </s2>
  +      </section>
   
         <anchor id="jsp_pageContext"/>
  -      <s2 title="pageContext">
  +      <section title="pageContext">
   
           <table>
             <tr>
  @@ -205,11 +205,11 @@
             for more details. You should also look at the
             samples provided in the Cactus distribution.
           </p>
  -      </s2>
  +      </section>
   
   
       <anchor id="jsp_bodyContent"/>
  -      <s2 title="bodyContent">
  +      <section title="bodyContent">
   
           <table>
             <tr>
  @@ -255,10 +255,10 @@
                   in <code>tearDown()</code>.
               </note>
           
  -      </s2>
  -    </s1>
  +      </section>
  +    </section>
   
  -    <s1 title="Custom Tag Set Up">
  +    <section title="Custom Tag Set Up">
           <p>
               Creating the test fixture for a custom tag test involves several 
               steps. The exact order of the steps can vary depending on the 
  @@ -271,23 +271,23 @@
               to only one test in the <code>TestCase</code> and so should 
               be executed after common <code>setUp()</code> code).
           </p>
  -        <s2 title="Step 1: Create the Tag (Required)">
  +        <section title="Step 1: Create the Tag (Required)">
               <p>
                   Instantiate a copy of the tag you wish to test.
               </p>
   <source><![CDATA[SomeTag tag = new SomeTag();]]></source>
  -        </s2>
  +        </section>
   
  -        <s2 title="Step 2: Set the pageContext (Optional)">
  +        <section title="Step 2: Set the pageContext (Optional)">
               <p>
                   Call the <code>setPageContext()</code> method with the implicit
                   object provided by Cactus to register the pageContext with the
                   tag.
               </p>
   <source><![CDATA[tag.setPageContext(pageContext);]]></source>
  -        </s2>
  +        </section>
   
  -        <s2 title="Step 3: Set the tag's attributes (Optional)">
  +        <section title="Step 3: Set the tag's attributes (Optional)">
               <p>
                   If your tag takes attributes, call setter methods to initialize
                   the tag's state. Setters on the tag handler class represent the 
  @@ -302,9 +302,9 @@
   someTag.setBar("11");
   ]]></source>
   
  -        </s2>
  +        </section>
   
  -        <s2 title="Step 4: Set the parent tag (Optional)">
  +        <section title="Step 4: Set the parent tag (Optional)">
               <p>
                   If you would like the tag you are testing to access a parent 
                   tag, you will need to call 
  @@ -318,10 +318,10 @@
                   <code>setParent()</code> if you would like to simulate multiple
                   levels of nesting.
               </p>
  -        </s2>
  +        </section>
       
   
  -        <s2 title="Step 5: Create the BodyContent Object (Optional)">
  +        <section title="Step 5: Create the BodyContent Object (Optional)">
               <p>
                   If your tag processes its body, call 
                   <code>pageContext.pushBody()</code> 
  @@ -332,10 +332,10 @@
                   <jump anchor="using_body_content">Body Tags</jump> section
                   for more details.
               </p>
  -        </s2>
  +        </section>
   
   
  -        <s2 title="Step 6: Set up page state (Optional)">
  +        <section title="Step 6: Set up page state (Optional)">
               <p>
                   Set up any necessary page state by putting test objects into the
                   appropriate scopes. Tags frequently access data in the 
  @@ -351,17 +351,17 @@
   //or
   pageContext.setAttribute("key", new DomainObject("testValue"), PageContext.REQUEST_SCOPE);
   ]]></source>
  -        </s2>
  -    </s1>
  +        </section>
  +    </section>
   
  -    <s1 title="Running the Test">
  +    <section title="Running the Test">
           <p>
               Once the tag has been set up and any necessary page data has been 
               placed in the appropriate scopes, testing a custom tag consists of 
               calling the relevant life-cycle methods and then using JUnit 
               asserts to verify the outcome.
           </p>
  -        <s2 title="Verifying individual methods">
  +        <section title="Verifying individual methods">
               <p>
                   Most of the life cycle methods return <code>ints</code>, 
                   which signal that 
  @@ -376,8 +376,8 @@
   tag.setValueThatResultsInInclude("correct value");
   assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
   ]]></source>
  -        </s2>
  -        <s2 title="Checking effects on page data">
  +        </section>
  +        <section title="Checking effects on page data">
               <p>
               In addition to "listening" for the signals that your tag sends to 
               the container, you may want to verify that the tag's execution 
  @@ -392,9 +392,9 @@
   Collection catalogs = (Collection)request.getAttribute("catalogs");
   assertNotNull(catalogs);
   ]]></source>
  -        </s2>
  +        </section>
           
  -        <s2 title="Verifying tag output">
  +        <section title="Verifying tag output">
               <p>
                   Use the <code>endXXX</code> method to verify that your tag's 
                   methods have resulted in the correct data being written 
  @@ -411,16 +411,16 @@
       assertEquals("<b>expected output</b>", output);
   }
   ]]></source>
  -        </s2>
  +        </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Special Cases">
  +    <section title="Special Cases">
           <p>
               There are a few scenarios in custom tag testing that deserve extra
               attention.
           </p>
  -        <s2 title="Iteration Tags">
  +        <section title="Iteration Tags">
               <p>
                   To test a tag that repeats its body processing a number of 
                   times, simply create a <code>do-while</code> loop that mimics  
  @@ -446,9 +446,9 @@
                   in the example) to check whether the tag's body was processed 
                   the expected number of times.
               </p>
  -        </s2>
  +        </section>
           <anchor id="using_body_content"/>
  -        <s2 title="Body Tags">
  +        <section title="Body Tags">
               <p>
                   Unless specified otherwise by the deployment descriptor, all 
                   tags can include a body, which can in turn include other tags 
  @@ -525,18 +525,18 @@
                   correctly by verifying the total output in the 
                   <code>endXXX()</code> method.
               </note>
  -        </s2>
  -        <s2 title="TagExtraInfo classes">
  +        </section>
  +        <section title="TagExtraInfo classes">
               <p>
                   Cactus does not offer any specific services to support the 
                   testing of <code>TagExtraInfo</code> classes because they do 
                   not depend on any of the implicit objects.
               </p>
  -        </s2>
  -    </s1>
  +        </section>
  +    </section>
   
       <anchor id="further_integration"/>
  -    <s1 title="Further Integration Testing">
  +    <section title="Further Integration Testing">
           <p>
               You can use Cactus to test how your tag will react when put into a 
               real JSP. This allows you to verify that there are no problems with 
  @@ -552,7 +552,7 @@
               the more traditional methods described earlier to ensure 
               total coverage.
           </p>
  -        <s2 title="The test JSP">
  +        <section title="The test JSP">
               <p>
                   All the JSP needs to do is include the tag library that 
                   describes the tag you are testing and makes use of it in 
  @@ -585,9 +585,9 @@
                   call them in your test case after 
                   <code>pageContext.include()</code> (See below for an example.)
              </p>
  -        </s2>
  +        </section>
   
  -        <s2 title="The TestCase">
  +        <section title="The TestCase">
               <p>
                   To use the test JSP, include it from within a 
                   <code>JspTestCase.</code> 
  @@ -623,7 +623,7 @@
                   your build script should already deploy the redirector JSP, so 
                   it should be easy to include another JSP in the build process.
               </p>
  -        </s2>
  -    </s1>
  +        </section>
  +    </section>
     </body>
   </document>
  
  
  
  1.3       +26 -26    jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase_servlet.xml
  
  Index: howto_testcase_servlet.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/writing/howto_testcase_servlet.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto_testcase_servlet.xml	13 Jan 2003 13:08:53 -0000	1.2
  +++ howto_testcase_servlet.xml	15 Jan 2003 14:38:16 -0000	1.3
  @@ -11,7 +11,7 @@
   
     <body>
   
  -    <s1 title="When to use ?">
  +    <section title="When to use ?">
   
         <p>
           Your test case class should extend <code>ServletTestCase</code>
  @@ -27,9 +27,9 @@
           </li>
         </ul>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Provided Implicit Objects">
  +    <section title="Provided Implicit Objects">
   
         <p>
           Cactus automatically initializes the implicit objects for you and
  @@ -50,7 +50,7 @@
         </p>
   
         <anchor id="servlet_request"/>
  -      <s2 title="request">
  +      <section title="request">
   
           <table>
             <tr>
  @@ -95,7 +95,7 @@
             samples provided in the Cactus distribution.
           </p>
   
  -        <s3 title="Additional methods">
  +        <section title="Additional methods">
   
             <p>
               Cactus provides some additional methods to ease writing tests
  @@ -114,12 +114,12 @@
               </li>
             </ul>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
         <anchor id="servlet_response"/>
  -      <s2 title="response">
  +      <section title="response">
   
           <table>
             <tr>
  @@ -144,10 +144,10 @@
             Cactus does not wrap the response.
           </note>
   
  -      </s2>
  +      </section>
   
         <anchor id="servlet_config"/>
  -      <s2 title="config">
  +      <section title="config">
   
           <table>
             <tr>
  @@ -200,7 +200,7 @@
             samples provided in the Cactus distribution.
           </p>
   
  -        <s3 title="Additional methods">
  +        <section title="Additional methods">
   
             <p>
               Additional methods provided:
  @@ -218,12 +218,12 @@
               </li>
             </ul>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
         <anchor id="servlet_context"/>
  -      <s2 title="ServletContextWrapper">
  +      <section title="ServletContextWrapper">
   
           <p>
             This is not an implicit object per see (as it is not accessible as
  @@ -243,7 +243,7 @@
             samples provided in the Cactus distribution.
           </p>
   
  -        <s3 title="Additional methods">
  +        <section title="Additional methods">
   
             <p>
               Additional methods provided:
  @@ -256,12 +256,12 @@
               </li>
             </ul>
   
  -        </s3>
  +        </section>
   
  -      </s2>
  +      </section>
   
         <anchor id="servlet_session"/>
  -      <s2 title="session">
  +      <section title="session">
   
           <table>
             <tr>
  @@ -295,13 +295,13 @@
             "<code>request.getSession(false)</code>" is <code>null</code>.
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Tips and Tricks">
  +    <section title="Tips and Tricks">
   
  -      <s2 title="Parameter initialisation">
  +      <section title="Parameter initialisation">
   
           <p>
             If your code under test make use of any of the servlet methods
  @@ -332,11 +332,11 @@
             See the samples provided as part of the Cactus distribution.
           </p>
   
  -      </s2>
  +      </section>
   
  -    </s1>
  +    </section>
   
  -    <s1 title="Sample">
  +    <section title="Sample">
   
         <p>
           This is a very basic sample intended to give you a flavour of Servlet
  @@ -382,7 +382,7 @@
   }
   ]]></source>
   
  -    </s1>
  +    </section>
   
     </body>
   </document>
  
  
  

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