xml-general-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject cvs commit: xml-site/targets/cocoon/userdocs/xsp logicsheet-concepts.html
Date Mon, 10 Mar 2003 15:56:50 GMT
shannon     2003/03/10 07:56:49

  Modified:    targets/cocoon bylaws-addendum.html catalog-test.html
                        changes.html contrib.html doclist.html index.html
                        introduction.html license.html mail-archives.html
                        mail-lists.html news.html overview.html
                        performancetips.html todo.html who.html
               targets/cocoon/developing/webapps authentication.html
                        index.html portal.html session.html
               targets/cocoon/faq faq-configure-environment.html
                        faq-sitemap.html
               targets/cocoon/howto howto-author-core-docs.html
                        howto-author-faq.html howto-author-howto.html
                        howto-author-snippet.html howto-bugzilla.html
                        howto-flow-debugger.html
                        howto-html-pdf-publishing.html
                        howto-i18n-xmlform.html
                        howto-paginator-transformer.html howto-patch.html
                        index.html
               targets/cocoon/installing index.html jars.html updating.html
               targets/cocoon/link livesites.html training.html
               targets/cocoon/plan changes-doc.html release.html
               targets/cocoon/tutorial tutorial-rmi-generator.html
               targets/cocoon/userdocs/concepts catalog.html index.html
                        sitemap.html validation.html
               targets/cocoon/userdocs/serializers serializers.html
                        xls-serializer.html ziparchive-serializer.html
               targets/cocoon/userdocs/transformers
                        cinclude-transformer.html sql-transformer.html
               targets/cocoon/userdocs/xsp logicsheet-concepts.html
  Added:       targets/cocoon/howto howto-xindice-xmlform.html
  Log:
  site update
  
  Revision  Changes    Path
  1.3       +13 -48    xml-site/targets/cocoon/bylaws-addendum.html
  
  Index: bylaws-addendum.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/bylaws-addendum.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bylaws-addendum.html	4 Dec 2002 05:20:17 -0000	1.2
  +++ bylaws-addendum.html	10 Mar 2003 15:56:44 -0000	1.3
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -239,8 +239,8 @@
   </li>
   			           
   <li>
  -<font face="verdana, helvetica, sans serif">xml-cocoon CVS access</font>
  -</li>			           
  +<font face="verdana, helvetica, sans serif">cocoon-.* modules CVS access</font>
  +</li>
                       
   </ul>
   </blockquote>
  @@ -254,40 +254,6 @@
                                          
                      
   
  -	           
  -<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>Community: cocoon-apps</b></font>
  -                  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">Goal</font>
  -			        
  -<p>
  -<font color="black" face="verdana,helvetica,sanserif">Create, organize and maintain applications based on Cocoon.</font>
  -</p>
  -                     
  -                  
  -<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">Specific Resources</font>
  -			        
  -<blockquote>
  -<ul>
  -			           
  -<li>
  -<font face="verdana, helvetica, sans serif">xml-cocoon-apps CVS access</font>
  -</li>
  -			           
  -<li>
  -<font face="verdana, helvetica, sans serif">bugzilla</font>
  -</li>
  -                    
  -</ul>
  -</blockquote>
  -                     
  -                  
  -<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">Reference mailing list</font>
  -			        
  -<p>
  -<font color="black" face="verdana,helvetica,sanserif">cocoon-dev@xml.apache.org</font>
  -</p>
  -                                       
  -                   
  -                              
               
   		
   <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Repositories</font>
  @@ -298,31 +264,30 @@
   </p>
   
   	           
  -<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>xml-cocoon2</b></font>
  +<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>cocoon-2.0</b></font>
   			        
   <p>
  -<font color="black" face="verdana,helvetica,sanserif">The repository containing the Cocoon program source code.</font>
  +<font color="black" face="verdana,helvetica,sanserif">The repository containing the Cocoon 2.0.x program source code.</font>
   </p>
                      
   
   	           
  -<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>xml-cocoon-apps</b></font>
  +<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>cocoon-2.1</b></font>
   			        
   <p>
  -<font color="black" face="verdana,helvetica,sanserif">The repository containing the applications managed by the
  -                       cocoon-apps child comminuty.</font>
  +<font color="black" face="verdana,helvetica,sanserif">The repository containing the Cocoon 2.1.x program source code.</font>
   </p>
  -                  
  -               
  +                   
  +
                  
   <p>
   <table border="0" cellpadding="0" cellspacing="3" width="100%">
   <tr>
  -<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>xml-cocoon is the 1.x branch repository, kept only for history</i></font></td>
  +<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>cocoon-1 the 1.x branch repository, kept only for history</i></font></td>
   </tr>
   </table>
  -</p>               
  -            
  +</p>
  +        
   	
   
   </td>
  
  
  
  1.9       +2 -2      xml-site/targets/cocoon/catalog-test.html
  
  Index: catalog-test.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/catalog-test.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- catalog-test.html	4 Dec 2002 05:20:17 -0000	1.8
  +++ catalog-test.html	10 Mar 2003 15:56:44 -0000	1.9
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.32      +179 -70   xml-site/targets/cocoon/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/changes.html,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- changes.html	2 Jan 2003 00:02:19 -0000	1.31
  +++ changes.html	10 Mar 2003 15:56:44 -0000	1.32
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -191,19 +191,128 @@
   
    
   
  - <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b> 2.0.5-dev (January 2 2003)</b></font>
  + <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b> 2.0.5-dev (March 10 2003)</b></font>
   <ul>
     
   <li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +    The CVS repository for Cocoon 2.0 is now called "cocoon-2.0" (no branches, just HEAD).
  +  (PF)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +    Do not specify a default to the "class-loader" parameter in JavaLanguage
  +  (PAR)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  +    Add a NonStaticClassLoaderManager that does not keep internal static variables. Useful when
  +    putting cocoon.jar outside the WEB-INF/lib directory and have multiple XSP pages of the same
  +    name in multiple webapps
  +  (PAR)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +    Improve default exception handling behavior in CocoonServlet: show exception stacktrace
  +    only when log level is INFO or DEBUG, and add exception message to "Not Found" page.
  +  (VG) Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16267">bug 16267</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +    Use Environment.tryResetResponse() instead of HttpServletResponse.reset() in CocoonServlet
  +    to avoid IllegalStateException if response was already committed.
  +  (VG) Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16264">bug 16264</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  +    DatabaseReader: optionally read mimetype from database
  +  (CH)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  +    modular.DatabaseActions: added ability to store FileParts from uploads to
  +    "ascii", "clob", "blob", and "binary" columns. Added getSize() method to FilePart.
  +  (CH) Thanks to <a href="mailto:cocoon.at.leverageweb.com">Geoff Howard</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  +    (modular) DatabaseAction: added ability to use arbitrary path separators
  +    instead of "." (e.g. "/"), added ability to count rows from 1, added
  +    documentation.
  +  (CH)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  +    Created additional isolation level for some OutputModules.
  +  (CH)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +    Modify DeltaTimeCacheValidity toString method so it returns same value during some time
  +    (approximately equal to timeInCache parameter). This makes it possible to cache sources
  +    with delta validity. Note: 2.1 replaces it with Excalibur's TimeStampValidity.
  +  (VG) Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16240">bug 16240</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +   Postgresql 7.3: LIMIT x,y no longer supported. postgresql-old limit method
  +   still uses LIMIT x,y while postgresql uses the LIMIT x OFFSET y syntax
  +   which has been used by postgresql for some time now.
  +  (CH) Thanks to <a href="mailto:michael.enke.at.wincor-nixdorf.com">Michael Enke</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15064">bug 15064</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +   Extension to sendmail.xsp: lists for sendmail:cc
  +  (CH) Thanks to <a href="mailto:frank.ridderbusch.at.gmx.de">Frank Ridderbusch</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15005">bug 15005</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +   Added container/form-encoding init-params to web.xml
  +  (CH) Thanks to <a href="mailto:artur.at.digitalfairway.com">Artur Bialecki</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14835">bug 14835</a>.</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  +   Fixing various inefficient logging calls.
  +  (CH) Thanks to <a href="mailto:stuart.roebuck.at.adolos.co.uk">Stuart Roebuck</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15136">bug 15136</a>.</font>
  +</li>
  +  
  +<li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    Update XML Serializer, HTML Serializer , and Text Serializer documentation, 
  +    The "mime-type" attribute on &lt;map:read&gt; and &lt;map:serialize&gt; is now
  +    expanded if it contains sitemap variables.
  +  (SW)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  +    ZipArchiveSerializer now accepts inline content for entries of the zip archive
  +    and not only source URLs.
  +  (SW)</font>
  +</li>
  +  
  +<li>
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  +    Update XML Serializer, HTML Serializer , and Text Serializer documentation,
       added XHTML Serializer documentation in the serializer user documentation section.
     (BH)</font>
   </li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    Update SVG Serializer, SVG JPEG, and SVG PNG documentation, added 
  +    Update SVG Serializer, SVG JPEG, and SVG PNG documentation, added
       SVG TIFF documentation in the serializer user documentation section.
     (BH)</font>
   </li>
  @@ -229,34 +338,34 @@
       throw an exception on unsupported attributes but return null instead. Made
       this a configuration option.
     (CH)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
       SimpleMappingMetaModule: added feature to remove a prefix / suffix.
     (CH)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       "meta" input modules: configuring a different module locally did not
       override the default one in all circumstances.
     (CH)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       input.xml: renaming mixed up called template names from logicsheet-util.xsl
     (CH)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       SimpleFormTransfomer: fixed error tags when no validation data available.
     (CH)</font>
  -</li>  
  +</li>
    
  -</ul> 
  +</ul>
   
   <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b> 2.0.4 (December 06 2002)</b></font>
   <ul>
  @@ -296,7 +405,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -   Allow to set the i18n transformer's locale from the sitemap as a 
  +   Allow to set the i18n transformer's locale from the sitemap as a
      parameter (ported from 2.1-dev). The old behavior, based on LocaleAction is preserved
      only for 2.0.x versions and will be removed from the further releases (2.1 and higher).
     (KP)</font>
  @@ -330,16 +439,16 @@
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Changed SimpleFormTransformer to use InputModules.
     (CH)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Changed InputModules to return Iterator instead of Enumeration. New abstract
      "meta" module to make new meta modules easier. Stripped "meta" from defaults
  -   module. Added JXPathMetaModule. Added extension classes and packages to all 
  +   module. Added JXPathMetaModule. Added extension classes and packages to all
      modules that are based on JXPath.
     (CH)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  @@ -384,7 +493,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  -    Remove the static factory variable in RequestFactory, and instead 
  +    Remove the static factory variable in RequestFactory, and instead
       pass it to the HttpRequest via the environment.
     (VG) Thanks to <a href="mailto:leo.sutic.at.inspireinfrastructure.com">Leo Sutic</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13643">bug 13643</a>.</font>
   </li>
  @@ -740,7 +849,7 @@
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       Removed Java 1.3+ only method (URL.getPath()) from LinkStatusGenerator.
     (NKB)</font>
  -</li>     
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  @@ -763,7 +872,7 @@
       If true or not set, this class will try to catch and handle all Cocoon exceptions.
       If false, it will rethrow them to the servlet container.
     (NKB)</font>
  -</li> 
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  @@ -771,9 +880,9 @@
       There is no way in which this method could understand what mime/type to use from the
       notification info and the stream.
       It was added to the method using a ContentHandler, since it could output svg for example.
  -    The old methods were deprecated. 
  +    The old methods were deprecated.
     (NKB)</font>
  -</li> 
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  @@ -781,7 +890,7 @@
       the content-type is sent before sending the error and the notification messages are now more
       descriptive.
     (NKB) Thanks to <a href="mailto:j3322ptm.at.yahoo.de">J.Pietschmann</a>.</font>
  -</li> 
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  @@ -793,7 +902,7 @@
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       Fixed multipart request problems with IE6.
     (GF) Thanks to <a href="mailto:j.tervoorde.at.home.nl">Jeroen ter Voorde</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9064">bug 9064</a>.</font>
  -</li> 
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  @@ -803,7 +912,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -   Make the multipart/form-data parser aware of the encoding used by the 
  +   Make the multipart/form-data parser aware of the encoding used by the
      processed request.
     (SM)</font>
   </li>
  @@ -829,7 +938,7 @@
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
      Fixed NPE in I18nTransformer.
     (GF) Thanks to <a href="mailto:michael.enke.at.wincor-nixdorf.com">Michael Enke</a>. Fixes <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8743">bug 8743</a>.</font>
   </li>
  @@ -837,7 +946,7 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      i18n transformer changed to use shorter syntax for number formatting. Now 'type' attribute with
  -   'number', 'currency' and 'percent' should be used instead of 'type' and 'sub-type'combination. 
  +   'number', 'currency' and 'percent' should be used instead of 'type' and 'sub-type'combination.
     (KP) Thanks to Michael Enke.</font>
   </li>
     
  @@ -966,7 +1075,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    When including the scratchpad libs in the build, 
  +    When including the scratchpad libs in the build,
       all the scratchpad samples are copied too.
     (NKB)</font>
   </li>
  @@ -988,7 +1097,7 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
       Updated error reporting to add line, column and location
  -    attributes specified in SAXException and 
  +    attributes specified in SAXException and
       TransformerException.
       The error page in the webapp examples shows the new
       extra info.
  @@ -999,7 +1108,7 @@
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
       Added new "gump" target to the build, to be used as a general
       test of Cocoon code. To be used by Gump.
  -    It calls docs, javadocs, test and package.  
  +    It calls docs, javadocs, test and package.
       Gump descriptor has been modified to use it;
       now we also have automatic javadoc creation.
     (NKB)</font>
  @@ -1007,7 +1116,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    cocoon.xconf is moved in WEB-INF for security reasons. 
  +    cocoon.xconf is moved in WEB-INF for security reasons.
       The documentation has been updated to reflect the change.
     (NKB)</font>
   </li>
  @@ -1016,9 +1125,9 @@
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Partial commit of new samples structure.
      Samples go in samples/ dir with their own sitemap.
  -   All scratchpad samples that are in the samples/ subdir are 
  -   copied in webapp samples automatically by installscratchpadwar 
  -   target.  
  +   All scratchpad samples that are in the samples/ subdir are
  +   copied in webapp samples automatically by installscratchpadwar
  +   target.
     (NKB)</font>
   </li>
     
  @@ -1031,7 +1140,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -   The docs now have svg stuff removed and these enhancements: 
  +   The docs now have svg stuff removed and these enhancements:
      menu items are in text,
      page title is in text,
      pages have new clean style courtesy of Stefano,
  @@ -1049,7 +1158,7 @@
       "installscratchpadwar"  does the same but incudes
       scratchpad libs ans samples.
     (NKB)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  @@ -1090,7 +1199,7 @@
      Added new Jisp based persistence cache, to improve (1) performance and (2)
      to solve the problem with long filenames on Windows OS flavours.
     (VG)</font>
  -</li>  
  +</li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  @@ -1247,7 +1356,7 @@
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Added subprotocol "raw" to the cocoon: protocol. When the subprotocol is
      appended, the request parameters of the original request are not
  -   forwarded to the internal pipelines. Suggested by 
  +   forwarded to the internal pipelines. Suggested by
      Michael Hartle [mhartle.at.hartle-klug.com].
     (CZ)</font>
   </li>
  @@ -1351,8 +1460,8 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    Cache relies on two types of store components: (1) transient cache, 
  -    with cache-transient shorthand, and (2) persistent cache, with 
  +    Cache relies on two types of store components: (1) transient cache,
  +    with cache-transient shorthand, and (2) persistent cache, with
       cache-persistent shorthand.
     (VG)</font>
   </li>
  @@ -1389,7 +1498,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  -    Prevent PostInputStream from looping if the available() method of the base 
  +    Prevent PostInputStream from looping if the available() method of the base
       InputStream is returning 0.
     (GP)</font>
   </li>
  @@ -1439,7 +1548,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    Logicsheets are resolved using instance of url factory source resolver 
  +    Logicsheets are resolved using instance of url factory source resolver
       (URLFactorySourceResolver), and not the current request resolver (which
       is temporary object).
     (VG)</font>
  @@ -1447,9 +1556,9 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    Improve Lucene indexing. Only one Lucene document is created for one 
  +    Improve Lucene indexing. Only one Lucene document is created for one
       Cocoon resource. Document consists from 'body' field with all the text,
  -    'element' field for every &lt;element&gt;, and 'element@attribute' for 
  +    'element' field for every &lt;element&gt;, and 'element@attribute' for
       every attribute of the &lt;element&gt;.
     (VG)</font>
   </li>
  @@ -1457,7 +1566,7 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
      Fixed performance issues in the Store implementation:
  -   (1) removed the FilesystemQueueImpl, one thread less now, (2) changed swapping 
  +   (1) removed the FilesystemQueueImpl, one thread less now, (2) changed swapping
      alghorithm in the MRUMemoryStore towards less serialization, (3) Cache entries
      will be saved to the filesystem, when the System is shutdown cleanly, (4) fixed
      bug submitted by Peter Hargreaves [pdh.at.totalise.co.uk] in StoreJanitor
  @@ -1495,7 +1604,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -    Additions to sitemap syntax: (1) allow all elements at root level, not 
  +    Additions to sitemap syntax: (1) allow all elements at root level, not
       only matchers, (2) perform some validation checks, (3) perform attribute
       substitution on all attributes except @type and @label.
     (VG)</font>
  @@ -1527,7 +1636,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -    Added matchers: 
  +    Added matchers:
       RegexpHeaderMatcher, RegexpRequestAttributeMatcher,
       RegexpRequestParameterMatcher, RegexpSessionAttributeMatcher,
       RequestAttributeMatcher, SessionAttributeMatcher,
  @@ -1600,7 +1709,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -    Added special lifecycle interface for Cocoon components: RequestLifecycle.   
  +    Added special lifecycle interface for Cocoon components: RequestLifecycle.
       A component marked by this interface has the lifecycle of one request,
       so looking up the role twice during the same request results in the same
       component.
  @@ -1647,7 +1756,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  -    XSP page were called twice if used as a source of XSLT stylesheet due to multiple calls to 
  +    XSP page were called twice if used as a source of XSLT stylesheet due to multiple calls to
       Source.getInputSource() in XSLProcessorImpl.
     (VG) Thanks to <a href="mailto:Wolfram.Eisert.at.Dresdner-Bank.com">Eisert, Wolfram</a>.</font>
   </li>
  @@ -1810,7 +1919,7 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
       Updated TraxTransformer and XSLTProcessor to allow simultaneous use of several
  -    TRAX processors (e.g. xalan and saxon) in a controlled way. 
  +    TRAX processors (e.g. xalan and saxon) in a controlled way.
     (SW)</font>
   </li>
     
  @@ -1839,7 +1948,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    When Cocoon is reloaded, the logkit configuration is now also reloading. 
  +    When Cocoon is reloaded, the logkit configuration is now also reloading.
       This enables changing the logkit settings during runtime.
     (CZ)</font>
   </li>
  @@ -1854,13 +1963,13 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       Applied NPE fix in certain conditions in ServerPagesGenerator.
  -    Submitted by: Ovidiu Predescu [ovidiu.at.cup.hp.com] 
  +    Submitted by: Ovidiu Predescu [ovidiu.at.cup.hp.com]
     (CZ)</font>
   </li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  -    Applied NPE fix for MRUMemoryStore Submitted by: Ovidiu Predescu [ovidiu.at.cup.hp.com] 
  +    Applied NPE fix for MRUMemoryStore Submitted by: Ovidiu Predescu [ovidiu.at.cup.hp.com]
     (CZ)</font>
   </li>
     
  @@ -1872,28 +1981,28 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
  -    Optional setting of the lexical-handler for XMLReader. This patch allows to use 
  -    Crimson instead of Xerces. Submitted by: Ovidiu Predescu [ovidiu.at.cup.hp.com] 
  +    Optional setting of the lexical-handler for XMLReader. This patch allows to use
  +    Crimson instead of Xerces. Submitted by: Ovidiu Predescu [ovidiu.at.cup.hp.com]
     (CZ)</font>
   </li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
  -    Added xml compiler and interpreter to cocoon.xconf 
  +    Added xml compiler and interpreter to cocoon.xconf
     (CZ)</font>
   </li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       Applied Patch for entity catalogs: accept parameters from xconf.
  -    Submitted by: David Crossley [crossley.at.indexgeo.com.au] 
  +    Submitted by: David Crossley [crossley.at.indexgeo.com.au]
     (CZ)</font>
   </li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       Applied fix for missing "User-Agent" header in BrowserSelectorFactory.
  -    Submitted by: Joerg Henne [j.henne.at.levigo.de] 
  +    Submitted by: Joerg Henne [j.henne.at.levigo.de]
     (CZ)</font>
   </li>
     
  @@ -1908,14 +2017,14 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
       Applied patch for default value support for RequestParamAction.
  -    Submitted by: Sergio Carvalho [sergio.carvalho.at.acm.org] 
  +    Submitted by: Sergio Carvalho [sergio.carvalho.at.acm.org]
     (CZ)</font>
   </li>
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
       Applied fix for a bug in the WriteDOMSessionTransformer for handling xml documents
  -    with namespaces correctly. Submitted by: Greg Weinger [gweinger.at.itmedicine.net] 
  +    with namespaces correctly. Submitted by: Greg Weinger [gweinger.at.itmedicine.net]
     (CZ)</font>
   </li>
    
  @@ -1975,7 +2084,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -   New log formatter outputs the caller class and request URI in the log file. 
  +   New log formatter outputs the caller class and request URI in the log file.
     (SW)</font>
   </li>
     
  @@ -2001,7 +2110,7 @@
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
       When a resource is not found (ResourceNotFoundException) the
  -    servlet sets only the status 404 and doesn't write to the output.    
  +    servlet sets only the status 404 and doesn't write to the output.
     (CZ)</font>
   </li>
     
  @@ -2027,7 +2136,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
  -    Redirects are handled when the cocoon: url points to a redirect in 
  +    Redirects are handled when the cocoon: url points to a redirect in
       the sitemaps.
     (CZ)</font>
   </li>
  @@ -2371,7 +2480,7 @@
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      SVG serializer now uses Batik.
     (RB)</font>
   </li>
  @@ -2424,7 +2533,7 @@
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
      Added a more complete SVG serializer.
     (RB)</font>
   </li>
  @@ -2454,37 +2563,37 @@
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
      Improved the samples and the webapp sitemap.
     (SM)</font>
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Cleaned build system in order to be friendly to ASF-wide build procedures.
     (SM)</font>
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Updated installation section (JServ no longer supported).
     (SM)</font>
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Updated Xerces and FOP to latest versions.
     (SM)</font>
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="fix" src="images/fix.jpg">
      Patched for final SAX2 compatibility.
     (SM)</font>
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="update" src="images/update.jpg">
      Improved installation documentation.
     (SM) Thanks to <a href="mailto:svenk.at.tzi.org">Sven K&uuml;nzler</a>.</font>
   </li>
  @@ -2508,7 +2617,7 @@
   </li>
     
   <li>
  -<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg"> 
  +<font face="verdana, helvetica, sans serif"><img align="absmiddle" border="0" alt="add" src="images/add.jpg">
      Fixed order of filters that was backwards.
     (SM) Thanks to <a href="mailto:ssahuc.at.imediation.com">Sebastien Sahuc</a>.</font>
   </li>
  
  
  
  1.12      +10 -37    xml-site/targets/cocoon/contrib.html
  
  Index: contrib.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/contrib.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- contrib.html	4 Dec 2002 05:20:18 -0000	1.11
  +++ contrib.html	10 Mar 2003 15:56:44 -0000	1.12
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -223,10 +223,10 @@
     
   <p>
   <font color="black" face="verdana,helvetica,sanserif">You can get your local working copy of the
  -   <a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">latest and
  -   greatest code</a> (which you find in the xml-cocoon2 module in
  +   <a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">latest and
  +   greatest code</a> (which you find in the cocoon-2.0 module in
      the cvs.apache.org CVS code repository, or from the
  -   <a href="http://xml.apache.org/from-cvs/xml-cocoon2/">CVS snapshots</a>).
  +   <a href="http://xml.apache.org/from-cvs/cocoon-2.0/">CVS snapshots</a>).
      Review the <a href="todo.html">todo</a> list, choose a task
      (or perhaps you have noticed something that needs patching). Make the
      changes, do the testing, generate a patch, if you need then discuss it on
  @@ -525,7 +525,7 @@
   <font color="black" face="verdana,helvetica,sanserif">
      This will checkout the current copy of the master cvs repository and
      download it to your local disk. It will create a sub-directory called
  -   <code><font face="courier, monospaced">xml-cocoon2</font></code>
  +   <code><font face="courier, monospaced">cocoon-2.0</font></code>
     </font>
   </p>
   
  @@ -546,7 +546,7 @@
   </li>
      
   <li>
  -<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout xml-cocoon2</font></code></font>
  +<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout cocoon-2.0</font></code></font>
   </li>
      
   <li>
  @@ -554,7 +554,7 @@
   </li>
      
   <li>
  -<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cd xml-cocoon2</font></code></font>
  +<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cd cocoon-2.0</font></code></font>
   </li>
     
   </ol>
  @@ -600,7 +600,7 @@
   </li>
      
   <li>
  -<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic update -d -P xml-cocoon2</font></code></font>
  +<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic update -d -P cocoon-2.0</font></code></font>
   </li>
      
   <li>
  @@ -649,7 +649,7 @@
   </li>
      
   <li>
  -<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cd /usr/local/cvs/xml-cocoon2/xdocs</font></code></font>
  +<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cd /usr/local/cvs/cocoon-2.0/xdocs</font></code></font>
   </li>
      
   <li>
  @@ -668,33 +668,6 @@
   </blockquote>
    
   
  - 
  -<font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>How to get other CVS branches</b></font>
  -  
  -<p>
  -<font color="black" face="verdana,helvetica,sanserif">OK that got the HEAD branch of CVS into your local working copy.
  -   If you want some other branch, then find the relevant branch name
  -   from ViewCVS
  -   <a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/</a> (see the Tags list at the bottom).
  -   Then follow the same checkout procedure described above, using this ...
  -  </font>
  -</p>
  -
  -  
  -<blockquote>
  -<ul>
  -   
  -<li>
  -<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cd /usr/local/cvs/cocoon_some_branch</font></code></font>
  -</li>
  -   
  -<li>
  -<font face="verdana, helvetica, sans serif"><code><font face="courier, monospaced">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout -r cocoon_2_0_3_branch xml-cocoon2</font></code></font>
  -</li>
  -  
  -</ul>
  -</blockquote>
  - 
    
   
    
  
  
  
  1.13      +8 -26     xml-site/targets/cocoon/doclist.html
  
  Index: doclist.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/doclist.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- doclist.html	2 Jan 2003 00:02:20 -0000	1.12
  +++ doclist.html	10 Mar 2003 15:56:44 -0000	1.13
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -358,11 +358,11 @@
   </li>
       
   <li>
  -<font face="verdana, helvetica, sans serif"><a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></font>
  +<font face="verdana, helvetica, sans serif"><a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></font>
   </li>
       
   <li>
  -<font face="verdana, helvetica, sans serif"><a href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></font>
  +<font face="verdana, helvetica, sans serif"><a href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></font>
   </li>
     
   </ul>
  @@ -1371,28 +1371,6 @@
   </ul>
   </blockquote>
   
  -  
  -<p>
  -<font color="black" face="verdana,helvetica,sanserif"><b>Scratchpad</b></font>
  -</p>
  -<blockquote>
  -<ul>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif"><a href="developing/webapps/sunshine.html">Session Contexts</a></font>
  -</li>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif"><a href="developing/webapps/sunrise.html">Authentication</a></font>
  -</li>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif"><a href="developing/webapps/sunspot.html">Portal</a></font>
  -</li>
  -  
  -</ul>
  -</blockquote>
  -
   
   <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Apache Cocoon Tutorial Documentation</font>
   <hr style="color: #0086b2" size="1">
  @@ -1477,6 +1455,10 @@
       
   <li>
   <font face="verdana, helvetica, sans serif"><a href="howto/howto-flow-debugger.html">Flow Debugger</a></font>
  +</li>
  +    
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="howto/howto-xindice-xmlform.html">Xindice XMLForm</a></font>
   </li>
     
   </ul>
  
  
  
  1.32      +3 -3      xml-site/targets/cocoon/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/index.html,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- index.html	6 Dec 2002 15:30:53 -0000	1.31
  +++ index.html	10 Mar 2003 15:56:44 -0000	1.32
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -228,7 +228,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
      To download the latest release 2.0.4 of Apache Cocoon, go to the 
  -   <a href="http://xml.apache.org/cocoon/dist/">download area.</a>
  +   <a href="http://cocoon.apache.org/dist/">download area.</a>
   			</font>
   </p>
   			
  
  
  
  1.8       +2 -2      xml-site/targets/cocoon/introduction.html
  
  Index: introduction.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/introduction.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- introduction.html	4 Dec 2002 05:20:18 -0000	1.7
  +++ introduction.html	10 Mar 2003 15:56:44 -0000	1.8
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.23      +3 -3      xml-site/targets/cocoon/license.html
  
  Index: license.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/license.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- license.html	4 Dec 2002 05:20:18 -0000	1.22
  +++ license.html	10 Mar 2003 15:56:44 -0000	1.23
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -206,7 +206,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
    
  - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
    
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  
  
  
  1.14      +2 -2      xml-site/targets/cocoon/mail-archives.html
  
  Index: mail-archives.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/mail-archives.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mail-archives.html	28 Dec 2002 10:53:55 -0000	1.13
  +++ mail-archives.html	10 Mar 2003 15:56:44 -0000	1.14
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.13      +2 -2      xml-site/targets/cocoon/mail-lists.html
  
  Index: mail-lists.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/mail-lists.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mail-lists.html	28 Dec 2002 10:53:55 -0000	1.12
  +++ mail-lists.html	10 Mar 2003 15:56:44 -0000	1.13
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.5       +7 -7      xml-site/targets/cocoon/news.html
  
  Index: news.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/news.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- news.html	28 Dec 2002 10:53:55 -0000	1.4
  +++ news.html	10 Mar 2003 15:56:44 -0000	1.5
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -188,8 +188,8 @@
   <table cellspacing="15" cellpadding="0" border="0">
   <tr>
   <td>
  -	
  -	
  +  
  +  
     <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Wiki Moving</font>
   <hr style="color: #0086b2" size="1">
       
  @@ -205,7 +205,7 @@
   <font color="black" face="verdana,helvetica,sanserif">Outerthought is organizing the <a href="http://outerthought.org/cocoon/gettogether/">Cocoon GetTogether</a> on 19 November 2002 (near Ghent in Belgium).</font>
   </p>
   
  -		
  +    
   <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Cocoon: Building XML Applications Published</font>
   <hr style="color: #0086b2" size="1">
     
  @@ -229,7 +229,7 @@
     
   <li>
   <font face="verdana, helvetica, sans serif">
  -<a href="http://outerthought.net/wiki/">Cocoon Wiki</a> focuses on content development for the Cocoon project. It is designed to facilitate document development and collaboration from all levels of Cocoon users. Documents include FAQs, snippets, how-tos, tutorials, RTs (random thoughts), dreams, surveys, and more. The preliminary focus of this the wiki is to serve as a documentation "breeding ground," where docs can "grow" until mature enough to become official cvs docs. However, it already represents a lively and valid document resource in its own right.
  +<a href="http://wiki.cocoondev.org/">Cocoon Wiki</a> focuses on content development for the Cocoon project. It is designed to facilitate document development and collaboration from all levels of Cocoon users. Documents include FAQs, snippets, how-tos, tutorials, RTs (random thoughts), dreams, surveys, and more. The preliminary focus of this the wiki is to serve as a documentation "breeding ground," where docs can "grow" until mature enough to become official cvs docs. However, it already represents a lively and valid document resource in its own right.
     </font>
   </li>
     
  @@ -242,7 +242,7 @@
   </ul>
   </blockquote>
   
  -	
  +  
   
   </td>
   </tr>
  
  
  
  1.10      +2 -2      xml-site/targets/cocoon/overview.html
  
  Index: overview.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/overview.html,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- overview.html	4 Dec 2002 05:20:18 -0000	1.9
  +++ overview.html	10 Mar 2003 15:56:44 -0000	1.10
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.7       +2 -2      xml-site/targets/cocoon/performancetips.html
  
  Index: performancetips.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/performancetips.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- performancetips.html	4 Dec 2002 05:20:18 -0000	1.6
  +++ performancetips.html	10 Mar 2003 15:56:44 -0000	1.7
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.26      +2 -2      xml-site/targets/cocoon/todo.html
  
  Index: todo.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/todo.html,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- todo.html	28 Dec 2002 10:53:56 -0000	1.25
  +++ todo.html	10 Mar 2003 15:56:44 -0000	1.26
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  
  
  
  1.12      +14 -2     xml-site/targets/cocoon/who.html
  
  Index: who.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/who.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- who.html	28 Dec 2002 10:53:56 -0000	1.11
  +++ who.html	10 Mar 2003 15:56:44 -0000	1.12
  @@ -154,10 +154,10 @@
   <td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://nagoya.apache.org/bugzilla/index.html">Bug Database</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">Code Repository</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">Code Repository</a></td>
   </tr>
   <tr>
  -<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/xml-cocoon2/">Dev Snapshots</a></td>
  +<td valign="top" background="images/label-background_a.gif" bgcolor="#959595"><a class="menu" target="new" href="http://xml.apache.org/from-cvs/cocoon-2.0/">Dev Snapshots</a></td>
   </tr>
   <tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  @@ -252,6 +252,10 @@
   </li>
         
   <li>
  +<font face="verdana, helvetica, sans serif">Bruno Dumon (bruno.at.apache.org)</font>
  +</li>
  +      
  +<li>
   <font face="verdana, helvetica, sans serif">Vadim Gritsenko (vgritsenko.at.apache.org)</font>
   </li>
         
  @@ -276,6 +280,10 @@
   </li>
         
   <li>
  +<font face="verdana, helvetica, sans serif">Michael Melhem (michaelm.at.apache.org)</font>
  +</li>
  +      
  +<li>
   <font face="verdana, helvetica, sans serif">Stephan Michels (stephan.at.apache.org)</font>
   </li>
         
  @@ -401,6 +409,10 @@
         
   <li>
   <font face="verdana, helvetica, sans serif">Peter Donald (donaldp.at.apache.org)</font>
  +</li>
  +      
  +<li>
  +<font face="verdana, helvetica, sans serif">Pier Fumagalli (pier.at.apache.org)</font>
   </li>
         
   <li>
  
  
  
  1.3       +0 -24     xml-site/targets/cocoon/developing/webapps/authentication.html
  
  Index: authentication.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/developing/webapps/authentication.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- authentication.html	19 Oct 2002 13:32:54 -0000	1.2
  +++ authentication.html	10 Mar 2003 15:56:45 -0000	1.3
  @@ -88,19 +88,6 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="portal.html">Portal</a></td>
   </tr>
   <tr>
  -<td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  -<span class="menutitle">Scratchpad</span></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunshine.html">Session Contexts</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunrise.html">Authentication</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunspot.html">Portal</a></td>
  -</tr>
  -<tr>
   <td align="left" valign="top"><img width="120" vspace="0" src="images/close.gif" hspace="0" height="14" border="0"><br>
   </td>
   </tr>
  @@ -113,17 +100,6 @@
       
     <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Introduction</font>
   <hr style="color: #0086b2" size="1">
  -    
  -<p>
  -<table border="0" cellpadding="0" cellspacing="3" width="100%">
  -<tr>
  -<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>IMPORTANT: This document conforms to the development version of Cocoon. So
  -        you will only find these components in the current CVS. An early alpha version is already
  -        available in the latest release of Cocoon, you will find an introduction <a href="sunrise.html">here</a>.
  -    </i></font></td>
  -</tr>
  -</table>
  -</p>
        
   <p>
   <font color="black" face="verdana,helvetica,sanserif">The central point for building a web application is authentication. The Cocoon
  
  
  
  1.4       +0 -13     xml-site/targets/cocoon/developing/webapps/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/developing/webapps/index.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.html	6 Dec 2002 15:30:58 -0000	1.3
  +++ index.html	10 Mar 2003 15:56:45 -0000	1.4
  @@ -88,19 +88,6 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="portal.html">Portal</a></td>
   </tr>
   <tr>
  -<td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  -<span class="menutitle">Scratchpad</span></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunshine.html">Session Contexts</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunrise.html">Authentication</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunspot.html">Portal</a></td>
  -</tr>
  -<tr>
   <td align="left" valign="top"><img width="120" vspace="0" src="images/close.gif" hspace="0" height="14" border="0"><br>
   </td>
   </tr>
  
  
  
  1.3       +0 -24     xml-site/targets/cocoon/developing/webapps/portal.html
  
  Index: portal.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/developing/webapps/portal.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portal.html	19 Oct 2002 13:32:54 -0000	1.2
  +++ portal.html	10 Mar 2003 15:56:45 -0000	1.3
  @@ -88,19 +88,6 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><span class="menuselected">Portal</span></td>
   </tr>
   <tr>
  -<td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  -<span class="menutitle">Scratchpad</span></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunshine.html">Session Contexts</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunrise.html">Authentication</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunspot.html">Portal</a></td>
  -</tr>
  -<tr>
   <td align="left" valign="top"><img width="120" vspace="0" src="images/close.gif" hspace="0" height="14" border="0"><br>
   </td>
   </tr>
  @@ -113,17 +100,6 @@
       
     <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Introduction</font>
   <hr style="color: #0086b2" size="1">
  -    
  -<p>
  -<table border="0" cellpadding="0" cellspacing="3" width="100%">
  -<tr>
  -<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i><b>IMPORTANT:</b> This document conforms to the development version of Cocoon. So
  -        you will only find these components in the current CVS. An early alpha version is already
  -        available in the latest release of Cocoon, you will find an introduction <a href="sunspot.html">here</a>.
  -    </i></font></td>
  -</tr>
  -</table>
  -</p>
        
   <p>
   <font color="black" face="verdana,helvetica,sanserif">The portal engine of Cocoon provides the required
  
  
  
  1.4       +0 -24     xml-site/targets/cocoon/developing/webapps/session.html
  
  Index: session.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/developing/webapps/session.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- session.html	19 Oct 2002 13:32:54 -0000	1.3
  +++ session.html	10 Mar 2003 15:56:45 -0000	1.4
  @@ -88,19 +88,6 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="portal.html">Portal</a></td>
   </tr>
   <tr>
  -<td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  -<span class="menutitle">Scratchpad</span></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunshine.html">Session Contexts</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunrise.html">Authentication</a></td>
  -</tr>
  -<tr>
  -<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="sunspot.html">Portal</a></td>
  -</tr>
  -<tr>
   <td align="left" valign="top"><img width="120" vspace="0" src="images/close.gif" hspace="0" height="14" border="0"><br>
   </td>
   </tr>
  @@ -113,17 +100,6 @@
       
     <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Introduction</font>
   <hr style="color: #0086b2" size="1">
  -    
  -<p>
  -<table border="0" cellpadding="0" cellspacing="3" width="100%">
  -<tr>
  -<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i><b>IMPORTANT:</b> This document conforms to the development version of Cocoon. So
  -        you will only find these components in the current CVS. An early alpha version is already
  -        available in the latest release of Cocoon, you will find an introduction <a href="sunshine.html">here</a>.
  -    </i></font></td>
  -</tr>
  -</table>
  -</p>
        
   <p>
   <font color="black" face="verdana,helvetica,sanserif">A session is a data storage which resides on the server and records
  
  
  
  1.4       +10 -1     xml-site/targets/cocoon/faq/faq-configure-environment.html
  
  Index: faq-configure-environment.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/faq/faq-configure-environment.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- faq-configure-environment.html	19 Oct 2002 13:32:54 -0000	1.3
  +++ faq-configure-environment.html	10 Mar 2003 15:56:46 -0000	1.4
  @@ -623,7 +623,16 @@
       
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -      You need to use mod_jk. Add the following line to <code><font face="courier, monospaced">%APACHE_HOME%\conf\httpd.conf</font></code>
  +      See the Wiki page 
  +      <a href="http://wiki.cocoondev.org/Wiki.jsp?page=ApacheModProxy">ApacheModProxy</a>
  +      for a thorough discussion of this topic.
  +    </font>
  +</p>
  +    
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +      Another method is to use mod_jk. Add the following line to
  +      <code><font face="courier, monospaced">%APACHE_HOME%\conf\httpd.conf</font></code>
       </font>
   </p>
       
  
  
  
  1.7       +1 -1      xml-site/targets/cocoon/faq/faq-sitemap.html
  
  Index: faq-sitemap.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/faq/faq-sitemap.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- faq-sitemap.html	28 Dec 2002 10:54:48 -0000	1.6
  +++ faq-sitemap.html	10 Mar 2003 15:56:46 -0000	1.7
  @@ -713,7 +713,7 @@
     
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -Check out a draft XML Schema <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain">grammar for the Cocoon sitemap</a>, and some <a href="http://outerthought.net/sitemap/">external documentation</a> generated from this Schema. A poster diagram of the sitemap structure is also available.
  +Check out a draft XML Schema <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.0/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain">grammar for the Cocoon sitemap</a>, and some <a href="http://outerthought.net/sitemap/">external documentation</a> generated from this Schema. A poster diagram of the sitemap structure is also available.
      </font>
   </p>
     
  
  
  
  1.6       +5 -2      xml-site/targets/cocoon/howto/howto-author-core-docs.html
  
  Index: howto-author-core-docs.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-author-core-docs.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- howto-author-core-docs.html	28 Dec 2002 10:54:48 -0000	1.5
  +++ howto-author-core-docs.html	10 Mar 2003 15:56:46 -0000	1.6
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -233,7 +236,7 @@
   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -Perhaps the easiest way to start a new document is to use an existing document as a template. If you are revising an existing document, make sure you are using the most recent copy of the document from CVS HEAD. If you aren't working with a local CVS repository, you can access all CVS files through <a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">ViewCVS</a>.
  +Perhaps the easiest way to start a new document is to use an existing document as a template. If you are revising an existing document, make sure you are using the most recent copy of the document from CVS HEAD. If you aren't working with a local CVS repository, you can access all CVS files through <a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">ViewCVS</a>.
   </font>
   </p>
   	
  @@ -283,7 +286,7 @@
   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -If your work impacts the content of other files, for example the menu file (known as book.xml), consider updating these documents as well. You can validate and check link targets within all your documents by performing a docs build. If you have a working copy of the cvs HEAD, run the appropriate build script inside the xml-cocoon2 directory, specifying docs as the build target. Here's an example: 
  +If your work impacts the content of other files, for example the menu file (known as book.xml), consider updating these documents as well. You can validate and check link targets within all your documents by performing a docs build. If you have a working copy of the cvs HEAD, run the appropriate build script inside the cocoon-2.0 directory, specifying docs as the build target. Here's an example: 
   </font>
   </p> 
   
  
  
  
  1.7       +5 -2      xml-site/targets/cocoon/howto/howto-author-faq.html
  
  Index: howto-author-faq.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-author-faq.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto-author-faq.html	28 Dec 2002 10:54:48 -0000	1.6
  +++ howto-author-faq.html	10 Mar 2003 15:56:46 -0000	1.7
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -219,7 +222,7 @@
   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -If you plan to edit an existing file, make sure you are working with the most recent version. The Cocoon project's cvs stores documentation files in multiple branches. The HEAD and release branches should be in sync for documentation. However, should there be some unintentional discrepancy, the HEAD branch is more likely to contain the most recently updated files. If you have a checked-out version of the cvs HEAD branch, make sure to run a cvs update before beginning your work on any specific file. If you don't have the cvs HEAD branch, you can obtain a list of <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/faq/">all current FAQ files</a> through browser-based ViewCVS.
  +If you plan to edit an existing file, make sure you are working with the most recent version. The Cocoon project's cvs stores documentation files in multiple branches. The HEAD and release branches should be in sync for documentation. However, should there be some unintentional discrepancy, the HEAD branch is more likely to contain the most recently updated files. If you have a checked-out version of the cvs HEAD branch, make sure to run a cvs update before beginning your work on any specific file. If you don't have the cvs HEAD branch, you can obtain a list of <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.0/src/documentation/xdocs/faq/">all current FAQ files</a> through browser-based ViewCVS.
   </font>
   </p>
   	
  @@ -291,7 +294,7 @@
   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -If you are contributing a new FAQ file, it will help committers if you also edit the FAQ main (index.xml) and menu (book.xml) files found at src/documentation/xdocs/faq/ to include links to your new FAQ file. You can validate these files with their corresponding dtds as specified in their DOCTYPE statements. If you have a working copy of the cvs HEAD, make sure you check this additional work by performing a docs build. To do this, run the appropriate build script inside the xml-cocoon2 directory, specifying docs as the build target. A docs build not only validates your files but also checks for broken links.</font>
  +If you are contributing a new FAQ file, it will help committers if you also edit the FAQ main (index.xml) and menu (book.xml) files found at src/documentation/xdocs/faq/ to include links to your new FAQ file. You can validate these files with their corresponding dtds as specified in their DOCTYPE statements. If you have a working copy of the cvs HEAD, make sure you check this additional work by performing a docs build. To do this, run the appropriate build script inside the cocoon-2.0 directory, specifying docs as the build target. A docs build not only validates your files but also checks for broken links.</font>
   </p> 
   	
   	
  
  
  
  1.7       +4 -1      xml-site/targets/cocoon/howto/howto-author-howto.html
  
  Index: howto-author-howto.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-author-howto.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto-author-howto.html	28 Dec 2002 10:54:48 -0000	1.6
  +++ howto-author-howto.html	10 Mar 2003 15:56:46 -0000	1.7
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -347,7 +350,7 @@
   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -It would help committers if you also edited the How-To main (index.xml) and menu (book.xml) files found at src/documentation/xdocs/howto/ to include links to your new How-To. You can validate these files with their corresponding dtds as specified in their DOCTYPE statements. If you have a working copy of the cvs HEAD, make sure you check this additional work by performing a docs build. To do this, run the appropriate build script inside the xml-cocoon2 directory, specifying docs as the build target. A docs build not only validates your files but also checks for broken links.</font>
  +It would help committers if you also edited the How-To main (index.xml) and menu (book.xml) files found at src/documentation/xdocs/howto/ to include links to your new How-To. You can validate these files with their corresponding dtds as specified in their DOCTYPE statements. If you have a working copy of the cvs HEAD, make sure you check this additional work by performing a docs build. To do this, run the appropriate build script inside the cocoon-2.0 directory, specifying docs as the build target. A docs build not only validates your files but also checks for broken links.</font>
   </p> 
   	
   	
  
  
  
  1.7       +4 -1      xml-site/targets/cocoon/howto/howto-author-snippet.html
  
  Index: howto-author-snippet.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-author-snippet.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto-author-snippet.html	28 Dec 2002 10:54:48 -0000	1.6
  +++ howto-author-snippet.html	10 Mar 2003 15:56:46 -0000	1.7
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -293,7 +296,7 @@
   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -If you are contributing a new Code Snippet file, it will help committers if you also edit the Code Snippet main (index.xml) and menu (book.xml) files found at src/documentation/xdocs/snippet/ to include links to your new Snippet file. You can validate these files with their corresponding dtds as specified in their DOCTYPE statements. If you have a working copy of the cvs, make sure you check this additional work by performing a docs build. To do this, run the appropriate build script inside the xml-cocoon2 directory, specifying docs as the build target. A docs build not only validates your files but also checks for broken links.
  +If you are contributing a new Code Snippet file, it will help committers if you also edit the Code Snippet main (index.xml) and menu (book.xml) files found at src/documentation/xdocs/snippet/ to include links to your new Snippet file. You can validate these files with their corresponding dtds as specified in their DOCTYPE statements. If you have a working copy of the cvs, make sure you check this additional work by performing a docs build. To do this, run the appropriate build script inside the cocoon-2.0 directory, specifying docs as the build target. A docs build not only validates your files but also checks for broken links.
   </font>
   </p> 
   	
  
  
  
  1.7       +3 -0      xml-site/targets/cocoon/howto/howto-bugzilla.html
  
  Index: howto-bugzilla.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-bugzilla.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto-bugzilla.html	28 Dec 2002 10:54:48 -0000	1.6
  +++ howto-bugzilla.html	10 Mar 2003 15:56:46 -0000	1.7
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  
  
  
  1.2       +5 -2      xml-site/targets/cocoon/howto/howto-flow-debugger.html
  
  Index: howto-flow-debugger.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-flow-debugger.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto-flow-debugger.html	31 Dec 2002 05:56:02 -0000	1.1
  +++ howto-flow-debugger.html	10 Mar 2003 15:56:46 -0000	1.2
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><span class="menuselected">Flow Debugger</span></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -189,7 +192,7 @@
   	  
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -		Until Cocoon 2.1 is released, to use the flow debugger you will need a CVS <a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">version</a> or development <a href="http://xml.apache.org/from-cvs/xml-cocoon2/">snapshot</a> of Cocoon, at least as recent as 7th December 2002.
  +		Until Cocoon 2.1 is released, to use the flow debugger you will need a CVS <a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/">version</a> or development <a href="http://xml.apache.org/from-cvs/cocoon-2.0/">snapshot</a> of Cocoon, at least as recent as 7th December 2002.
   	  </font>
   </p>
   	  
  @@ -293,7 +296,7 @@
   <p>
   <table border="0" cellpadding="0" cellspacing="3" width="100%">
   <tr>
  -<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>Portions of Cocoon's flow script management <a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/system.js?rev=HEAD&content-type=text/vnd.viewcvs-markup">code</a> will also be viewable in the debugger.</i></font></td>
  +<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>Portions of Cocoon's flow script management <a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/src/java/org/apache/cocoon/components/flow/javascript/system.js?rev=HEAD&content-type=text/vnd.viewcvs-markup">code</a> will also be viewable in the debugger.</i></font></td>
   </tr>
   </table>
   </p>
  
  
  
  1.6       +3 -0      xml-site/targets/cocoon/howto/howto-html-pdf-publishing.html
  
  Index: howto-html-pdf-publishing.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-html-pdf-publishing.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- howto-html-pdf-publishing.html	28 Dec 2002 10:54:48 -0000	1.5
  +++ howto-html-pdf-publishing.html	10 Mar 2003 15:56:46 -0000	1.6
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  
  
  
  1.3       +3 -0      xml-site/targets/cocoon/howto/howto-i18n-xmlform.html
  
  Index: howto-i18n-xmlform.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-i18n-xmlform.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- howto-i18n-xmlform.html	28 Dec 2002 10:54:48 -0000	1.2
  +++ howto-i18n-xmlform.html	10 Mar 2003 15:56:46 -0000	1.3
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  
  
  
  1.6       +3 -0      xml-site/targets/cocoon/howto/howto-paginator-transformer.html
  
  Index: howto-paginator-transformer.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-paginator-transformer.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- howto-paginator-transformer.html	28 Dec 2002 10:54:48 -0000	1.5
  +++ howto-paginator-transformer.html	10 Mar 2003 15:56:46 -0000	1.6
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  
  
  
  1.7       +6 -3      xml-site/targets/cocoon/howto/howto-patch.html
  
  Index: howto-patch.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/howto-patch.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- howto-patch.html	28 Dec 2002 10:54:48 -0000	1.6
  +++ howto-patch.html	10 Mar 2003 15:56:46 -0000	1.7
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -196,7 +199,7 @@
   <li>
   <font face="verdana, helvetica, sans serif">The source code of the documents as a local working copy of the CVS
   repository. If you are working with the current CVS HEAD then you will
  -have already done a <code><font face="courier, monospaced">'cvs checkout xml-cocoon2'</font></code>
  +have already done a <code><font face="courier, monospaced">'cvs checkout cocoon-2.0'</font></code>
   (see <a href="../contrib.html#cvshowto">CVS Usage Precis</a>).
   However, see below for other ways of obtaining source for diff comparison.
   </font>
  @@ -254,7 +257,7 @@
   <pre>
   Index: contrib.xml
   ===================================================================
  -RCS file: /home/cvspublic/xml-cocoon2/src/documentation/xdocs/contrib.xml,v
  +RCS file: /home/cvspublic/cocoon-2.0/src/documentation/xdocs/contrib.xml,v
   retrieving revision 1.7
   diff -u -r1.7 contrib.xml
   --- contrib.xml 30 Apr 2002 07:44:52 -0000      1.7
  @@ -523,7 +526,7 @@
   <ul>
   
   <li>
  -<font face="verdana, helvetica, sans serif">get the <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/contrib.xml?rev=HEAD&content-type=text/xml">relevant XML file via ViewCVS</a></font>
  +<font face="verdana, helvetica, sans serif">get the <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.0/src/documentation/xdocs/contrib.xml?rev=HEAD&content-type=text/xml">relevant XML file via ViewCVS</a></font>
   </li>
   
   <li>
  
  
  
  1.8       +8 -0      xml-site/targets/cocoon/howto/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/howto/index.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.html	2 Jan 2003 00:02:20 -0000	1.7
  +++ index.html	10 Mar 2003 15:56:46 -0000	1.8
  @@ -98,6 +98,9 @@
   <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
   </tr>
   <tr>
  +<td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-xindice-xmlform.html">Xindice XMLForm</a></td>
  +</tr>
  +<tr>
   <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
   <span class="menutitle">Documentation</span></td>
   </tr>
  @@ -176,6 +179,11 @@
   <li>
   <font face="verdana, helvetica, sans serif"><a href="howto-flow-debugger.html">Flow Debugger</a></font>
   </li>
  +
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="howto-xindice-xmlform.html">Xindice XMLForm</a></font>
  +</li>
  +
   	
   </ul>
   </blockquote>
  
  
  
  1.1                  xml-site/targets/cocoon/howto/howto-xindice-xmlform.html
  
  Index: howto-xindice-xmlform.html
  ===================================================================
  <html>
  <head>
  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
  <title>Xindice within the XMLForm Framework</title>
  <STYLE type="text/css">
  a.menu {
  	color: #FFFFFF;
      text-align:left;               
      font-size:12px;
      font-family: Verdana, Arial, Helvetica, sans-serif;
      font-weight:plain;
      text-decoration:none;
      padding-left: 14px
  }
  
  A.menu:hover {
  	color: #FFCC00
  }
  
  
  .menutitle {
  	color: #000000;
      text-align:left;               
      font-size:10px;
      font-family: Verdana, Arial, Helvetica, sans-serif;
      font-weight:bold;
      padding-left: 8px
  }
  .menuselected {
  	color: #FFCC00;
      text-align:left;               
      font-size:12px;
      font-family: Verdana, Arial, Helvetica, sans-serif;
      font-weight:bold;
      padding-left: 14px
  }
  </STYLE>
  </head>
  <body bgcolor="#ffffff" marginheight="4" marginwidth="4" leftmargin="4" topmargin="4" alink="#cc0000" vlink="#0086b2" link="#039acc" text="#000000">
  <table border="0" cellpadding="0" cellspacing="0" width="100%">
  <tr>
  <td align="left" valign="top" rowspan="3" height="60" width="135"><img border="0" vspace="0" hspace="0" src="images/logo.gif" height="60" width="135"></td><td background="images/line.gif" rowspan="1" colSpan="2" align="left" valign="top" height="0" width="100%"></td><td align="left" valign="top" rowspan="3" height="60" width="29"><img border="0" vspace="0" hspace="0" src="images/right.gif" height="60" width="29"></td>
  </tr>
  <tr>
  <td bgcolor="#0086b2" colspan="2" align="right" valign="top" height="35" width="100%"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="5">Xindice within the XMLForm Framework</font></td>
  </tr>
  <tr>
  <td background="images/bottom.gif" colspan="2" width="100%" valign="top" height="20" bgcolor="#0086b2" align="right">
  <table width="288" cellspacing="0" cellpadding="0" border="0">
  <tr>
  <td align="left" valign="top" height="20" width="96"><a target="new" href="http://xml.apache.org/"><img border="0" vspace="0" hspace="0" name="xml" src="images/button-xml-lo.gif" height="20" width="96" alt="http://xml.apache.org/"></a></td><td align="left" valign="top" height="20" width="96"><a target="new" href="http://www.apache.org/"><img border="0" vspace="0" hspace="0" name="asf" src="images/button-asf-lo.gif" height="20" width="96" alt="http://www.apache.org/"></a></td><td align="left" valign="top" height="20" width="96"><a target="new" href="http://www.w3.org/"><img border="0" vspace="0" hspace="0" name="w3c" src="images/button-w3c-lo.gif" height="20" width="96" alt="http://www.w3.org/"></a></td>
  </tr>
  </table>
  </td>
  </tr>
  </table>
  <table width="100%" cellspacing="0" cellpadding="0" border="0">
  <tr width="100%">
  <td align="left" valign="top" width="120">
  <table width="120" cellspacing="0" cellpadding="0" border="0" bgcolor="#a0a0a0">
  <tr>
  <td valign="top" align="left"><img width="120" vspace="0" src="images/join.gif" hspace="0" height="14" border="0"><br>
  </td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="../index.html">Main</a></td>
  </tr>
  <tr>
  <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  <span class="menutitle">How-Tos</span></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="index.html">Index</a></td>
  </tr>
  <tr>
  <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  <span class="menutitle">Using Cocoon</span></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="xmlform-wizard/howto-xmlform-wizard.html">XMLForm</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-paginator-transformer.html">Paginator</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-html-pdf-publishing.html">HTML-PDF</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="../userdocs/generators/wsproxy-generator.html">Web Syndication</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="chaperon/howto-chaperon-intro.html">Chaperon</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-i18n-xmlform.html">i18n XMLForm</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-flow-debugger.html">Flow Debugger</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><span class="menuselected">Xindice XMLForm</span></td>
  </tr>
  <tr>
  <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  <span class="menutitle">Documentation</span></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-author-howto.html">Author How-To</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-author-faq.html">Author FAQ</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-author-snippet.html">Author Snippet</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-author-core-docs.html">Author Docs</a></td>
  </tr>
  <tr>
  <td background="images/label-background_b.gif" bgcolor="#959595" valign="top"><img width="120" height="6" src="images/separator.gif"><br>
  <span class="menutitle">Contribution</span></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-patch.html">Prepare patch</a></td>
  </tr>
  <tr>
  <td valign="top" bgcolor="#959595" background="images/label-background_a.gif"><a class="menu" href="howto-bugzilla.html">Bugzilla</a></td>
  </tr>
  <tr>
  <td align="left" valign="top"><img width="120" vspace="0" src="images/close.gif" hspace="0" height="14" border="0"><br>
  </td>
  </tr>
  </table>
  </td><td>
  <table cellspacing="15" cellpadding="0" border="0">
  <tr>
  <td>
    
    
      <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Notice</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">This How-To is based on components included in the Cocoon 2.1
        distribution. If you do not have this version, you can obtain it from
        the <a href="../index.html">Apache Cocoon</a> web site.
        </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif"> Some user accessible points in the Cocoon 2.1 distribution should be
        considered "alpha". This means that the developer team is not
        investing _any_ effort to provide backward compatibility between alpha
        releases for these parts. This software will continue to be released as
        "alpha" until its code, schemas, and APIs are considered stable.
        </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">Until then, there will be no warranty that newer versions will
        maintain backward compatibility for such parts, even in the most simple
        cases. Of course Cocoon will be compatible to latest release, 2.0.x
        release. However, once "beta" status is reached, backward
        incompatible changes will be made only when absolutely necessary to
        reach "final" status. </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">The Cocoon development team understands the importance of reliable
        software as well protecting user investments through the creation of a
        solid development platform that does not change. On the other hand,
        the Cocoon project is a pioneer in many fields. Most of the technologies
        it uses are at a "working draft" phase only. Thus, reliability
        cannot be guaranteed before the software achieves its "final"
        status. </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">Until then, no effort will be provided to guarantee backward
        compatibility for any parts considered alpha. </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">You have been warned.</font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Overview</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          This How-To shows you how to use Xindice as the repository for
          XML resources from the XMLForm Framework. It requires prior
          knowledge of Cocoon XMLForm, XSLT, Schematron, Xindice and the
          XMLDB API. 
      </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Purpose</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          You will learn how to build a simple wizard type XMLForm that
          stores XML data into a Xindice collection.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Intended Audience</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          Cocoon users who want to learn how to store data obtained from
          XMLForms into Xindice.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Prerequisites</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">Cocoon must be running on your system. The steps below have been
          tested with Cocoon 2.1-dev.</font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">You will need the following:</font>
  </p>
        
  <blockquote>
  <ul>
          
  <li>
  <font face="verdana, helvetica, sans serif">A servlet engine such as Tomcat.</font>
  </li>
          
  <li>
  <font face="verdana, helvetica, sans serif">JDK 1.2 or later</font>
  </li>
          
  <li>
  <font face="verdana, helvetica, sans serif">Xindice 1.0 installed (create a collection named
            <code><font face="courier, monospaced">Artist</font></code>)</font>
  </li>
        
  </ul>
  </blockquote>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">Cocoon 2.1 CVS to be installed with the command:</font>
  </p>
        
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>build -Dinclude.webapp.libs=true webapp</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          You will need to understand and be familiar with XSL, XForms,
          XPath, Schematron and Xindice. Some knowledge about JXPath and the
          XMLDB API would be helpful, too. If you are unfamiliar with these
          technologies, it is advised that you learn these related concepts
          first. If you are unfamiliar with XMLForm, check out the
          <a href="xmlform-wizard/howto-xmlform-wizard.html">XMLForm
          Wizard How-To</a> first.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Steps</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          We will follow the needed steps in order to add a document like
          the one below to a Xindice collection named <code><font face="courier, monospaced">Artist</font></code>.
        </font>
  </p>
        
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;Artist id="pearljam"&gt;
      &lt;Name&gt;Pearl Jam&lt;/Name&gt;
  &lt;/Artist&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          We will get the identifier and name data using a XMLForm and
          store them in Xindice. We will build this XMLForm very similar to
          the one in the XMLForm Wizard How-To. 
        </font>
  </p>
        
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>1. Building the XMLForm files</b></font>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            Create the files and name them as specified below. 
          </font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">start.xform</font>
            
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;?xml version="1.0"?&gt;
  &lt;document&gt;
    &lt;h1&gt;This is the New Artist Wizard!&lt;/h1&gt;
    &lt;info&gt;Steps from here on, will let you insert a new
          Artist in the database.
    &lt;/info&gt;
    &lt;h3&gt;
      &lt;a href="Artist.xform?cocoon-action-start=true"&gt;
         Start!
      &lt;/a&gt;
    &lt;/h3&gt;
  &lt;/document&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">artist.xform</font>
            
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;?xml version="1.0"?&gt;
  &lt;document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"&gt;
    &lt;xf:form id="artist-insert" view="artist"
             action="Artist.xform" method="post"&gt;
      &lt;xf:caption&gt;New Artist&lt;/xf:caption&gt;
      &lt;error&gt;
        &lt;xf:violations class="error"/&gt;
      &lt;/error&gt;
      &lt;xf:textbox ref="/Artist/@id"&gt;
        &lt;xf:caption&gt;Artist identifier:&lt;/xf:caption&gt;
      &lt;/xf:textbox&gt;
      &lt;xf:textbox ref="/Artist/Name"&gt;
        &lt;xf:caption&gt;Artist Name:&lt;/xf:caption&gt;
      &lt;/xf:textbox&gt;
      &lt;xf:submit id="prev" class="button"&gt;
        &lt;xf:caption&gt;Prev&lt;/xf:caption&gt;
        &lt;xf:hint&gt;Go to previous page&lt;/xf:hint&gt;
      &lt;/xf:submit&gt;
      &lt;xf:submit id="next" class="button"&gt;
        &lt;xf:caption&gt;Next&lt;/xf:caption&gt;
        &lt;xf:hint&gt;Go to next page&lt;/xf:hint&gt;
      &lt;/xf:submit&gt;
    &lt;/xf:form&gt;
  &lt;/document&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">end.xform</font>
            
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;?xml version="1.0"?&gt;
  &lt;document&gt;
    &lt;h1&gt;You have reached the last page!&lt;/h1&gt;
    &lt;info&gt;
     You have inserted a New Artist successfully.
    &lt;/info&gt;
    &lt;h3&gt;
      &lt;a href="Artist.xform"&gt;Go to home page.&lt;/a&gt;
    &lt;/h3&gt;
  &lt;/document&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">error.xform</font>
            
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;?xml version="1.0"?&gt;
  &lt;document&gt;
    &lt;h1&gt;
      You have reached the last page of the New Artist Wizard!
    &lt;/h1&gt;
    &lt;info&gt;
      There have been problems and the Artist could not be added to the
      database. Please try again.
    &lt;/info&gt;
    &lt;h3&gt;
      &lt;a href="Artist.xform"&gt;Please, start again.&lt;/a&gt;
    &lt;/h3&gt;
  &lt;/document&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
        
        
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>2. Validation</b></font>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            For the sake of simplicity we just validate one property against
            one condition. We require the identifier to be at least two
            characters in length; the validation file,
            <b><code><font face="courier, monospaced">artist-validator.xml</font></code></b> is as follows:
          </font>
  </p>
          
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;?xml version="1.0"?&gt;
  &lt;schema ns="http://xml.apache.cocoon/xmlform" 
          xmlns="http://www.ascc.net/xml/schematron"&gt;
    &lt;phase id="artist"&gt;
      &lt;active pattern="artval"/&gt;
    &lt;/phase&gt;
    &lt;pattern name="Artist Identifier Validation" id="artval"&gt;
      &lt;rule context="/Artist/@id"&gt;
        &lt;assert test="string-length(.) &gt; 1"&gt;
          Artist Name should be at least 2 characters.
        &lt;/assert&gt;
      &lt;/rule&gt;
    &lt;/pattern&gt;
  &lt;/schema&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">Extended Validation</font>
            
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
              There could be more complicated rules in Schematron but we
              could also require the identifier to be unique in the
              database. In this case we should query the database and see
              if it already exists. If so, a new violation can be added to
              the form. Since these kinds of violations are out of the scope
              of Schematron, these operations should be accomplished in the
              Action using Java code. 
            </font>
  </p>
          
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
        
        
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>3. The Model</b></font>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            Here is where we will take a different approach to the one in
            the XMLForm Wizard How-To. We will not use a separate Bean.
            In order to have an XML document model we will create an XML
            file with the empty structure we want to fill with data from
            the form. Create the file
            <b><code><font face="courier, monospaced">artist-model.xml</font></code></b> and fill it with:
          </font>
  </p>
          
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;Artist id=""&gt;
      &lt;Name&gt;&lt;/Name&gt;
  &lt;/Artist&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            Persistence for the data will be accomplished by using a
            <a href="http://jakarta.apache.org/commons/jxpath/apidocs/org/apache/commons/jxpath/Container.html">JXPath Container</a>.
            The XML document model created above will be loaded into the
            Container. We will use the <code><font face="courier, monospaced">xmlform-model</font></code> parameter
            in the sitemap to point to the XML file.
            The Container is created and manipulated by the Action in its
            <code><font face="courier, monospaced">getFormModel()</font></code> method, so we need to override it
            and write it this way (we will see the whole Action in the next
            step): 
        </font>
  </p>
          
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  /**
   * Extract xmlform-model parameter and
   * instantiate a new form model from it.
   */
    protected Object getFormModel() { 
      //to load the XML model
      Container DOMModel = null;
      Source modelSrc = null;
      //this parameter holds the name of the empty XML document
      //representing the model
      String modelFileName =
          getParameters().getParameter("xmlform-model", null);
      if(modelFileName==null) return null;
      try {
          modelSrc = getSourceResolver().resolveURI(modelFileName);
          DOMModel = new XMLDocumentContainer(new
              StreamSource(modelSrc.getInputStream()));
          return DOMModel;
        }
        catch ( Exception e) {
          throw new CascadingRuntimeException(
              " Failed instantiating form model ", e );
        }
        finally {
          getSourceResolver().release(modelSrc);
        }
    }</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
        
        
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>4. The Action</b></font>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            In this Action we have integrated the Xindice handling code,
            getting the data from the model and storing it in Xindice.
            The Action that controls this form is
            <b><code><font face="courier, monospaced">ArtistAction.java</font></code></b>:
          </font>
  </p>
          
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  package com.simbiosystems.cocoon.xmlform.xindice.howto;
  
  import java.util.Arrays;
  import java.util.Map;
  
  import javax.xml.transform.stream.StreamSource;
  import org.apache.avalon.framework.CascadingRuntimeException;
  import org.apache.cocoon.acting.AbstractXMLFormAction;
  import org.apache.cocoon.components.validation.Violation;
  import org.apache.cocoon.components.xmlform.Form;
  import org.apache.cocoon.components.xmlform.FormListener;
  import org.apache.commons.jxpath.Container;
  import org.apache.commons.jxpath.XMLDocumentContainer;
  import org.apache.excalibur.source.Source;
  import org.w3c.dom.Document;
  import org.w3c.dom.Node;
  
  /**
   * This action handles XMLForms for the Artist data
   */
  public class ArtistAction extends AbstractXMLFormAction implements
        FormListener {
    // different form views participating in the form
    final String VIEW_START = "start";
    final String VIEW_ARTIST = "artist";
    final String VIEW_END = "end";
    final String VIEW_ERROR = "error";
    // action commands used in the wizard
    final String CMD_START = "start";
    final String CMD_NEXT = "next";
    final String CMD_PREV = "prev";
    //constant for the XML manipulation, it holds the full name of the
    //collection to be used for storing the data
    final String xindiceSubCol = "/Artist";
  
    /**
     * Extract xmlform-model action parameter and
     * instantiate a new form model from it.
     *
     * In this case it uses a JXPath Container as the model and
     * there is no need for a separate model Bean.
     *
     * @return Form the form object this action works with.
     *
     */
    protected Object getFormModel() {
      //to load the XML model
      Container DOMModel = null;
      Source modelSrc = null;
      //this parameter holds the name of the empty XML document
      //representing the model
      String modelFileName =
          getParameters().getParameter("xmlform-model", null);
      if(modelFileName==null) return null;
      try {
        modelSrc = getSourceResolver().resolveURI(modelFileName);
        DOMModel = new XMLDocumentContainer(new
            StreamSource(modelSrc.getInputStream()));
        return DOMModel;
      }
      catch ( Exception e) {
        throw new CascadingRuntimeException(
            " Failed instantiating form model ", e );
      }
      finally {
        getSourceResolver().release(modelSrc);
      }
    }
  
    /**
     * Invoked after form population
     * Take appropriate action based on the command
     *
     */
    public Map perform () {
      // set the page control flow parameter
      // according to the validation result
      if ( getCommand().equals(CMD_NEXT) &amp;&amp;
           getForm().getViolations () != null ) {
        // errors, back to the same page
        return page( getFormView() );
      }
      else {
        // validation passed
        // continue with control flow
        // clear validation left overs in case the user
        // did not press the Next button
        getForm().clearViolations();
        // get the user submitted command
        String command = getCommand();
        // get the form view which was submitted
        String formView = getFormView();
        // apply control flow rules
        if (formView.equals (VIEW_ARTIST)) {
          if (command.equals(CMD_NEXT)) {
            //extended validation
            //test if the ID already exists in the DB
            String artistName = (String)getForm().getValue("/Artist/@id");
            try {
              XindiceManager xi = new XindiceManager();
              Node result = xi.find(xindiceSubCol, 
                                    "/Artist[@id='"+ artistName +"']",
                                    "Artist");
             //if we do not get null the element with that ID
             //already existed and we add the violation
              if (result!=null) {
                Violation v = new Violation();
                v.setMessage("already exists in the database, 
                              please choose another one");
                v.setPath("/Artist/@id");
                Violation[] va = { v };
                getForm().addViolations(Arrays.asList((Object[])va));
               //the ID already exists, back to the same
               //page to correct the error
                return page(VIEW_ARTIST);
              }
            }
            catch (Exception e) {
              getLogger().error("Cannot establish a connection to the DB", e);
            }
            //everything went fine, add the document to the database
            try {
               addDocument();
            }
            catch(Exception e) {
              //there were errors, send it to the error page
              getLogger().error("Cannot add DOM document to the database");
              return page(VIEW_ERROR);
            }
            return page( VIEW_END);
  
         }
          if (command.equals(CMD_PREV)) {
            return page(VIEW_START);
          }
        }
      }
      // should never reach this statement
      return page( VIEW_START );
    }
  
    /**
     * The first callback method which is called
     * when an action is invoked.
     *
     * It is called before population.
     * @return null if the Action is ready to continue.
     * an objectModel map which will be returned
     */
    protected Map prepare() {
      if ( getCommand() == null ) {
        return page(VIEW_START);
      }
      else if ( getCommand().equals(CMD_START)) {
        // reset state by removing old form if one exists
        Form.remove( getObjectModel(), getFormId() );
        getForm().addFormListener( this );
        return page(VIEW_ARTIST);
      }
      // get ready for action
      // if not ready return page("whereNext");
      return null;
    }
  
    /**
     * Add the document to the database
     *
     */
    public void addDocument() throws Exception {
      try {
        //add the document to the database
        XindiceManager xi = new XindiceManager();
        //needs the DocumentRoot of the Container as a DOM Node
        xi.add(xindiceSubCol, 
               ((Document)
                (((XMLDocumentContainer)
                   (getForm().getModel())).getValue())).getDocumentElement(), 
               null);
      }
      catch (Exception e) {
        getLogger().error("DOM Document could not be created", e);
        throw e;
      }
    }
  }</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            We had to use an ugly casting mechanism in the
            <code><font face="courier, monospaced">addDocument</font></code> method but that is what we have by now.
            In future JXPath versions this will be easier to accomplish. 
          </font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">The helper class</font>
            
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
              In order to make this work we need to use a helper class.
              This class uses the XMLDB API to connect to Xindice and make
              the operations available to the Action. You should extend it
              to add more operations. The helper class
              <b><code><font face="courier, monospaced">XindiceManager.java</font></code></b> is as follows: 
            </font>
  </p>
            
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  /**
   * Helper class for Xindice related operations
   *
   */
  package com.simbiosystems.cocoon.xmlform.xindice.howto;
  
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
  import org.w3c.dom.DOMImplementation;
  import org.w3c.dom.Document;
  import org.w3c.dom.Element;
  import org.w3c.dom.Node;
  import org.xmldb.api.DatabaseManager;
  import org.xmldb.api.base.Collection;
  import org.xmldb.api.base.Database;
  import org.xmldb.api.base.Resource;
  import org.xmldb.api.base.ResourceIterator;
  import org.xmldb.api.base.ResourceSet;
  import org.xmldb.api.base.XMLDBException;
  import org.xmldb.api.modules.XMLResource;
  import org.xmldb.api.modules.XPathQueryService;
  
  public class XindiceManager {
  
    private static final String driver =
        "org.apache.xindice.client.xmldb.DatabaseImpl";
    private static final String rootCollection = "xmldb:xindice:///db/";
  
    /**
     * Constructor
     *
     */
    public XindiceManager() {
  
    }
  
    /**
     * Search for a document in the DB. If not found, return null.
     *
     * @param subCol name of the subCollection to query if any. If blank
     * or null, queries go against the rootCollection.
     * @param xpath XPath expression for the query, if none, it returns
     * the whole Collection
     * @param resultRootelement name of the root element for the DOM
     * document which will wrap the results
     * @return a DOM Node with the matched documents
     *
     */
    public Node find(String subCol, String xpath, String resultRootElement)
      throws Exception {
  
      //prepare DOM document
      DOMImplementation impl;
      DocumentBuilder builder;
      try {
        // Find the implementation
        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
        factory.setNamespaceAware( false );
        factory.setValidating ( false );
        builder = factory.newDocumentBuilder();
        impl = builder.getDOMImplementation();
      }
      catch (Exception ex) {
        throw new RuntimeException("[XindiceManager.find]: " +
            "Failed to initialize DOM factory.  Root cause: \n" + ex);
      }
      //create the Document which will hold the results
      Document resultDoc = impl.createDocument(null, resultRootElement, null);
      Node root = resultDoc.getDocumentElement();
  
      //And now the Xindice part
      Collection col = null;
      String strData = null;
  
      try {
        Class c = Class.forName(driver);
  
        Database database = (Database) c.newInstance();
        DatabaseManager.registerDatabase(database);
  
        String localCol = rootCollection + subCol;
  
        col = DatabaseManager.getCollection(localCol);
  
        //Make the XPath query and get the resources
        XPathQueryService service =
          (XPathQueryService) col.getService("XPathQueryService", "1.0");
        ResourceSet resultSet = service.query(xpath);
        // Iterate the xpath results and add each of them to the main Document
        ResourceIterator iterator = resultSet.getIterator();
  
        //if not resources are present, just return null
        if(!iterator.hasMoreResources()) return null;
  
        while(iterator.hasMoreResources()) {
          Resource r = iterator.nextResource();
  
          Element resElement = 
            ((Document)((XMLResource)r).getContentAsDOM()).getDocumentElement();
  
          // Remove unwanted attributes
          resElement.removeAttribute("src:col");
          resElement.removeAttribute("src:key");
          resElement.removeAttribute("xmlns:src");
  
          // Add this result to the root element
          Element importedElement =
              (Element)resultDoc.importNode(resElement, true);
          root.appendChild(importedElement);
        }
        //return the Document root
        return root;
      }
      catch (Exception e) {
        System.err.println("[XindiceManager.find]: Find Exception occured :" + 
                            e.getMessage());
        throw e;
      }
      finally {
        if (col != null) {
          col.close();
        }
      }
    }
  
    /**
     * Add a document to the DB. If a key is not passed, it generates a
     * unique one.
     * This version uses a DOM Document.
     * @param subCol name of the subCollection in which to add the resource
     * if any. If blank or null, insertions go against the rootCollection.
     * @param document DOM document to be inserted
     * @param key unique key for the resource to be created.
     * If none, one is created on the fly
     */
    public void add(String subCol, Node document, String key)
        throws Exception {
      Collection col = null;
      Node xmldoc = null;
      try {
        Class c = Class.forName(driver);
  
        Database database = (Database) c.newInstance();
        DatabaseManager.registerDatabase(database);
  
        col = DatabaseManager.getCollection(rootCollection + subCol);
  
        XMLResource document_ = (XMLResource) col.createResource(null,
            "XMLResource");
        document_.setContentAsDOM(document);
        col.storeResource(document_);
      }
      catch (XMLDBException e) {
        System.err.println("[XindiceManager.add]: Add Exception occured " +
                           e.errorCode);
        throw e;
      }
      finally {
        if (col != null) {
          col.close();
        }
      }
    }
  }</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
            
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
          
        
        
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b>5. The Sitemap</b></font>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            Remember you should have the <code><font face="courier, monospaced">XMLFormTransformer</font></code>
            defined like this:
          </font>
  </p>
          
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;map:transformer name="xmlform"
                   src="org.apache.cocoon.transformation.XMLFormTransformer" 
                   logger="xmlform"/&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
            Then, you must declare the Action to be used in the
            corresponding section: 
          </font>
  </p>
          
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;map:action logger="xmlform" 
    name="ArtistAction"
    src="com.simbiosystems.cocoon.xmlform.xindice.howto.ArtistAction"/&gt;
  </pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
          
  <p>
  <font color="black" face="verdana,helvetica,sanserif"></font>
  </p>
          
  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2">The Pipeline</font>
            
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
              The following pipeline will process requests to our Form:
            </font>
  </p>
            
  <div align="center">
  <table border="0" cellpadding="0" cellspacing="4">
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  <pre>
  &lt;!-- XMLForms&lt;-&gt;Xindice pipeline --&gt;
  &lt;map:pipeline&gt;
    &lt;map:match pattern="Artist.xform"&gt;
      &lt;map:act type="ArtistAction"&gt;
        &lt;!-- XMLForm parameters for the Action --&gt;
        &lt;!-- Notice how we use an XML file as the model --&gt;
        &lt;map:parameter name="xmlform-validator-schema-ns" 
                       value="http://www.ascc.net/xml/schematron"/&gt;
        &lt;map:parameter name="xmlform-validator-schema"
                       value="artist/artist-validator.xml"/&gt;
        &lt;map:parameter name="xmlform-id" value="artist-insert"/&gt;
        &lt;map:parameter name="xmlform-scope" value="session"/&gt;
        &lt;map:parameter name="xmlform-model" value="artist/artist-model.xml"/&gt;
        &lt;!-- XMLForm document, {page} comes from Action --&gt;
        &lt;map:generate src="artist/{page}.xform"/&gt;
      &lt;/map:act&gt;
      &lt;!-- populating the doc with model instance data --&gt;
      &lt;map:transform type="xmlform"/&gt;
      &lt;!-- look and feel of the form controls  --&gt;
      &lt;map:transform src="styles/wizard2html.xsl"/&gt;
      &lt;!-- Transforming the XMLForm controls to HTML --&gt;
      &lt;map:transform src="styles/xmlform2html.xsl"/&gt;
      &lt;!-- sending the HTML back to the browser --&gt;
      &lt;map:serialize type="html"/&gt;
    &lt;/map:match&gt;
  &lt;/map:pipeline&gt;</pre>
  </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  <tr>
  <td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  </tr>
  </table>
  </div>
            
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
              Depending on where you have Cocoon installed and where you
              have configured the files in this how-to, you could make a
              request to a URL like
              <code><font face="courier, monospaced">http://localhost:8080/cocoon/Artist.xform</font></code>
              and start using the Form. 
            </font>
  </p>
          
        
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Final Considerations</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          Making the operations from the Action using the helper class
          seems to be the easiest way. You can think of other ways or
          other operations using other Xindice tools available in Cocoon
          such as the pseudo protocol. For example, you could use it to
          query the DB for data that could be stored in a sitemap parameter.
          You could then get the data from the Action and use it to fill a
          selectbox in the form.
        </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          We did not mentioned other operations such as updates. This can
          be also accomplished this way. For example, if you want to edit
          the data we just stored, you could load it in the Container at
          the beginning by using the find method of the helper class.
          This way you get a filled form in the next step ready for editing.
          Other ways or interacting with the repository include the XMLDB
          Transformer. Since it uses XUpdate alike syntax, you could format
          a XML String for it in the last step of the Action, making it
          available to the sitemap then, so the Transformer could get it
          and make the operations.
        </font>
  </p>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          We are sure you can think of more different ways and encourage
          you to contribute them if you have tested it successfully.
          This how-to was refactored quite a bit from an original version
          which used a regular Javabean as a wrapper for a DOM Node where
          the data were persisted. This new version is much more elegant
          and short. If you want to check differences, an
          <a href="http://wiki.cocoondev.org/Wiki.jsp?page=XMLFormXindiceOldVersion">old version at Cocoon Wiki</a>
          still exists.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Summary</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          This How-To makes possible the use of Xindice from XMLForms in
          order to add data to the repository. You learned how to connect
          to the DB from the Action, and how to make complex validation
          using information stored in the DB. Remember that everything you
          have just built is reusable for different user agents. You would
          only need to use
          <a href="../userdocs/concepts/matchers_selectors.html">matchers
          and selectors</a> and to choose the appropriate transformation.
          We hope this how-to was helpful for you.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">References</font>
  <hr style="color: #0086b2" size="1">
        
  <a name="references">
  <!--anchor--></a>
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          This how-to would not be possible without some ideas exchanged
          with Ivelin Ivanov in the
          <a href="../mail-lists.html">Cocoon Users</a> list and
          privately.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Comments</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          Care to comment on this How-To? Got another tip? 
          Help keep this How-To relevant by passing along any useful
          feedback to the author,
          <a href="mailto:josema|at|simbiosystems.com">Josema Alonso</a>
          or via the
          <a href="../mail-lists.html">Cocoon Users</a> mail list.
        </font>
  </p>
      
      
  <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Revisions</font>
  <hr style="color: #0086b2" size="1">
        
  <p>
  <font color="black" face="verdana,helvetica,sanserif">
          2003-02-04: First version contributed by Josema Alonso.
        </font>
  </p>
      
    
  
  </td>
  </tr>
  </table>
  </td>
  </tr>
  </table>
  <table width="100%" cellspacing="0" cellpadding="0" border="0">
  <tr>
  <td bgcolor="#0086b2"><img width="1" src="images/dot.gif" height="1"></td>
  </tr>
  <tr>
  <td align="center"><font size="-1" face="arial,helvetica,sanserif" color="#0086b2"><i>Copyright &copy; 1999-2002 The Apache Software Foundation. All Rights Reserved.</i></font></td>
  </tr>
  </table>
  </body>
  </html>
  
  
  
  1.12      +11 -11    xml-site/targets/cocoon/installing/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/installing/index.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- index.html	28 Dec 2002 10:54:49 -0000	1.11
  +++ index.html	10 Mar 2003 15:56:46 -0000	1.12
  @@ -154,7 +154,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
           You can simply download the latest official release from the
  -        <a href="http://xml.apache.org/cocoon/dist/">Cocoon distribution</a>
  +        <a href="http://cocoon.apache.org/dist/">Cocoon distribution</a>
           directory.
          </font>
   </p>
  @@ -165,7 +165,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
           You also can download one of the development snapshots from the
  -        <a href="http://xml.apache.org/from-cvs/xml-cocoon2/">CVS snapshots</a>
  +        <a href="http://xml.apache.org/from-cvs/cocoon-2.0/">CVS snapshots</a>
           directory.
          </font>
   </p>
  @@ -228,7 +228,7 @@
   </li>
             
   <li>
  -<font face="verdana, helvetica, sans serif">Module name and path on the server is "xml-cocoon2" (no quotes);</font>
  +<font face="verdana, helvetica, sans serif">Module name and path on the server is "cocoon-2.0" (no quotes);</font>
   </li>
             
   <li>
  @@ -281,7 +281,7 @@
             
   <li>
   <font face="verdana, helvetica, sans serif">Enter "cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -z3 checkout
  -            -r HEAD xml-cocoon2". This will create a directory called "xml-cocoon2" where the
  +            -r HEAD cocoon-2.0". This will create a directory called "cocoon-2.0" where the
               Cocoon2 source will be stored.</font>
   </li>
             
  @@ -298,7 +298,7 @@
           
   <p>
   <font color="black" face="verdana,helvetica,sanserif">In case you want to update your Cocoon source tree to the
  -          current version, change to the "xml-cocoon2" directory and
  +          current version, change to the "cocoon-2.0" directory and
             call "cvs -z3 update -d -P".</font>
   </p>
         
  @@ -1955,7 +1955,7 @@
           
   <li>
   <font face="verdana, helvetica, sans serif">
  -          Copy <code><font face="courier, monospaced">xml-cocoon2/build/cocoon/cocoon.war</font></code> into
  +          Copy <code><font face="courier, monospaced">cocoon-2.0/build/cocoon/cocoon.war</font></code> into
             <code><font face="courier, monospaced">tomcat/webapps</font></code> directory.
           </font>
   </li>
  @@ -2687,7 +2687,7 @@
              
   <li>
   <font face="verdana, helvetica, sans serif">Copy <code><font face="courier, monospaced">xerces-XXX.jar</font></code> and <code><font face="courier, monospaced">xml-apis.jar</font></code>
  -             JAR file from <code><font face="courier, monospaced">xml-cocoon2/lib/core/</font></code> to
  +             JAR file from <code><font face="courier, monospaced">cocoon-2.0/lib/core/</font></code> to
                the <code><font face="courier, monospaced">resin-2.0.x/lib/</font></code> directory.</font>
   </li>
            
  @@ -2708,7 +2708,7 @@
   
          
   <li>
  -<font face="verdana, helvetica, sans serif">Copy the <code><font face="courier, monospaced">xml-cocoon2/build/cocoon/cocoon.war</font></code> WAR file to <code><font face="courier, monospaced">resin-2.x/webapps</font></code> directory
  +<font face="verdana, helvetica, sans serif">Copy the <code><font face="courier, monospaced">cocoon-2.0/build/cocoon/cocoon.war</font></code> WAR file to <code><font face="courier, monospaced">resin-2.x/webapps</font></code> directory
          </font>
   </li>
          
  @@ -2887,7 +2887,7 @@
   <li>
   <font face="verdana, helvetica, sans serif">Install Xerces as default XML parser for JRun by copying
               <code><font face="courier, monospaced">xerces-XXX.jar</font></code> and <code><font face="courier, monospaced">xml-apis.jar</font></code> JAR
  -            files from the <code><font face="courier, monospaced">xml-cocoon2/lib/core/</font></code> to <code><font face="courier, monospaced">jrun/lib/ext/</font></code>
  +            files from the <code><font face="courier, monospaced">cocoon-2.0/lib/core/</font></code> to <code><font face="courier, monospaced">jrun/lib/ext/</font></code>
               directory.
             </font>
   </li>
  @@ -2895,7 +2895,7 @@
   <li>
   <font face="verdana, helvetica, sans serif">Update Rhino shipped with JRun with newer version from the Cocoon by
               overwriting <code><font face="courier, monospaced">jrun/lib/rhino.jar</font></code> JAR file
  -            with the <code><font face="courier, monospaced">xml-cocoon2/lib/optional/rhino-1.5r3.jar</font></code> file.
  +            with the <code><font face="courier, monospaced">cocoon-2.0/lib/optional/rhino-1.5r3.jar</font></code> file.
             </font>
   </li>
             
  @@ -2936,7 +2936,7 @@
   <table border="0" cellpadding="0" cellspacing="3" width="100%">
   <tr>
   <td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>Instead of deploying WAR file using console, same could be done by copying
  -          <code><font face="courier, monospaced">xml-cocoon2/build/cocoon/webapp</font></code> under <code><font face="courier, monospaced">jrun/servers/default/</font></code>
  +          <code><font face="courier, monospaced">cocoon-2.0/build/cocoon/webapp</font></code> under <code><font face="courier, monospaced">jrun/servers/default/</font></code>
             directory and adding following lines to the <code><font face="courier, monospaced">jrun/servers/default/local.properties</font></code>:
           </i></font></td>
   </tr>
  
  
  
  1.14      +16 -17    xml-site/targets/cocoon/installing/jars.html
  
  Index: jars.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/installing/jars.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jars.html	28 Dec 2002 10:54:49 -0000	1.13
  +++ jars.html	10 Mar 2003 15:56:47 -0000	1.14
  @@ -330,7 +330,7 @@
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://jakarta.apache.org/avalon/excalibur/">Avalon Excalibur XMLUtil</a>
   </font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">core/excalibur-xmlutil-20020820.jar</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">core/excalibur-xmlutil-20030306.jar</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">Part of jakarta-avalon, it is a set of classes and patterns that
          support high level server development.</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">Cocoon</font></td>
  @@ -399,6 +399,17 @@
   <tr>
   
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
  +<a href="http://jakarta.apache.org/commons/lang.html">Jakarta Commons Lang</a>
  +</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/commons-lang-1.0.1.jar</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">The Lang Component provides a host of helper utilities for the java.lang API.</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">SQL Transformer</font></td>
  +
  +</tr>
  +
  +<tr>
  +
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://jakarta.apache.org/commons/httpclient/">Jakart Commons httpClient</a>
   </font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">core/commons-httpclient-20020423.jar</font></td>
  @@ -517,7 +528,7 @@
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://devnet.hp.com/projects/deli/">Device capabilities</a>
   </font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/deli-0.50.jar</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/deli-0.9.1.jar</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">Open Source Delivery Context Java Library supporting CC/PP and UAProf.
         Different web-enabled devices have different input, output, hardware,
         software, network and browser capabilities. In order for a web server or
  @@ -573,7 +584,7 @@
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://jakarta.apache.org/poi/">Create proprietary file formats</a>
   </font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/jakarta-poi-1.5.0-dev-20020408.jar.jar</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/jakarta-poi-1.5.0-dev-20020408.jar</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">The POI project consists of APIs for manipulating
   		various file formats based upon Microsoft's OLE 2 Compound Document
   		format using pure Java.</font></td>
  @@ -586,7 +597,7 @@
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://www.hpl.hp.com/semweb/jena-top.html">Jena RDF framework</a>
   </font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/jena-1.3.0.jar</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/jena-1.4.0.jar</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">Jena is a java API for manipulating RDF models.</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">DELI</font></td>
   
  @@ -595,18 +606,6 @@
   <tr>
   
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
  -<a href="http://java.sun.com/products/jimi/">Image manipulation</a>
  -</font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/jimi-1.0.jar</font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">Jimi is a class library for managing images. Its primary function is
  -       image I/O.</font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">FOP</font></td>
  -
  -</tr>
  -
  -<tr>
  -
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://www.coyotegulch.com/algorithm/jisp/">JISP</a>
   </font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/jisp_1_0_2.jar</font></td>
  @@ -689,7 +688,7 @@
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">
   <a href="http://xml.apache.org/commons/">XML Catalog Entity Resolver</a>
   </font></td>
  -<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">optional/resolver-20020130.jar</font></td>
  +<td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">core/resolver-20021114.jar</font></td>
   <td align="left" valign="top" rowspan="1" colspan="1" bgcolor="#a0ddf0"><font face="verdana,helvetica,sanserif" size="-1" color="black">Maps URIs to other URIs using the mechanisms defined by
             OASIS Catalog or XML Catalog. Mainly used for DTDs and character
             entity sets.
  
  
  
  1.5       +2 -2      xml-site/targets/cocoon/installing/updating.html
  
  Index: updating.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/installing/updating.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- updating.html	6 Dec 2002 15:30:58 -0000	1.4
  +++ updating.html	10 Mar 2003 15:56:48 -0000	1.5
  @@ -166,7 +166,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">From within your source code you should not lookup the
         <i>org.apache.cocoon.components.parser.Parser.ROLE</i> anymore; use
  -      <i>org.apache.avalon.excalibur.xml.Parser.ROLE</i> instead.
  +      <i>org.apache.excalibur.xml.sax.SAXParser.ROLE</i> instead.
       </font>
   </p>
     
  @@ -183,7 +183,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">From within your source code you should not lookup the
         <i>org.apache.cocoon.components.resolver.Resolver.ROLE</i> anymore; use
  -      <i>org.apache.avalon.excalibur.xml.EntityResolver.ROLE</i> instead.
  +      <i>org.apache.excalibur.xml.EntityResolver.ROLE</i> instead.
       </font>
   </p>
     
  
  
  
  1.8       +24 -0     xml-site/targets/cocoon/link/livesites.html
  
  Index: livesites.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/link/livesites.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- livesites.html	28 Dec 2002 10:54:49 -0000	1.7
  +++ livesites.html	10 Mar 2003 15:56:48 -0000	1.8
  @@ -303,10 +303,34 @@
   <li>
   <font face="verdana, helvetica, sans serif"><a href="http://www.cueandreview.org.uk/">Cue and Review Recording Services</a></font>
   </li>
  +    
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="http://biology.bangor.ac.uk/">School of Biological Sciences, University of Wales, Bangor</a></font>
  +</li>
  +    
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="http://www.iniva.org/">The Institute of International Visual Arts</a></font>
  +</li>
  +    
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="http://www.warnerbros.ch/">Warner Bros.,Inc. Switzerland</a></font>
  +</li>
  +    
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="http://www.fox-warner.ch/">20th Century Fox Switzerland</a></font>
  +</li>
   
      
   </ul>
   </blockquote>
  +
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">Of course, all of the websites listed on the Apache Forrest
  +    <a href="http://xml.apache.org/forrest/live-sites.html">Live sites</a>
  +    page are also essentially powered by Cocoon.
  +   </font>
  +</p>
     
   
     
  
  
  
  1.8       +22 -1     xml-site/targets/cocoon/link/training.html
  
  Index: training.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/link/training.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- training.html	7 Jan 2003 07:38:20 -0000	1.7
  +++ training.html	10 Mar 2003 15:56:48 -0000	1.8
  @@ -154,6 +154,27 @@
   </font>
   </li>
   
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="http://www.anyware-tech.com">Anyware Technologies</a>
  +<br>
  +Anyware Technologies offers <a href="http://www.anyware-tech.com/french/sce_training.html">Cocoon
  +training</a> in France. Course are organized in two classes (3 day introduction and 2 day advanced),
  +but can be mixed with our other XML and Java training material to meet specific needs.
  +Courses are held in French and can be on-site.
  +</font>
  +</li>
  +
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="http://www.oio.de/">Orientation in Objects</a>
  +<br>
  +You can learn how to develop web applications using Cocoon and XSPs in a three
  +day training course. Courses will take place every 2 months in Mannheim,
  +Germany.
  +See <a href="http://www.oio.de/seminar/xml/cocoon-schulung.htm">course
  +description</a>. We also offer on-site training in English.
  +</font>
  +</li>
  +
   </ul>
   </blockquote>
   
  @@ -165,7 +186,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
       If you do not find your site here, make sure you
  -    <a href="mailto:cocoon-users.at.xml.apache.org?subject=Link:%20Training:">tell us</a>.
  +    <a href="mailto:cocoon-users.at.xml.apache.org?subject=Link: Training:">tell us</a>.
       Enter a meaningful title after the words "Link: Training:"
       in the subject, provide a short summary of your site, and do not forget
       to tell us the URL.
  
  
  
  1.13      +1 -1      xml-site/targets/cocoon/plan/changes-doc.html
  
  Index: changes-doc.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/plan/changes-doc.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- changes-doc.html	2 Jan 2003 00:02:20 -0000	1.12
  +++ changes-doc.html	10 Mar 2003 15:56:48 -0000	1.13
  @@ -117,7 +117,7 @@
   <tr>
   <td>
     
  -  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b> 2.0.5-dev (January 2 2003)</b></font>
  +  <font face="verdana, helvetica, sans serif" size="+1" color="#0086b2"><b> 2.0.5-dev (March 10 2003)</b></font>
   <ul>
       
   <li>
  
  
  
  1.7       +7 -19     xml-site/targets/cocoon/plan/release.html
  
  Index: release.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/plan/release.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- release.html	6 Dec 2002 15:30:59 -0000	1.6
  +++ release.html	10 Mar 2003 15:56:48 -0000	1.7
  @@ -130,19 +130,15 @@
   <ul>
      
   <li>
  -<font face="verdana, helvetica, sans serif">December 2002         : 2.0.4 (bug fix release)</font>
  +<font face="verdana, helvetica, sans serif">Not schedulded yet : 2.1 Alpha</font>
   </li>
      
   <li>
  -<font face="verdana, helvetica, sans serif">December 2002         : 2.1 Alpha</font>
  +<font face="verdana, helvetica, sans serif">Not schedulded yet : 2.1 Beta 1</font>
   </li>
      
   <li>
  -<font face="verdana, helvetica, sans serif">End of February 2003  : 2.1 Beta 1</font>
  -</li>
  -   
  -<li>
  -<font face="verdana, helvetica, sans serif">On request            : 2.0.5 (bug fix release)</font>
  +<font face="verdana, helvetica, sans serif">On request         : 2.0.5 (bug fix release)</font>
   </li>
     
   </ul>
  @@ -150,14 +146,6 @@
    
   
    
  -<font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Version 2.0.4</font>
  -<hr style="color: #0086b2" size="1">
  -   
  -<p>
  -<font color="black" face="verdana,helvetica,sanserif">See the todo list for more information.</font>
  -</p>
  - 
  - 
   <font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Version 2.1 Beta 1</font>
   <hr style="color: #0086b2" size="1">
   
  @@ -193,16 +181,16 @@
   </li>
   
   <li>
  -<font face="verdana, helvetica, sans serif">switch to LogEnabled</font>
  +<font face="verdana, helvetica, sans serif">more tests and examples on the flowmap. Seems to me that this 
  +strategic stuff has been a set a bit aside due to lack of time.</font>
   </li>
   
   <li>
  -<font face="verdana, helvetica, sans serif">extended sitemap variable substitution, i.e. {request:foo}.</font>
  +<font face="verdana, helvetica, sans serif">Move complete Source implementation to Excalibur</font>
   </li>
   
   <li>
  -<font face="verdana, helvetica, sans serif">more tests and examples on the flowmap. Seems to me that this 
  -strategic stuff has been a set a bit aside due to lack of time.</font>
  +<font face="verdana, helvetica, sans serif">Change implementation for SitemapConfigurable</font>
   </li>
   
   </ul>
  
  
  
  1.5       +3 -3      xml-site/targets/cocoon/tutorial/tutorial-rmi-generator.html
  
  Index: tutorial-rmi-generator.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/tutorial/tutorial-rmi-generator.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tutorial-rmi-generator.html	19 Oct 2002 13:32:58 -0000	1.4
  +++ tutorial-rmi-generator.html	10 Mar 2003 15:56:48 -0000	1.5
  @@ -1639,12 +1639,12 @@
   <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
   <pre>
   ...
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.sax.SAXParser;
   ...
  -Parser parser = null;
  +SAXParser parser = null;
   
     try {
  -    parser = (Parser)this.manager.lookup(Parser.ROLE);
  +    parser = (SAXParser)this.manager.lookup(SAXParser.ROLE);
       parser.parse(this.getInputSource(),handler);
     } catch (SAXException e) {
       // Preserve original exception
  
  
  
  1.12      +1 -1      xml-site/targets/cocoon/userdocs/concepts/catalog.html
  
  Index: catalog.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/concepts/catalog.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalog.html	28 Dec 2002 10:54:50 -0000	1.11
  +++ catalog.html	10 Mar 2003 15:56:48 -0000	1.12
  @@ -942,7 +942,7 @@
      The SAX <code><font face="courier, monospaced">Parser</font></code> interface provides an <code><font face="courier, monospaced">entityResolver</font></code>
      hook to allow an application to resolve the external entities. This is
      enabled via 
  -   <code><font face="courier, monospaced">org.apache.avalon.excalibur.xml.EntityResolver</font></code>
  +   <code><font face="courier, monospaced">org.apache.excalibur.xml.EntityResolver</font></code>
     </font>
   </p>
   
  
  
  
  1.9       +1 -1      xml-site/targets/cocoon/userdocs/concepts/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/concepts/index.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- index.html	6 Dec 2002 15:30:59 -0000	1.8
  +++ index.html	10 Mar 2003 15:56:48 -0000	1.9
  @@ -1464,7 +1464,7 @@
   export CVSROOT=:pserver:anoncvs@cvs.apache.org:/home/cvspublic 
   cvs login 
   Password: anoncvs 
  -cvs checkout xml-cocoon2
  +cvs checkout cocoon-2.0
   </pre>
   </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
   </tr>
  
  
  
  1.11      +1 -1      xml-site/targets/cocoon/userdocs/concepts/sitemap.html
  
  Index: sitemap.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/concepts/sitemap.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sitemap.html	6 Dec 2002 15:30:59 -0000	1.10
  +++ sitemap.html	10 Mar 2003 15:56:49 -0000	1.11
  @@ -2279,7 +2279,7 @@
     
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -     Check out a draft XML Schema <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain">grammar for the Cocoon sitemap</a>, and some <a href="http://outerthought.net/sitemap/">external documentation</a>
  +     Check out a draft XML Schema <a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.0/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain">grammar for the Cocoon sitemap</a>, and some <a href="http://outerthought.net/sitemap/">external documentation</a>
        generated from this Schema. A poster diagram of
        the sitemap structure is also available.
      </font>
  
  
  
  1.3       +2 -2      xml-site/targets/cocoon/userdocs/concepts/validation.html
  
  Index: validation.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/concepts/validation.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- validation.html	28 Dec 2002 10:54:50 -0000	1.2
  +++ validation.html	10 Mar 2003 15:56:49 -0000	1.3
  @@ -353,7 +353,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
   See 
  -<a href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/tools/src/schematron/README.txt?rev=HEAD&content-type=text/vnd.viewcvs-markup">xml-cocoon2/tools/src/schematron/README.txt</a>
  +<a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.0/tools/src/schematron/README.txt?rev=HEAD&content-type=text/vnd.viewcvs-markup">cocoon-2.0/tools/src/schematron/README.txt</a>
     </font>
   </p>
   
  @@ -361,7 +361,7 @@
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
   See notes in the top of 
  -xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v06.rng
  +cocoon-2.0/src/webapp/WEB-INF/entities/sitemap-v06.rng
     </font>
   </p>
   
  
  
  
  1.11      +4 -0      xml-site/targets/cocoon/userdocs/serializers/serializers.html
  
  Index: serializers.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/serializers/serializers.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- serializers.html	31 Dec 2002 05:56:03 -0000	1.10
  +++ serializers.html	10 Mar 2003 15:56:49 -0000	1.11
  @@ -260,6 +260,10 @@
   <li>
   <font face="verdana, helvetica, sans serif"><a href="link-serializer.html">Link Serializer</a></font>
   </li>
  +        
  +<li>
  +<font face="verdana, helvetica, sans serif"><a href="ziparchive-serializer.html">Zip archive Serializer</a></font>
  +</li>
         
   </ul>
   </blockquote>
  
  
  
  1.7       +2 -2      xml-site/targets/cocoon/userdocs/serializers/xls-serializer.html
  
  Index: xls-serializer.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/serializers/xls-serializer.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- xls-serializer.html	31 Dec 2002 05:56:03 -0000	1.6
  +++ xls-serializer.html	10 Mar 2003 15:56:49 -0000	1.7
  @@ -269,8 +269,8 @@
                           As for the stylesheets tts best to look at the sources 
                           for the Cocoon samples.  You'll find the HSSF Serializer 
                           examples under "Legacy Formats" from the main samples 
  -                        page.  You can find the source under <a href="http://cvs.apache.org/viewcvs/xml-cocoon2/src/webapp/samples/poi/">
  -                        xml-cocoon2/src/webapp/samples/poi</a> in the Cocoon 
  +                        page.  You can find the source under <a href="http://cvs.apache.org/viewcvs/cocoon-2.0/src/webapp/samples/poi/">
  +                        cocoon-2.0/src/webapp/samples/poi</a> in the Cocoon 
                           sources.
                           </font>
   </p>                        
  
  
  
  1.4       +39 -15    xml-site/targets/cocoon/userdocs/serializers/ziparchive-serializer.html
  
  Index: ziparchive-serializer.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/serializers/ziparchive-serializer.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ziparchive-serializer.html	31 Dec 2002 05:56:03 -0000	1.3
  +++ ziparchive-serializer.html	10 Mar 2003 15:56:49 -0000	1.4
  @@ -156,23 +156,36 @@
   <font color="black" face="verdana,helvetica,sanserif">The Zip archive serializer generates a zip archive by aggregating several sources.</font>
   </p>
   		
  -		  
  + 
   <p>
   <font color="black" face="verdana,helvetica,sanserif">The input document should describe entries of the archive by means of
  -           their name (which can be a path) in the archive and the source of the entry
  -           contents. These are Cocoon sources, and as such can use any of the protocols
  -           handled by Cocoon, including "cocoon:" to include dynamically generated
  -           content in the archive.
  -        </font>
  + their name (which can be a path) and their content either as URLs or
  + inline data :</font>
   </p>
  -
  -        
  + 
  +<blockquote>
  +<ul>
  +   
  +<li>
  +<font face="verdana, helvetica, sans serif">URLs, given by the "src" attribute, are Cocoon sources and as such
  +       can use any of the protocols handled by Cocoon, including "cocoon:" to
  +       include dynamically generated content in the archive.</font>
  +</li>
  +   
  +<li>
  +<font face="verdana, helvetica, sans serif">inline data is represented by an XML document that is serialized to the
  +       zip entry using the serializer identified by the "serializer" attribute.</font>
  +</li>
  +   
  +</ul>
  +</blockquote>
  + 
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
  -          Example :
  -        </font>
  +   Example :
  + </font>
   </p>
  -          
  +
   <div align="center">
   <table border="0" cellpadding="0" cellspacing="4">
   <tr>
  @@ -181,10 +194,20 @@
   <tr>
   <td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
   <pre>
  -&lt;zip-archive:zip xmlns:zip-archive="http://apache.org/cocoon/zip-archive/1.0"&gt;
  -  &lt;zip-archive:entry name="foo.html" src="cocoon://dynFoo.html"/&gt;
  -  &lt;zip-archive:entry name="images/bar.jpeg" src="bar.jpeg"/&gt;
  -&lt;/zip-archive:zip&gt;
  +&lt;zip:archive xmlns:zip="http://apache.org/cocoon/zip-archive/1.0"&gt;
  +  &lt;zip:entry name="foo.html" src="cocoon://dynFoo.html"/&gt;
  +  &lt;zip:entry name="images/bar.jpeg" src="bar.jpeg"/&gt;
  +  &lt;zip:entry name="index.html" serializer="html"&gt;
  +    &lt;html&gt;
  +      &lt;head&gt;
  +        &lt;title&gt;Index page&lt;/title&gt;
  +      &lt;/head&gt;
  +      &lt;body&gt;
  +        Please go &lt;a href="foo.html"&gt;there&lt;/a&gt;
  +      &lt;/body&gt;
  +    &lt;/html&gt;
  +  &lt;/zip:entry&gt;
  +&lt;/zip:archive:zip&gt;
   </pre>
   </td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
   </tr>
  @@ -193,6 +216,7 @@
   </tr>
   </table>
   </div>
  +
   		   
   <blockquote>
   <ul>
  
  
  
  1.9       +324 -44   xml-site/targets/cocoon/userdocs/transformers/cinclude-transformer.html
  
  Index: cinclude-transformer.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/transformers/cinclude-transformer.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- cinclude-transformer.html	19 Oct 2002 13:33:01 -0000	1.8
  +++ cinclude-transformer.html	10 Mar 2003 15:56:49 -0000	1.9
  @@ -151,10 +151,12 @@
      
   <p>
   <font color="black" face="verdana,helvetica,sanserif">This transformer includes XML in the current stream and acts therefore
  -      is a kind of (dynamic) content aggregation. Two forms, one verbose
  +      as a kind of (dynamic) content aggregation. Two forms, one verbose
         and flexible approach, and a simple approach are supported by the
         transformer. We will first discuss the simple approach and
  -      the more flexible is mentioned in the next chapter.</font>
  +      the more flexible is mentioned in the next chapter. In addition
  +      the cinclude transformer provides a caching mechanism (for the
  +      simple include form).</font>
   </p>
      
   <p>
  @@ -187,48 +189,6 @@
   </ul>
   </blockquote>
      
  -<blockquote>
  -<ul>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif">Name : cinclude</font>
  -</li>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif">Class: org.apache.cocoon.transformation.CachingCIncludeTransformer</font>
  -</li>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif">Cacheable: yes.</font>
  -</li>
  -   
  -</ul>
  -</blockquote>
  -   
  -<p>
  -<font color="black" face="verdana,helvetica,sanserif">
  -    There are two versions of CIncludeTransformer available:
  -   </font>
  -</p>
  -   
  -<blockquote>
  -<ul>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif">A non caching version
  -     <code><font face="courier, monospaced">org.apache.cocoon.transformation.CIncludeTransformer</font></code>
  -    </font>
  -</li>
  -    
  -<li>
  -<font face="verdana, helvetica, sans serif">A caching version
  -     <code><font face="courier, monospaced">org.apache.cocoon.transformation.CachingCIncludeTransformer</font></code>
  -    </font>
  -</li>
  -   
  -</ul>
  -</blockquote>
  -   
   <p>
   <font color="black" face="verdana,helvetica,sanserif">
       A simple example might help to use the CIncludeTransfomer effectivly:
  @@ -560,6 +520,326 @@
   			 configuration.</font>
   </p> 
   		 
  +  
  +<font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Caching</font>
  +<hr style="color: #0086b2" size="1">
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">This transformer includes XML in the current stream and acts therefore
  +      as a kind of (dynamic) content aggregation. However, the included content
  +      might be very big or either it might take a lot of time to fetch
  +      the content. If, in those cases, your content does not change too
  +      frequently, you can turn on caching for these contents.</font>
  +</p>
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +    To turn on caching, this transformer triggers for the element <code><font face="courier, monospaced">cached-include</font></code> 
  +    in the namespace "http://apache.org/cocoon/include/1.0/caching".
  +    The <code><font face="courier, monospaced">src</font></code> attribute contains the url which points to
  +    an xml resource that is included instead of the element.
  +    It is possible to mix the <code><font face="courier, monospaced">cached-include</font></code> and the <code><font face="courier, monospaced">include</font></code>
  +    element, so only parts are cached and others are not.
  +   </font>
  +</p>
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +    A simple example might help to use the caching effectivly:
  +   </font>
  +</p>
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +     First define your pipeline to use the CIncludeTransformer with
  +     caching turned on; you turn on caching by setting the <code><font face="courier, monospaced">expires</font></code>
  +     parameter to a value greater than 0. The exact meaning of this
  +     parameter is explained below.
  +   </font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  +&lt;map:match pattern="cinc/simple-cinc"&gt;
  +  &lt;map:generate src="cinc/simple-cinc.xml"/&gt;
  +  &lt;map:transform type="cinclude"&gt;
  +      &lt;map:parameter name="expires" value="600"/&gt;
  +  &lt;/map:transform&gt;
  +  &lt;map:transform src="stylesheets/page/simple-page2html.xsl"/&gt;
  +  &lt;map:serialize/&gt;
  +&lt;/map:match&gt;
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>
  +
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +    In this example-pipeline it is assumed that simple-cinc.xml contains
  +    the <code><font face="courier, monospaced">cached-include</font></code> element. Beside defining the element
  +    it uses the namespache URI "http://apache.org/cocoon/include/1.0".
  +    This helps the transformer to find the tag to get replaced by
  +    the xml content referenced via the src attribute.
  +    The simple-cinc.xml may look like this:
  +   </font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  +&lt;?xml version="1.0" encoding="UTF-8"?&gt;
  +&lt;page 
  +  xmlns:cinclude="http://apache.org/cocoon/include/1.0"&gt;
  +  &lt;title&gt;Hello&lt;/title&gt;
  +  &lt;content&gt;
  +    &lt;para&gt;This is my first Cocoon page!&lt;/para&gt;
  +    &lt;cinclude:cached-include src="http://server/document1.xml"/&gt;
  +    &lt;cinclude:cached-include src="http://server/document2.xml"/&gt;
  +  &lt;/content&gt;
  +&lt;/page&gt;
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>
  +
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +    Now finally we have everything put together the xml content after the
  +    CIncludeTransformer processing will look like this:
  +   </font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  +&lt;?xml version="1.0" encoding="UTF-8"?&gt;
  +&lt;page 
  +  xmlns:cinclude="http://apache.org/cocoon/include/1.0"&gt;
  +  &lt;title&gt;Hello&lt;/title&gt;
  +  &lt;content&gt;
  +    &lt;para&gt;This is my first Cocoon page!&lt;/para&gt;
  +    &lt;document1&gt;
  +        CONTENT OF document 1
  +    &lt;/document1&gt;
  +    &lt;document2&gt;
  +        CONTENT OF document 2
  +    &lt;/document2&gt;
  +  &lt;/content&gt;
  +&lt;/page&gt;
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>
  +  
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">So, of course even with caching turned on, this transformer acts like the 
  +  usual cinclude transformer. But as you can see from the example above, you 
  +  can define an expires value. The fetched content is cached for the duration of 
  +  this value; in the example above the content is cached for 10 minutes. So, if 
  +  during the next 10 minutes after the first time this pipeline was processed, 
  +  someone else requests this pipeline, the content is not fetched again from a 
  +  distant server (or whereever the content is stored). It is directly delivered 
  +  from the cache. When the 10 minutes have expired, the next time the pipeline 
  +  is requested, the content is fetched again and stored in the cache for the 
  +  next 10 minutes.</font>
  +</p>
  +  
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">You can fine tune the behaviour of the transformer with several parameters.</font>
  +</p>
  +  
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">The <code><font face="courier, monospaced">expires</font></code> parameter defines the expiration date of the
  +    content in seconds from the time the pipeline is requested.</font>
  +</p>
  + 
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">Usually the content is cached in the common store, but you
  +   can also define a writeable/modifiable source with the "source" parameter,
  + e.g. "file:/c:/temp". Then the cached content is written into this
  + directory.</font>
  +</p>
  + 
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">With the optional <code><font face="courier, monospaced">purge</font></code> set to <code><font face="courier, monospaced">true</font></code>
  +  the cache is purged which means the cached content is regarded as
  +  invalid nevertheless if it has expired or not.</font>
  +</p>
  + 
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">With the optional parameter <code><font face="courier, monospaced">parallel</font></code> the various
  +  included contents are processed (included) in parallel rather than
  +  in a series.</font>
  +</p>
  + 
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">With the optional parameter <code><font face="courier, monospaced">preemptive</font></code> set to <code><font face="courier, monospaced">true</font></code>
  +  a pre-emptive caching is activated. When a resource is requested with
  +  pre-emptive caching, this transformer always attempts to get the 
  +  content from the cache. If the content is not in the cache, it is
  +  of course retrieved from the original source and cached.
  +  If the cached resource has expired, it is still provided. The cache
  +  is updated by a background task. This task has to be started
  +  beforehand.</font>
  +</p>
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">
  +     Complete Example:
  +   </font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  +&lt;map:match pattern="cinc/simple-cinc"&gt;
  +  &lt;map:generate src="cinc/simple-cinc.xml"/&gt;
  +  &lt;map:transform type="cinclude"&gt;
  +      &lt;map:parameter name="expires" value="600"/&gt;
  +      &lt;map:parameter name="purge" value="false"/&gt;
  +      &lt;map:parameter name="parallel" value="true"/&gt;
  +      &lt;map:parameter name="preemptive" value="false"/&gt;
  +      &lt;map:parameter name="source" value="file:/c:/temp"/&gt;
  +  &lt;/map:transform&gt;
  +  &lt;map:transform src="stylesheets/page/simple-page2html.xsl"/&gt;
  +  &lt;map:serialize/&gt;
  +&lt;/map:match&gt;
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>
  +  
  +  
  +<font face="verdana, helvetica, sans serif" size="+2" color="#0086b2">Configuration</font>
  +<hr style="color: #0086b2" size="1">
  +
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">Besides the usual transformer configuration, this transformer requires some components.
  +You have to add the following lines to the cocoon.xconf:</font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  + &lt;component class="org.apache.cocoon.transformation.helpers.DefaultIncludeCacheManager" 
  +            role="org.apache.cocoon.transformation.helpers.IncludeCacheManager"
  +            logger="test"&gt;
  +    &lt;!-- Specify this only if you use preemptive-caching --&gt;
  +    &lt;parameter name="preemptive-loader-url" value="http://localhost:8080/cocoon/loader"/&gt;
  + &lt;/component&gt;
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>
  +  
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">If you want to use preemptive caching, you have to specify a URI inside Cocoon that contains 
  +     the preemptive-loader action. This pipeline is automatically called, when
  +     preemptive loading is actived and requried. It loads the content in the background.</font>
  +</p>
  +     
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">First you have to define the action:</font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  +...
  +&lt;map:components&gt;
  +...
  +  &lt;map:actions&gt;
  +  ...
  +      &lt;map:action name="preemptive"
  +                  src="org.apache.cocoon.transformation.helpers.PreemptiveLoaderAction"/&gt;
  +  ...
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>  
  +   
  +<p>
  +<font color="black" face="verdana,helvetica,sanserif">Then you must define a pipeline containing the action. This is the pipeline that
  +   has to be configured in the cocoon.xconf:</font>
  +</p>
  +
  +<div align="center">
  +<table border="0" cellpadding="0" cellspacing="4">
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td bgcolor="#ffffff">
  +<pre>
  +   &lt;map:match pattern="loader"&gt;
  +       &lt;map:act type="preemptive"&gt;&lt;/map:act&gt;
  +   &lt;/map:match&gt;
  +</pre>
  +</td><td width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +<tr>
  +<td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td><td height="1" width="1" bgcolor="#0086b2"><img border="0" hspace="0" vspace="0" height="1" width="1" src="images/void.gif"></td>
  +</tr>
  +</table>
  +</div>  
  +
    
   
   </td>
  
  
  
  1.9       +2 -2      xml-site/targets/cocoon/userdocs/transformers/sql-transformer.html
  
  Index: sql-transformer.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/transformers/sql-transformer.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- sql-transformer.html	19 Oct 2002 13:33:02 -0000	1.8
  +++ sql-transformer.html	10 Mar 2003 15:56:49 -0000	1.9
  @@ -482,7 +482,7 @@
         &lt;page xmlns:sql="http://apache.org/cocoon/SQL/2.0"&gt;
           &lt;execute-query xmlns="http://apache.org/cocoon/SQL/2.0"&gt; 
             &lt;query&gt;
  -           select id,name from employee_table where name = '&lt;substitute-value 
  +           select id,name from employee_table where name = '&lt;sql:substitute-value 
         sql:name="username"/&gt;'
             &lt;/query&gt;
           &lt;/execute-query&gt;
  @@ -776,7 +776,7 @@
         &lt;page xmlns:sql="http://apache.org/cocoon/SQL/2.0"&gt;
           &lt;execute-query xmlns="http://apache.org/cocoon/SQL/2.0"&gt; 
             &lt;query isstoredprocedure="true" name="namesearch"&gt;
  -              begin QUICK_SEARCH.FIND_NAME('&lt;substitute-value 
  +              begin QUICK_SEARCH.FIND_NAME('&lt;sql:substitute-value 
         sql:name="username"/&gt;',?,?,?); end;
             &lt;/query&gt;
             &lt;out-parameter sql:nr="1" sql:name="code" 
  
  
  
  1.8       +9 -0      xml-site/targets/cocoon/userdocs/xsp/logicsheet-concepts.html
  
  Index: logicsheet-concepts.html
  ===================================================================
  RCS file: /home/cvs/xml-site/targets/cocoon/userdocs/xsp/logicsheet-concepts.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- logicsheet-concepts.html	19 Oct 2002 13:33:02 -0000	1.7
  +++ logicsheet-concepts.html	10 Mar 2003 15:56:49 -0000	1.8
  @@ -1466,6 +1466,15 @@
   <hr style="color: #0086b2" size="1">
      
   <p>
  +<table border="0" cellpadding="0" cellspacing="3" width="100%">
  +<tr>
  +<td valign="top" width="28"><img alt="Note" border="0" hspace="0" vspace="0" height="29" width="28" src="images/note.gif"></td><td valign="top"><font color="black" face="verdana,helvetica,sanserif" size="-1"><i>As of today, the SiLLy Logicsheet Language does not exist. What is described below
  +     are thoughts on possible implementation of the language.</i></font></td>
  +</tr>
  +</table>
  +</p>
  +   
  +<p>
   <font color="black" face="verdana,helvetica,sanserif">
        In order to overcome the extreme complexity of logicsheet transformations
        expressed in XSLT, a simpler, higher-level XML transformation language
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: general-cvs-help@xml.apache.org


Mime
View raw message