cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 36463 - in cocoon/branches/BRANCH_2_1_X/src/documentation: stylesheets xdocs xdocs/faq xdocs/howto xdocs/installing xdocs/plan xdocs/userdocs/concepts xdocs/userdocs/forms xdocs/userdocs/generators xdocs/userdocs/offline xdocs/userdocs/selectors xdocs/userdocs/transformers xdocs/userdocs/xsp
Date Mon, 16 Aug 2004 08:30:44 GMT
Author: cziegeler
Date: Mon Aug 16 01:30:40 2004
New Revision: 36463

Added:
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/roadmap.xml   (contents, props changed)
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/calendar-generator.xml   (contents, props changed)
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/jx-generator.xml   (contents, props changed)
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/mp3directory-generator.xml   (contents, props changed)
Modified:
   cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/changes2document.xsl
   cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/site2xhtml.xsl
   cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/statuschanges2document.xsl
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/book.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-configure-environment.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-xslt.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/features.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/howto-bugzilla.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/index.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/index.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/installing/updating.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/performancetips.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/book.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/doc.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/issues-doc.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/release.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/todo-doc.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/updating.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/modules-ref.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/xmlsearching.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/book.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/validation.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/book.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/directory-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/file-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/generators.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/linkstatus-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/request-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/status-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/stream-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/xpathdirectory-generator.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/offline/configuration.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/selectors.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml
Log:
Syncing documentation

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/changes2document.xsl
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/changes2document.xsl	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/changes2document.xsl	Mon Aug 16 01:30:40 2004
@@ -23,7 +23,7 @@
 
  <xsl:param name="name"/>
 
- <xsl:variable name="bugzilla" select="'http://nagoya.apache.org/bugzilla/'"/>
+ <xsl:variable name="bugzilla" select="'http://issues.apache.org/bugzilla/'"/>
  <xsl:variable name="singleBug" select="concat($bugzilla, 'show_bug.cgi?id=')"/>
  <xsl:variable name="buglist" select="concat($bugzilla, 'buglist.cgi?bug_id=')"/>
 

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/site2xhtml.xsl
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/site2xhtml.xsl	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/site2xhtml.xsl	Mon Aug 16 01:30:40 2004
@@ -25,6 +25,7 @@
         <title>
           <xsl:value-of select="/site/document/title"/>
         </title>
+	<link rel="shortcut icon" href="favicon.ico"/>
         <style type="text/css">
 a.menu {
 	color: #FFFFFF;

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/statuschanges2document.xsl
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/statuschanges2document.xsl	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/stylesheets/statuschanges2document.xsl	Mon Aug 16 01:30:40 2004
@@ -23,7 +23,7 @@
 
  <xsl:param name="name"/>
 
- <xsl:variable name="bugzilla" select="'http://nagoya.apache.org/bugzilla/'"/>
+ <xsl:variable name="bugzilla" select="'http://issues.apache.org/bugzilla/'"/>
  <xsl:variable name="singleBug" select="concat($bugzilla, 'show_bug.cgi?id=')"/>
  <xsl:variable name="buglist" select="concat($bugzilla, 'buglist.cgi?bug_id=')"/>
 

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/book.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/book.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/book.xml	Mon Aug 16 01:30:40 2004
@@ -42,14 +42,14 @@
     <menu-item label="How-Tos" href="howto/index.html"/>
     <menu-item label="Performance" href="performancetips.html"/>
     <menu-item label="Snippets" href="snippet/index.html"/>
-    <external label="Wiki Docs" href="http://wiki.cocoondev.org/"/>
+    <external label="Wiki Docs" href="http://wiki.apache.org/cocoon/"/>
   </menu>
 
   <menu label="Status">
     <menu-item label="Changes" href="changes.html"/>
     <menu-item label="Todo" href="todo.html"/>
     <menu-item label="Planning notes" href="plan/index.html"/>
-    <external label="Patch queue" href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Cocoon+2&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;namedcmd=Cocoon+all&amp;newqueryname=cocoon+patch+queue&amp;tofooter=1&amp;order=Reuse+same+sort+as+last+time"/>
+    <external label="Patch queue" href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Cocoon+2&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;namedcmd=Cocoon+all&amp;newqueryname=cocoon+patch+queue&amp;tofooter=1&amp;order=Reuse+same+sort+as+last+time"/>
   </menu>
 
   <menu label="Community">
@@ -61,7 +61,7 @@
   </menu>
 
   <menu label="Project">
-    <external label="Bug Database" href="http://nagoya.apache.org/bugzilla/index.html"/>
+    <external label="Bug Database" href="http://issues.apache.org/bugzilla/index.html"/>
     <external label="Code Repository" href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/"/>
     <external label="Dev Snapshots" href="http://cocoon.apache.org/mirror.cgi#nightly"/>
   </menu>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-configure-environment.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-configure-environment.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-configure-environment.xml	Mon Aug 16 01:30:40 2004
@@ -213,7 +213,7 @@
   <answer>
     <p>
       See the Wiki page 
-      <link href="http://wiki.cocoondev.org/Wiki.jsp?page=ApacheModProxy">ApacheModProxy</link>
+      <link href="http://wiki.apache.org/cocoon/ApacheModProxy">ApacheModProxy</link>
       for a thorough discussion of this topic.
     </p>
     <p>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-xslt.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-xslt.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/faq/faq-xslt.xml	Mon Aug 16 01:30:40 2004
@@ -205,7 +205,9 @@
 be mindful of some unresolved caching issues in Cocoon related to the document() function.
 At this time, Cocoon is unable to check validity of content included via the document()
 function. In addition, the document() function implemented by Xalan is inefficient. See:
-  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4257
+  <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=4257">Issue 4257</link>
+  and
+  <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28341">Issue 28341</link>
 Until this bug is fixed, consider using Saxon instead for document() function-related parsing
 needs.
   </p>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/features.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/features.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/features.xml	Mon Aug 16 01:30:40 2004
@@ -101,8 +101,19 @@
           datasources and output formats)
         </li>
         <li>
-          Create static content (automatically) by separating data from view
-          - see <link href="http://xml.apache.org/forrest/">Apache Forrest</link>
+          Create static content (automatically) by separating data from view</li>
+        <li>
+          Offline generation modes with Cocoon's own
+          <link href="userdocs/offline/">offline facilities</link>:
+          command-line interface (CLI), ant task, bean. Also with
+          <link href="http://forrest.apache.org/">Apache Forrest</link>
+          which utilises Cocoon.
+        </li>
+        <li>
+          Dynamic document preparation with
+          <link href="http://forrest.apache.org/">Apache Forrest</link>,
+          the '<code>forrest run</code>' mode. Use many different data input
+          formats, see the transformed result immediately in the browser.
         </li>
         <li>
           Advanced web applications with J2EE integration
@@ -337,7 +348,7 @@
       <ul>
         <li>
            Enhanced form handling with strong validation through 
-           <link href="http://wiki.cocoondev.org/Wiki.jsp?page=Woody">CocoonForms</link>
+           <link href="userdocs/forms/index.html">Cocoon Forms</link>
         </li>
         <li>
            Easy integration of (future) <fork href="http://www.w3.org/TR/xforms/">XForms</fork> clients

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/howto-bugzilla.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/howto-bugzilla.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/howto-bugzilla.xml	Mon Aug 16 01:30:40 2004
@@ -76,7 +76,7 @@
 	<s1 title="Steps">
 <p>
 Here is how to proceed. Go to
-<fork href="http://nagoya.apache.org/bugzilla/">Bugzilla</fork>
+<fork href="http://issues.apache.org/bugzilla/">Bugzilla</fork>
 in another browser window.
 </p>
 
@@ -343,7 +343,7 @@
 	<ul>
 <li>
 Bugzilla is at 
-<link href="http://nagoya.apache.org/bugzilla/">http://nagoya.apache.org/bugzilla/</link>
+<link href="http://issues.apache.org/bugzilla/">http://issues.apache.org/bugzilla/</link>
 </li>
 <li>
 Helpful Bug Writing Guidelines are available directly from the

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/index.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/index.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/howto/index.xml	Mon Aug 16 01:30:40 2004
@@ -35,7 +35,7 @@
 
   <s2 title="Using Cocoon">
 	<p>See the Wiki for other
-        <link href="http://wiki.cocoondev.org/Wiki.jsp?page=HowTos">How-to</link> documents.</p>
+        <link href="http://wiki.apache.org/cocoon/HowTos">How-to</link> documents.</p>
 	<p><strong>Note:</strong> The following short list of documents were
           created before the Wiki started, so some of them may be out-of-date
           and the list is certainly incomplete, e.g. Cocoon now has various

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/index.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/index.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/index.xml	Mon Aug 16 01:30:40 2004
@@ -41,9 +41,9 @@
         development.
       </p>
       <p>
-        Cocoon implements these concepts around the notion of 'component pipelines',
+        Cocoon implements these concepts around the notion of "component pipelines",
         each component on the pipeline specializing on a particular operation. This
-        makes it possible to use a Lego(tm)-like approach in building web solutions,
+        makes it possible to use a "building block" approach for web solutions,
         hooking together components into pipelines without any required programming.
       </p>
       <p>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/installing/updating.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/installing/updating.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/installing/updating.xml	Mon Aug 16 01:30:40 2004
@@ -221,9 +221,12 @@
         the <em>sax-connectors</em> configuration from <em>cocoon.xconf</em>.</p>
    </s2>
    <s2 title="Source Resolver">
-    <p>The SourceResolver is now an Avalon component
-      which can be accessed using <em>cocoon.manager.lookup(SourceResolver.ROLE).</em>.
-      The package name of the component is <em>org.apache.excalibur.source</em>.</p>
+    <p>
+      Every sitemap component gets a SourceResolver from the sitemap processor.
+      For all other components that need access to a SourceResolver, the SourceResolver 
+      is now an Avalon component that can be accessed using <em>cocoon.manager.lookup(SourceResolver.ROLE).</em>.
+      The package name of the component is <em>org.apache.excalibur.source</em>.
+    </p>
    </s2>
    <s2 title="XSLT Processor">
     <p>There are some issues related to JDK 1.4.</p>
@@ -231,7 +234,7 @@
       <p>Another serious issue is the presence of the Xalan and Xerces
        package in the JDK 1.4. For general information on this please read the
        <link href="http://xml.apache.org/xalan-j/faq.html#jdk14">Xalan FAQ</link> and our own
-       <link href="http://wiki.cocoondev.org/Wiki.jsp?page=EndorsedLibsProblem">EndorsedLibsProblem</link>
+       <link href="http://wiki.apache.org/cocoon/EndorsedLibsProblem">EndorsedLibsProblem</link>
        wiki page.
       </p>
       <p>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/performancetips.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/performancetips.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/performancetips.xml	Mon Aug 16 01:30:40 2004
@@ -47,9 +47,10 @@
       <li>Use a transparent proxy in front of your web server! The fastest
       response is the one that is not even processed. Cocoon is very slow
       (compared to a proxy server) to read resources such as stylesheets and
-      images. A transparent proxy (SQUID, for example, don't use Apache's
+      images. A transparent proxy (SQUID, for example, don't use Apache 1.3
       mod_proxy because it is not fully compatible with HTTP/1.1 and disables
-      connection keep-alive). Make sure you tune how long the static resources
+      connection keep-alive - Apache 2 mod_proxy is fine).
+      Make sure you tune how long the static resources
       that Cocoon "read"s from the sitemap are cached (look into the readers
       code to find out more).</li>
       

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/book.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/book.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/book.xml	Mon Aug 16 01:30:40 2004
@@ -26,6 +26,7 @@
 
   <menu label="Overview">
     <menu-item label="Planning Overview" href="index.html"/>
+    <menu-item label="Roadmap" href="roadmap.html"/>
   </menu>
 
   <menu label="Documentation">

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/doc.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/doc.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/doc.xml	Mon Aug 16 01:30:40 2004
@@ -62,7 +62,7 @@
 </p>
   <ul>
   <li>
-<link href="http://wiki.cocoondev.org/">Cocoon Wiki</link> 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.
+<link href="http://wiki.apache.org/cocoon/">Cocoon Wiki</link> 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.
   </li>
   <li>
 <link href="http://www.anyware-tech.com/wikiland/">Wikiland</link> is an ongoing development effort to build a Cocoon-based wiki architecture. Wikiland features a Cocoon dictionary as the pretext to use, test and develop the wiki. The project is seeking Cocoon-oriented developers to further its development. For more information, see the <link href="http://rossel.free.fr/" >Wikiland home page.</link>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/issues-doc.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/issues-doc.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/issues-doc.xml	Mon Aug 16 01:30:40 2004
@@ -40,8 +40,8 @@
 
   <p>
 The Cocoon Wiki has listings of some new documentation that is needed. See
-<link href="http://wiki.cocoondev.org/Wiki.jsp?page=DocsWishlist">DocsWishlist</link> and
-<link href="http://wiki.cocoondev.org/Wiki.jsp?page=CocoonDocsDrafts">CocoonDocsDrafts</link>.
+<link href="http://wiki.apache.org/cocoon/DocsWishlist">DocsWishlist</link> and
+<link href="http://wiki.apache.org/cocoon/CocoonDocsDrafts">CocoonDocsDrafts</link>.
   </p>
 
   <ul>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/release.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/release.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/release.xml	Mon Aug 16 01:30:40 2004
@@ -17,7 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <!--
-  $Id: release.xml,v 1.14 2004/05/19 11:33:35 cziegeler Exp $
+  $Id$
 -->
 
 <document>
@@ -31,28 +31,10 @@
  </header>
 
  <body>
- <s1 title="Timeframe">
-  <p>This is the current time frame for the next releases:</p>
-  <ul>
-   <li>May, 24th 2004     : 2.1.5 (maintenance release)</li>
-   <li>Not schedulded yet : 2.2 Milestone 1</li>
-   <li>On request         : 2.0.5 (maintenance release)</li>
-  </ul>
- </s1>
-
- <s1 title="Version 2.2 Milestone 1">
- <p>Although this version might be long in the future, we already have some plans...</p>
- <ul>
-  <li>Design and implement blocks</li>
-  <li>Move to a new Avalon container implementation (Fortress)</li>
- </ul>
- <p>The <link href="updating.html">updating to 2.2</link> document contains more information
-   on how to prepare your application for the next major release.</p>
- </s1>
  <s1 title="General tasks for a release">
   <ul>
    <li>We have many open
-    <link href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bugidtype=include&amp;product=Cocoon+2&amp;order=bugs.bug_id">
+    <link href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bugidtype=include&amp;product=Cocoon+2&amp;order=bugs.bug_id">
     bugs</link> in bugzilla. These must be reviewed
     and then solved (or declared invalid etc).</li>
    <li>Documentation updates (this area lacks most).

Added: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/roadmap.xml
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/roadmap.xml	Mon Aug 16 01:30:40 2004
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
+
+<!--
+  $Id: roadmap.xml 30942 2004-07-29 20:16:54Z vgritsenko $
+-->
+
+<document>
+ <header>
+  <title>Release Plan</title>
+  <subtitle>Planning Documentation</subtitle>
+  <authors>
+     <person email="users@cocoon.apache.org" name="The Cocoon Community"/>
+  </authors>
+ </header>
+
+ <body>
+ <s1 title="Timeframe">
+  <p>This is the current time frame for the next releases:</p>
+  <ul>
+   <li>July/August 2004   : 2.1.6 (maintenance release)</li>
+   <li>Not schedulded yet : 2.2 Milestone 1</li>
+  </ul>
+ </s1>
+ <s1 title="Roadmap">
+   <p>
+     In general, the next Cocoon version 2.2 can be seen as the 
+     "consolidation version". In the past a lot of new features, blocks
+     and components were added which resulted in the fact that 
+     in some places concurring solutions were developed that could be 
+     combined a little bit.
+   </p>
+   <p>
+     One good example is form handling where we now are concentrating 
+     on CForms. We will try this in other areas as well. Of course this 
+     does not mean that we won't add new features to 2.2, but we try to 
+     consolidate what we currently have as well.
+   </p>   
+   <p>
+     The follow is a list of items that are planned for the next minor release
+     of Cocoon (2.2). This is a dynamic list that might change over time :)
+   </p>
+   <p>
+     We have come to the conclusion that real blocks might take a little bit 
+     longer than we have expected. So we agreed on not affecting the current 
+     development of Cocoon by the real blocks development. Which means we have 
+     to develop the blocks system separately from Cocoon until the block 
+     system is stable enough to be "merged" into Cocoon. This allows us to 
+     release new versions of Cocoon (like 2.2) without waiting for blocks to 
+     be working/finished.
+   </p>
+   <ul>
+     <li>Official Versioning Guide (will be published soon).</li>
+     <li>Move source repository to Subversion.</li>
+     <li>Virtual sitemap components.</li>
+     <li>First finished version of CForms.</li>
+     <li>Deprecate (not remove!) XSP (and provide a viable alternative).</li>
+     <li>Cleaning up the caching/store mess.</li>
+     <li>Deprecate blocks that haven't been maintained in a long while 
+        or don't serve any evident purpose. Web3, apples, python, php, 
+        asciiart might be some candidates. We will decide this on a 
+        case-by-case basis.
+     </li>
+     <li>Differentiate between blocks that provide a service to other 
+        blocks and blocks that contain just samples or small applications 
+        built upon cocoon (petstore, tour, linotpye). Maybe "samples-only" 
+        blocks should be a separate download. Perhaps remove deprecated blocks etc.</li>
+     <li>
+       Review the implications and the implementation of pooling.
+     </li>
+     <li>
+       Reduce unneeded dependencies on Avalon, where possible.
+     </li>
+     <li>
+       Review the logging framework. Log4j is the de-facto standard and 
+       we have blocks that complain if Log4j is not properly configured, 
+       so let's accept it and stop reinventing the wheel.
+     </li>
+     <li>
+       Write more tests (you knew this one was coming ;-) ).
+     </li>
+   </ul>
+   <p>
+     The <link href="updating.html">updating to 2.2</link> document contains 
+     more information on how to prepare your application for the next mino 
+     release.
+   </p>
+  </s1>
+  <s1 title="The Future">
+    <p>
+      We already have plans for further versions of Cocoon that might be 
+      long in the future...
+    </p>
+    <ul>
+      <li>Design and implement blocks.</li>
+      <li>Move to a new Avalon container implementation (Fortress).</li>
+    </ul>
+  </s1>
+  
+ </body>
+</document>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/todo-doc.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/todo-doc.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/todo-doc.xml	Mon Aug 16 01:30:40 2004
@@ -18,7 +18,7 @@
 <!DOCTYPE todo PUBLIC "-//APACHE//DTD Todo V1.0//EN" "todo-v10.dtd">
 
 <!--
-  $Id: todo-doc.xml,v 1.3 2004/05/08 08:57:55 crossley Exp $
+  $Id$
 -->
 
 
@@ -189,7 +189,7 @@
    re-organisation of the menus, it is no longer linked in.
    Perhaps some of it should move into the new How-to docs.
    There is also an old patch waiting in Bugzilla ...
-   <link href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6435">Bug 6435</link>
+   <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6435">Bug 6435</link>
    which contains neglected contributions.
   </action> 
    

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/updating.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/updating.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/plan/updating.xml	Mon Aug 16 01:30:40 2004
@@ -47,14 +47,20 @@
     If you follow the instructions of this document closely, however,
     you should be able to quickly upgrade your Cocoon 2.1.x installation.
    </p>
+   <p>
+    In general, a good advice is that you avoid any calls to private or deprecated
+    API. If you are calling deprecated API, look up for an alternative. In most 
+    case this is documented in the java docs. If not or if you are calling private
+    API please ask on the mailing lists for a the "right way".
+   </p>
   </s1>
   <s1 title="Updating Your Application">
     <p>Currently, updating your application from an older version to the latest
-     version of Cocoon has do be done manually (but we are working on a better
+     version of Cocoon has to be done manually (but we are working on a better
      solution!).</p>
     <p>We suggest you, that you start from a clean Cocoon installation and 
     incorporate your changes into the cocoon.xconf, the sitemap etc. This
-    is in most cases much easier that starting with your old application
+    is in most cases much easier than starting with your old application
     and adapting it for Cocoon 2.2.x.</p>
   </s1>
   <s1 title="Sitemap Changes">
@@ -65,7 +71,7 @@
        <li>If the used reader has a mime-type definition, it is used.</li>
        <li>If both are not set, the reader itself has to provide the mime-type.</li>
       </ol>
-      <p>You can find further information in <link href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10277">bug entry 10277</link>.</p>
+      <p>You can find further information in <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10277">bug entry 10277</link>.</p>
     </s2>
   </s1>
   <s1 title="Recompilation">
@@ -85,6 +91,11 @@
       <p>The deprecated <em>getOutputStream</em> method of the <em>Environment</em> 
       interface has been removed. Use the <em>getOutputStream(int)</em> method
       instead.</p>
+      <p>
+        In addition some methods of the Environment interface have been changed,
+        removed and added. The environment is now free from any dependencies
+        to the Cocoon core and it is easier to create own environments.
+      </p>
     </s2>
     <s2 title="Cocoon Source Resolver Interface">
       <p>The deprecated <em>resolve</em> method of the 
@@ -106,10 +117,12 @@
         <li><em>org.apache.cocoon.components.source.DelayedRefreshSourceWrapper</em> - org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper</li>
         <li><em>org.apache.cocoon.components.source.FileSource</em> - Excalibur SourceResolver</li>
         <li><em>org.apache.cocoon.components.source.FileSourceFactory</em> - Not needed anymore</li>
+        <li><em>org.apache.cocoon.components.source.ModifiableTraversableSource</em> - Excalibur SourceResolver</li>
         <li><em>org.apache.cocoon.components.source.SitemapSource</em> - org.apache.cocoon.components.source.impl.SitemapSource</li>
         <li><em>org.apache.cocoon.components.source.SourceFactory</em> - org.apache.cocoon.components.source.impl.SitemapSourceFactory</li>
         <li><em>org.apache.cocoon.components.source.SourceHandler</em> - Not needed anymore</li>
         <li><em>org.apache.cocoon.components.source.SourceHandlerImpl</em> - Not needed anymore</li>
+        <li><em>org.apache.cocoon.components.source.TraversableSource</em> - Excalibur SourceResolver</li>
         <li><em>org.apache.cocoon.components.source.URLSource</em> - Excalibur SourceResolver</li>
         <li><em>org.apache.cocoon.components.source.impl.AvalonToCocoonSource</em> - Not needed anymore</li>
         <li><em>org.apache.cocoon.components.source.impl.AvalonToCocoonSourceInvocationHandler</em> - Not needed anymore</li>
@@ -120,6 +133,7 @@
         <li><em>org.apache.cocoon.components.url.ResourceURLFactory</em> - Excalibur SourceResolver</li>
         <li><em>org.apache.cocoon.components.url.URLFactory</em> - Not needed anymore</li>
         <li><em>org.apache.cocoon.components.url.URLFactoryImpl</em> - Not needed anymore</li>
+        <li><em>org.apache.cocoon.xml.XMLizable</em> - Excalibur SourceResolver</li>
       </ul>
     </s2>
     <s2 title="XML Parsing">
@@ -146,6 +160,7 @@
         <li><em>org.apache.cocoon.components.store.Store</em> - Excalibur Store</li>
         <li><em>org.apache.cocoon.components.store.StoreJanitor</em> - Excalibur Store</li>
         <li><em>org.apache.cocoon.components.store.StoreJanitorImpl</em> - Excalibur Store</li>
+        <li><em>org.apache.cocoon.components.store.impl.DefaultPersistentStore</em> - JCS Store</li>
       </ul>
     </s2>
     <s2 title="XSLT Processor">
@@ -156,15 +171,27 @@
     </s2>
     <s2 title="Sitemap Components">
       <ul>
+        <li><em>org.apache.cocoon.components.treeprocessor.MapStackResolver</em> - org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory</li>
         <li><em>org.apache.cocoon.matching.RegexpTargetHostMatcher</em> - org.apache.cocoon.matching.RegexpHostMatcher</li>
         <li><em>org.apache.cocoon.matching.RequestParamMatcher</em> - org.apache.cocoon.matching.RequestParameterMatcher</li>
         <li><em>org.apache.cocoon.matching.WildcardParameterValueMatcher</em> - org.apache.cocoon.matching.WildcardRequestParameterMatcher</li>
         <li><em>org.apache.cocoon.matching.helpers.WildcardURIMatcher</em> - org.apache.cocoon.matching.helpers.WildcardHelper</li>
         <li><em>org.apache.cocoon.selection.RequestSelector</em> - org.apache.cocoon.selection.RequestParameterSelector</li>
         <li><em>org.apache.cocoon.selection.SessionStateSelector</em> - org.apache.cocoon.selection.SessionAttributeSelector</li>
+        <li><em>org.apache.cocoon.sitemap.SitemapRedirector</em> - Removed</li>
+        <li><em>org.apache.cocoon.sitemap.XSLTFactoryLoader</em> - Removed</li>
         <li><em>org.apache.cocoon.transformation.CachingCIncludeTransformer</em> - org.apache.cocoon.transformation.CIncludeTransformer</li>
+        <li><em>org.apache.cocoon.transformation.helpers.MirrorRecorder</em> - Different alternatives, e.g. ParamSaxBuffer</li>
       </ul>
     </s2>
+    <s2 title="Request Lifecycle Components">
+      <p>
+        The deprecated class <em>org.apache.cocoon.components.RequestLifecycleComponent</em>
+        and the deprecated class <em>org.apache.cocoon.components.GlobalRequestLifecycleComponent</em>
+        have been removed. Use the <em>org.apache.cocoon.components.persistence.RequestDataStore</em>
+        component instead.
+      </p>
+    </s2>
   </s1>
   <s1 title="Caching">
     <p>Although the basic caching mechanism is still the same (each sitemap component
@@ -175,13 +202,13 @@
      <ul>
      <li><em>Cacheable</em> : Use the <em>CacheableProcessingComponent</em> interface that is very similar.</li>
      <li><em>CacheValidity</em> : Is replaced by <em>SourceValidity</em>.</li>
-     <li><em>AggregatedCacheValidity</em></li>
-     <li><em>CompositeCacheValidity</em></li> 
-     <li><em>DeltaTimeCacheValidity</em></li>
-     <li><em>IncludeCacheValidity</em></li>
-     <li><em>NOPCacheValidity</em></li>
-     <li><em>ParametersCacheValidity</em></li>
-     <li><em>TimeStampCacheValidity</em></li>
+     <li><em>AggregatedCacheValidity</em> - Excalibur SourceResolver</li>
+     <li><em>CompositeCacheValidity</em> - Excalibur SourceResolver</li> 
+     <li><em>DeltaTimeCacheValidity</em> - Excalibur SourceResolver</li>
+     <li><em>IncludeCacheValidity</em> - Excalibur SourceResolver</li>
+     <li><em>NOPCacheValidity</em> - Excalibur SourceResolver</li>
+     <li><em>ParametersCacheValidity</em> - Excalibur SourceResolver</li>
+     <li><em>TimeStampCacheValidity</em> - Excalibur SourceResolver</li>
      <li><em>CacheValidityToSourceValidity</em></li>
      <li><em>SourceCacheValidity</em></li>
      <li><em>CachedEventObject</em> : Is replaced by <em>CachedResponse</em>.</li>
@@ -212,7 +239,7 @@
       <p>Another serious issue is the presence of the Xalan and Xerces
        package in the JDK 1.4. For general information on this please read the
        <link href="http://xml.apache.org/xalan-j/faq.html#jdk14">Xalan FAQ</link> and our own
-       <link href="http://wiki.cocoondev.org/Wiki.jsp?page=EndorsedLibsProblem">EndorsedLibsProblem</link>
+       <link href="http://wiki.apache.org/cocoon/EndorsedLibsProblem">EndorsedLibsProblem</link>
        wiki page.
       </p>
       <p>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/modules-ref.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/modules-ref.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/modules-ref.xml	Mon Aug 16 01:30:40 2004
@@ -36,7 +36,7 @@
         experimentation.</p>
         
         <note>See also: the 
-        <link href="http://wiki.cocoondev.org/Wiki.jsp?page=InputModules">InputModules 
+        <link href="http://wiki.apache.org/cocoon/InputModules">InputModules 
         Wiki Page</link>.</note>
     </section>
 

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/xmlsearching.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/xmlsearching.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/concepts/xmlsearching.xml	Mon Aug 16 01:30:40 2004
@@ -41,7 +41,7 @@
       </p>
       <p>
         See also Wiki: 
-        <link href="http://wiki.cocoondev.org/Wiki.jsp?page=LuceneIndexTransformer">LuceneIndexTransformer</link>
+        <link href="http://wiki.apache.org/cocoon/LuceneIndexTransformer">LuceneIndexTransformer</link>
       </p>
     </s1>
  

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/book.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/book.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/book.xml	Mon Aug 16 01:30:40 2004
@@ -68,6 +68,6 @@
   </menu>
 
   <menu label="Other resources">
-    <menu-item label="Forms @ Wiki" href="http://wiki.cocoondev.org/Wiki.jsp?page=Forms"/>
+    <menu-item label="Forms @ Wiki" href="http://wiki.apache.org/cocoon/Forms"/>
   </menu>
 </book>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/validation.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/validation.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/forms/validation.xml	Mon Aug 16 01:30:40 2004
@@ -30,8 +30,26 @@
       fail, set a validation error on the widget.</p>
 
       <p>Implementation-wise, a widget validator is an object implementing
-      the <code>WidgetValidator</code> interface. [insert javadoc link
-      once those are published]</p>
+      the <code>WidgetValidator</code> interface
+      (<link href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/forms/validation/WidgetValidator.html">javadoc</link>).</p>
+
+      <p>WidgetValidators can either be defined as part of the form definition
+      (inside the <code>fd:validation</code> element) or added to a widget
+      instance at runtime. The former is useful for validators that only act
+      on the data in the form. The latter is useful if the validation logic
+      needs access to other objects you have available in your controller.</p>
+
+      <p>The validation logic runs over the widget tree. For each widget first
+      the child widgets are validated and then the widget itself (recursively).
+      The validators on a widget are executed in the order in which they were
+      defined or added. First the ones defined in the form definition are executed, then
+      the ones added on the widget instance. The validation of a widget stops at the
+      first validator that fails (but continues to execute for the other widgets).</p>
+
+      <p>For widgets having a datatype and hence a convertor (field and multivaluefield),
+      the convertor could be considered to be the first validator, i.e. it is executed
+      before the other validators (because those operate on the converted value).
+      If the conversion fails a validation error is set on the widget.</p>
 
       <p>Validation errors can only be set on widgets implementing
       the interface <code>ValidationErrorAware</code>, which currently is not
@@ -41,7 +59,7 @@
       different rows of the repeater, and set validation errors on these
       fields (instead of on the repeater itself).</p>
 
-      <p>CForms supplies a number of widget validators, mostly for performing
+      <p>CForms supplies a number of default widget validators, mostly for performing
       checks on the value of field widgets. Additionally you can write your
       own ones in Java or in Javascript.</p>
     </s1>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/book.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/book.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/book.xml	Mon Aug 16 01:30:40 2004
@@ -27,12 +27,14 @@
     <menu-item label="File Generator" href="file-generator.html"/>
   </menu>
   <menu label="Core">
+    <menu-item label="Calendar Generator" href="calendar-generator.html"/>
     <menu-item label="Directory Generator" href="directory-generator.html"/>
     <menu-item label="Image Directory Generator" href="imagedirectory-generator.html"/>
+    <menu-item label="JX Generator" href="jx-generator.html"/>
     <menu-item label="LinkStatus Generator" href="linkstatus-generator.html"/>
+    <menu-item label="MP3Directory Generator" href="mp3directory-generator.html"/>
     <menu-item label="Notifying Generator" href="error-generator.html"/>
     <menu-item label="Request Generator" href="request-generator.html"/>
-    <menu-item label="Server Pages Generator" href="serverpages-generator.html"/>
     <menu-item label="Status Generator" href="status-generator.html"/>
     <menu-item label="Stream Generator" href="stream-generator.html"/>
     <menu-item label="XPath Directory Generator" href="xpathdirectory-generator.html"/>
@@ -45,6 +47,7 @@
     <menu-item label="Profile Generator" href="profile-generator.html"/>
     <menu-item label="Script Generator" href="script-generator.html"/>
     <menu-item label="Search Generator" href="search-generator.html"/>
+    <menu-item label="Server Pages Generator" href="serverpages-generator.html"/>
     <menu-item label="Velocity Generator" href="velocity-generator.html"/>
     <menu-item label="Web Service Proxy Generator" href="wsproxy-generator.html"/>
     <menu-item label="XML:DB Collection Generator" href="xmldbcollection-generator.html"/>

Added: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/calendar-generator.xml
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/calendar-generator.xml	Mon Aug 16 01:30:40 2004
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
+
+<document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
+  <header>
+    <title>Description of the calendar generator</title>
+    <version>current</version>
+    <type>Reference</type>
+    <authors>
+      <person email="users@cocoon.apache.org" name="The Cocoon Community"/>
+    </authors>
+  </header>
+  <body>
+    <s1 title="Calendar Generator">
+     <p>Here is a sample output:</p>
+<source>
+  &lt;calendar:calendar xmlns:calendar="http://apache.org/cocoon/calendar/1.0"
+      year="2004" month="January" prevMonth="12" prevYear="2003"
+      nextMonth="02" nextYear="2004"&gt;
+    &lt;calendar:week number="1"&gt;
+      &lt;calendar:day number="1" date="January 1, 2004"/&gt;
+      &lt;calendar:day number="2" date="January 2, 2004"/&gt;
+      &lt;calendar:day number="3" date="January 3, 2004"/&gt;
+      &lt;calendar:day number="4" date="January 4, 2004"/&gt;
+    &lt;/calendar:week&gt;
+    ...
+  &lt;/calendar:calendar&gt;
+</source>
+ <p>The <em>src</em> parameter is ignored.</p>
+   </s1>
+  <s1 title="Configuration">
+   <p>Configuration options:</p>
+    <ul>
+     <li><em>month</em> (optional) : Sets the month for the calendar (January is 1). Default is the current month.</li>
+     <li><em>year</em> (optional) : Sets the year for the calendar. Default is the current year.</li>
+     <li><em>dateFormat</em> (optional) : Sets the format for the date attribute of each node, as described in 
+          java.text.SimpleDateFormat. If unset, the default format for the current locale will be used.</li>
+     <li><em>lang</em> (optional) : Sets the ISO language code for determining the locale.</li>
+     <li><em>country</em> (optional) : Sets the ISO country code for determining the locale.</li>
+    </ul>
+    </s1>
+  </body>
+</document>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/directory-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/directory-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/directory-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
   <header>
     <title>Directory Generator</title>
     <version>1.0</version>
@@ -31,12 +32,6 @@
   </header>
   <body>
     <s1 title="Directory Generator">
-      <p>Generates an XML directory listing.</p>
-      <ul>
-        <li>Name: directory</li>
-        <li>Class: org.apache.cocoon.generation.DirectoryGenerator</li>
-        <li>Cacheable: yes</li>
-      </ul>
       <p>The root node of the generated document will normally be a <code>directory</code> node. A
           directory node can contain zero or more <code>file</code> or <code>directory</code> nodes.
           A file node has no children. All generated elements have the namespace
@@ -47,7 +42,7 @@
         <li><code>name</code>: the name of the file or directory.</li>
         <li><code>lastModified</code>: the time the file was last modified, measured as the number
             of milliseconds since the epoch (as in <code>java.io.File.lastModified</code>).</li>
-        <li><code>date</code>: the time the file was last modified in human-readable form.</li>
+        <li><code>date</code> (optional): the time the file was last modified in human-readable form.</li>
         <li><code>size</code>: the file size (or 0 for directories).</li>
       </ul>
       <p>Additionally the node for the requested directory has the attributes:</p>
@@ -72,7 +67,7 @@
           generate command (as seen in the example above for the parameter <code>depth</code>):
       </p>
       <ul>
-        <li>depth: Sets how deep Directory Generator should delve into the directory structure. If
+        <li>depth: Sets how deep the generator should delve into the directory structure. If
             set to 1 (the default), only the starting directory's immediate contents will be
             returned.</li>
         <li>dateFormat: Sets the format for the date attribute of each node as described in

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/file-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/file-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/file-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+    <!-- This document will be enhanced by information taken from the javadoc -->
 	<header>
 		<title>File Generator</title>
 		<version>0.9</version>
@@ -31,11 +32,6 @@
 			<p>The file generator reads an xml document from the local file system or from any url.
 	               While url generator may appear to be a more suitable name, it's known as the file generator for historical reasons.</p>
       	      <p>The file generator is the default generator.</p>
-			<ul>
-				<li>Name : file</li>
-				<li>Class: org.apache.cocoon.generation.FileGenerator</li>
-				<li>Cacheable: yes - uses the last modification date of the xml document for validation.</li>
-			</ul>
 			<p>The location of the source xml document is specified in
                      the pipeline by the src attribute.</p>
 <source>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/generators.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/generators.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/generators.xml	Mon Aug 16 01:30:40 2004
@@ -39,35 +39,13 @@
         generator name must be declared as the default generator. Each generator may have additional
         configuration information specified in child elements.
       </p>
+      <p>On the left you see all generators that are available in Cocoon. The list is separated into
+        the core generators, belonging to the Cocoon core, and optional generators that are part of
+        specific blocks.
+      </p>        
       <p>For conceptual information on generators see the user's guide document
         <link href="../concepts/sitemap.html">The Sitemap</link>.
       </p>
-    </s1>
-    <s1 title="The Generators in Apache Cocoon">
-      <ul>
-        <li><link href="directory-generator.html">Directory Generator</link></li>
-        <li><link href="file-generator.html">File Generator</link> (The default generator)</li>
-        <li><link href="extractor-generator.html">Fragment Extractor Generator</link> (optional: Batik block)</li>
-        <li><link href="html-generator.html">HTML Generator</link> (optional: HTML block)</li>
-        <li><link href="imagedirectory-generator.html">Image Directory Generator</link></li>
-        <li><link href="jsp-generator.html">JSP Generator</link> (optional: JSP block)</li>
-        <li><link href="linkstatus-generator.html">LinkStatus Generator</link></li>
-        <li>MP3 Directory Generator (no documentation exists)</li>
-        <li><link href="error-generator.html">Notifying Generator</link></li>
-        <li><link href="php-generator.html">Php Generator</link> (optional: PHP block)</li>
-        <li><link href="profile-generator.html">Profile Generator</link> (optional: Profiler block)</li>
-        <li><link href="request-generator.html">Request Generator</link></li>
-        <li><link href="script-generator.html">Script Generator</link> (optional: BSF block)</li>
-        <li><link href="search-generator.html">Search Generator</link> (optional: Lucene block)</li>
-        <li><link href="serverpages-generator.html">Server Pages Generator</link></li>
-        <li><link href="status-generator.html">Status Generator</link></li>
-        <li><link href="stream-generator.html">Stream Generator</link></li>
-        <li><link href="velocity-generator.html">Velocity Generator</link> (optional: Velocity block)</li>
-        <li><link href="wsproxy-generator.html">Web Service Proxy Generator</link> (optional: Proxy block)</li>
-        <li><link href="xmldbcollection-generator.html">XML:DB Collection Generator</link> (optional: XMLDB block)</li>
-        <li><link href="xmldb-generator.html">XML:DB Generator</link> (optional: XMLDB block)</li>
-        <li><link href="xpathdirectory-generator.html">XPath Directory Generator</link></li>
-      </ul>
     </s1>
   </body>
 </document>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+    <!-- This document will be enhanced by information taken from the javadoc -->
   <header>
     <title>Image Directory Generator</title>
     <version>1.0</version>
@@ -28,13 +29,6 @@
   </header>
   <body>
     <s1 title="Image Directory Generator">
-      <p>Generates an XML directory listing. This is an extension of the
-      	<link href="directory-generator.html">Directory Generator</link>.</p>
-      <ul>
-        <li>Name: imagedirectory</li>
-        <li>Class: org.apache.cocoon.generation.ImageDirectoryGenerator</li>
-        <li>Cacheable: yes</li>
-      </ul>
       <p>The Image Directory provides all the functionality of the
       	<link href="directory-generator.html">Directory Generator</link>. Additionally it
         ensures that the files are images and adds their dimensions (<code>width</code>

Added: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/jx-generator.xml
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/jx-generator.xml	Mon Aug 16 01:30:40 2004
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
+<document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
+  <header>
+    <title>Description of the jx generator</title>
+    <version>current</version>
+    <type>Reference</type>
+    <authors>
+      <person email="users@cocoon.apache.org" name="The Cocoon Community"/>
+    </authors>
+  </header>
+  <body>
+    <s1 title="JX Generator">
+      <p>
+        (<em>JX</em> for <link href="http://jakarta.apache.org/commons/jxpath">Apache <em>JX</em>Path</link>
+        and <link href="http://jakarta.apache.org/commons/jexl">Apache <em>J</em>e<em>x</em>l</link>).
+      </p>
+      <p>
+        Uses the namespace <code>http://apache.org/cocoon/templates/jx/1.0</code>.
+      </p>
+      <p>
+        Provides a generic page template with embedded JSTL and XPath
+        expression substitution to access data sent by Cocoon Flowscripts.
+      </p>
+      <p>
+        The embedded expression language allows a page author to access an
+        object using a simplified syntax such as
+      </p>
+<source>
+   &lt;site signOn="${accountForm.signOn}"&gt;
+</source>      
+      <p>
+        Embedded JSTL expressions are contained in <code>${}</code>.
+      </p>
+      <p>
+        Embedded XPath expressions are contained in <code>#{}</code>.
+      </p>
+      <p>
+        Note that since this generator uses
+        <link href="http://jakarta.apache.org/commons/jxpath">Apache JXPath</link>
+        and <link href="http://jakarta.apache.org/commons/jexl">Apache Jexl</link>, the
+        referenced objects may be Java Beans, DOM, JDOM, or JavaScript objects from
+        a Flowscript. In addition the following implicit objects are available as
+        both XPath and JSTL variables:
+      </p>
+      <table>
+        <tr>
+          <td><code>request</code> (<code>org.apache.cocoon.environment.Request</code>)</td>
+          <td>The Cocoon current request</td>
+        </tr>
+        <tr>
+          <td><code>session</code> (<code>org.apache.cocoon.environment.Session</code>)</td>
+          <td>The Cocoon session associated with the current request</td>
+        </tr>
+        <tr>
+          <td><code>context</code> (<code>org.apache.cocoon.environment.Context</code>)</td>
+          <td>The Cocoon context associated with the current request</td>
+        </tr>
+        <tr>
+          <td><code>parameters</code> (<code>org.apache.avalon.framework.parameters.Parameters</code>)</td>
+          <td>A map of parameters passed to the generator in the pipeline</td>
+        </tr>
+      </table>
+      <p>
+  The current Web Continuation from the Flowscript
+  is also available as a variable named <code>continuation</code>. You would
+  typically access its <code>id</code>:
+      </p>
+<source>      
+     &lt;form action="${continuation.id}"&gt;
+</source>      
+
+  <p>You can also reach previous continuations by using the
+  <code>getContinuation()</code> function:</p>
+ 
+<source>      
+      &lt;form action="${continuation.getContinuation(1).id}" >
+</source>      
+ <p>The <code>template</code> tag defines a new template:</p>
+<source>      
+     &lt;template&gt;
+        body
+     &lt;/template&gt;
+</source>      
+ 
+  <p>The <code>import</code> tag allows you to include another template
+  within the current template. The content of the imported template is
+  compiled and will be executed in place of the <code>import</code> tag:</p>
+<source>
+    &lt;import uri="URI" [context="Expression"]/&gt;
+</source>
+ <p>The Cocoon source resolver is used to resolve <code>uri</code>.
+ If <code>context</code> is present, then its value is used as the context
+ for evaluating the imported template, otherwise the current context is
+ used.</p>
+ <p>The <code>set</code> tag creates a local alias of an object. The
+ <code>var</code> attribute specifies the name of a variable to assign the
+ object to. The <code>value</code> attribute specifies the object (defaults
+ to <code>body</code> if not present):</p>
+
+<source>      
+     &lt;set var="Name" [value="Value"]&gt;
+         [body]
+     &lt;/set&gt;
+</source>      
+ <p>If used within a <code>macro</code> definition (see below)
+ variables created by <code>set</code> are only visible within the body of
+ the <code>macro</code>.</p>
+ <p>The <code>if</code> tag allows the conditional execution of its body
+ according to value of a <code>test</code> attribute:</p>
+
+<source>      
+    &lt;if test="Expression"&gt;
+        body
+    &lt;/if&gt;
+</source>      
+ <p>The <code>choose</code> tag performs conditional block execution by the
+  embedded <code>when</code> sub tags. It renders the body of the first
+  <code>when</code> tag whose <code>test</code> condition evaluates to true.
+  If none of the <code>test</code> conditions of nested <code>when</code> tags
+  evaluate to <code>true</code>, then the body of an <code>otherwise</code>
+  tag is evaluated, if present:</p>
+<source>      
+   &lt;choose&gt;
+     &lt;when test="Expression"&gt;
+        body
+     &lt;/when&gt;
+     &lt;otherwise&gt;
+        body
+     &lt;/otherwise&gt;
+   &lt;/choose&gt;
+</source>      
+  <p>The <code>out</code> tag evaluates an expression and outputs
+  the result of the evaluation:</p>
+<source>      
+  &lt;out value="Expression"/&gt;
+</source>      
+  <p>The <code>forEach</code> tag allows you to iterate over a collection
+  of objects:</p>
+<source>      
+    &lt;forEach [var="Name"] [items="Expression"]
+                 [begin="Number"] [end="Number"] [step="Number"]&gt;
+      body
+   &lt;/forEach&gt;
+</source>      
+  <p>The <code>items</code> attribute specifies the list of items to iterate
+  over. The <code>var</code> attribute specifies the name of a variable to
+  hold the current item. The <code>begin</code> attribute specifies the
+  element to start with (<code>0</code> = first item,
+  <code>1</code> = second item, ...).
+  If unspecified it defaults to <code>0</code>. The <code>end</code>
+  attribute specifies the item to end with (<code>0</code> = first item,
+  <code>1</code> = second item, ...). If unspecified it defaults to the last
+  item in the list. Every <code>step</code> items are
+  processed (defaults to <code>1</code> if <code>step</code> is absent).
+  Either <code>items</code> or both <code>begin</code> and <code>end</code>
+  must be present.</p>
+ 
+  <p>
+  The <code>formatNumber</code> tag is used to display numeric data, including
+  currencies and percentages, in a locale-specific manner. The
+  <code>formatNumber</code> action determines from the locale, for example,
+  whether to use a period or a comma for delimiting the integer and decimal
+  portions of a number. Here is its syntax:
+  </p>
+<source>      
+  &lt;formatNumber value="Expression"
+      [type="Type"] [pattern="Expression"]
+      [currencyCode="Expression"] [currencySymbol="Expression"]
+      [maxIntegerDigits="Expression"] [minIntegerDigits="Expression"]
+      [maxFractionDigits="Expression"] [minFractionDigits="Expression"]
+      [groupingUsed="Expression"]
+      [var="Name"] [locale="Expression"]&gt;
+</source>      
+ 
+  <p>The <code>formatDate</code> tag provides facilities to format Date values:</p>
+<source>      
+  &lt;formatDate value="Expression" [dateStyle="Style"]
+    [timeStyle="Style"] [pattern="Expression"] [type="Type"] [var="Name"]
+    [locale="Expression"]&gt;
+</source>      
+ 
+  <p>The <code>macro</code> tag allows you define a new custom tag.</p>
+ 
+<source>      
+  &lt;macro name="Name" [targetNamespace="Namespace"]&gt;
+    &lt;parameter name="Name" [optional="Boolean"] [default="Value"]/&gt;
+    body
+  &lt;/macro&gt;
+</source>      
+ 
+ <p>For example:</p>
+ 
+<source>      
+  &lt;c:macro name="d"&gt;
+    &lt;tr&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
+  &lt;/c:macro&gt;
+</source>      
+ 
+  <p>The tag being defined in this example is <code>&lt;d&gt;</code> and it
+  can be used like any other tag:</p>
+ 
+<source>      
+    &lt;d/&gt;
+</source>      
+ 
+  <p>However, when this tag is used it will be replaced with a row containing
+  a single empty data cell.</p>
+  <p> When such a tag is used, the attributes and content of the tag become
+  available as variables in the body of the <code>macro</code>'s definition,
+  for example:</p>
+ 
+<source>      
+  &lt;c:macro name="tablerows"&gt;
+    &lt;c:parameter name="list"/&gt;
+    &lt;c:parameter name="color"/&gt;
+    &lt;c:forEach var="item" items="${list}"&gt;
+      &lt;tr&gt;&lt;td bgcolor="${color}"&gt;${item}&lt;/td&gt;&lt;/tr&gt;
+    &lt;/c:forEach&gt;
+  &lt;/c:macro&gt;
+</source>      
+ 
+  <p>The <code>parameter</code> tags in the macro definition define formal
+  parameters, which are replaced with the actual attribute values of the
+  tag when it is used. The content of the tag is also available as a special
+  variable <code>${content}</code>.</p>
+  <p>Assuming you had this code in your
+  flowscript:</p>
+  <source>var greatlakes = ["Superior", "Michigan", "Huron", "Erie", "Ontario"];</source>
+ <p><code> sendPage(uri, {greatlakes: greatlakes});</code>
+ </p>
+ <p>and a template like this:</p>
+ 
+<source>      
+     &lt;tablerows list="${greatlakes}" color="blue"/&gt;
+  &lt;/table&gt;
+</source>      
+ 
+  <p>When the <code>tablerows</code> tag is used in this situation the
+  following output would be generated:
+  </p>
+<source>      
+  &lt;table&gt;
+    &lt;tr&gt;&lt;td bgcolor="blue"&gt;Superior&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td bgcolor="blue"&gt;Michigan&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td bgcolor="blue"&gt;Huron&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td bgcolor="blue"&gt;Erie&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td bgcolor="blue"&gt;Ontario&lt;/td&gt;&lt;/tr&gt;
+  &lt;/table&gt;
+</source>
+    </s1>
+  </body>
+</document>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/linkstatus-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/linkstatus-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/linkstatus-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,9 +17,9 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
  <header>
   <title>LinkStatus Generator</title>
-  <subtitle>in @doctitle@</subtitle>
   <version>0.9</version>
   <type>Technical document</type>
   <authors>
@@ -30,7 +30,7 @@
  <body>
   <s1 title="LinkStatus Generator">
    <p>
-    The LinkStatus Generator emits a list of links that are reachable. Please note that it is available only in Cocoon 2.1.
+    The LinkStatus Generator emits a list of links that are reachable. 
    </p>
    <p>
     The LinkStatusGenerator has serveral configuration options.
@@ -74,11 +74,6 @@
      <dt>accept</dt>
      <dd>Not currently used</dd>
    </dl>
-   <ul>
-    <li>Name : linkStatus</li>
-    <li>Class: org.apache.cocoon.generation.LinkStatusGenerator</li>
-    <li>Cacheable: no.</li>
-   </ul>
    <p>
     A simple example might help to use the LinkStatusGenerator effectivly:
    </p>

Added: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/mp3directory-generator.xml
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/mp3directory-generator.xml	Mon Aug 16 01:30:40 2004
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
+
+<document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
+  <header>
+    <title>Description of the mp3directory generator</title>
+    <version>current</version>
+    <type>Reference</type>
+    <authors>
+      <person email="users@cocoon.apache.org" name="The Cocoon Community"/>
+    </authors>
+  </header>
+  <body>
+    <s1 title="MP3DirectoryGenerator">
+ <p>
+  Following extra attributes added to valid MP3 files:</p>
+ <ul>
+ <li><em>frequency</em> : the frequency of the MP3 file in KHz (most common: 44.1)</li>
+ <li><em>bitrate</em> : the bitrate of the MP3 file in Kbit, from 8 to 448.</li>
+ <li><em>mode</em> : the mode of the MP3 file, one of the following: Stereo, 
+          Joint stereo, Dual channel, Single channel.</li>
+ <li><em>variable-rate</em> (optional) : value is "yes" if VBR header is detected.</li>
+ <li><em>title, artitst, album, year, comment, track, genre</em> (all optional) : 
+       values obtained from MP3 ID3 tag.</li>
+   </ul>
+    </s1>
+  </body>
+</document>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/request-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/request-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/request-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
     <header>
         <title>Request Generator</title>
         <version>0.9</version>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/status-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/status-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/status-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
 	<header>
 		<title>Status Generator</title>
 		<version>0.9</version>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/stream-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/stream-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/stream-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
 	<header>
 		<title>Stream Generator</title>
 		<version>0.9</version>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/xpathdirectory-generator.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/xpathdirectory-generator.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/generators/xpathdirectory-generator.xml	Mon Aug 16 01:30:40 2004
@@ -17,6 +17,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "document-v10.dtd">
 
 <document>
+  <!-- This document will be enhanced by information taken from the javadoc -->
   <header>
     <title>XPath Directory Generator</title>
     <version>1.0</version>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/offline/configuration.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/offline/configuration.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/offline/configuration.xml	Mon Aug 16 01:30:40 2004
@@ -27,7 +27,7 @@
   </header>
   <body>
     <s1 title="Overview">
-      <p>This page details the {{xconf}} configuration format for configuring Cocoon's offline 
+      <p>This page details the <code>xconf</code> configuration format for configuring Cocoon's offline 
          page and site generation capabilities.</p>
       <p>This page gives details of how configure Cocoon. Details of the concepts behind
          offline page generation are given on the offline generation 

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml	Mon Aug 16 01:30:40 2004
@@ -36,6 +36,7 @@
     <menu-item label="Parameter Selector" href="parameter-selector.html"/>
     <menu-item label="Request Attribute Selector" href="requestattribute-selector.html"/>
     <menu-item label="Request Parameter Selector" href="requestparameter-selector.html"/>
+    <menu-item label="Regular-expression Header Selector" href="regular-expression-header-selector.html"/>
   </menu>
   <menu label="Optional">
   </menu>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/selectors.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/selectors.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/selectors.xml	Mon Aug 16 01:30:40 2004
@@ -116,6 +116,9 @@
 				<li><strong>HeaderSelector</strong>: same as the Parameter selector,
         but matches against the request headers;</li>
 
+				<li><link href="regular-expression-header-selector.html">RegexpHeaderSelector</link>: same as the Header selector,
+        but uses a regular expression for matching;</li>
+
 				<li><strong>RequestSelector</strong>: again, same as the Parameter selector,
         but matches against the Request parameters;</li>
 

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml	Mon Aug 16 01:30:40 2004
@@ -31,6 +31,10 @@
 			<p>Diverts xml from a pipeline, writing it to a Source (or
       deleting it).</p>
 			<p>Thankfully, <code>FileSource</code> is no longer the only <code>Source</code> that currently implements <code>WritableSource</code>; there are implementations of WebDAV and Apache Slide WritableSources in the scratchpad. Hopefully further <code>ModifiableSource</code> implementations (XMLDB, CVS, Email, SQL, etc.) will be appear in the future.</p>
+      <p>See the transformer in action with the Cocoon Samples for webdav block,
+      and Wiki about it at
+      <link href="http://wiki.apache.org/cocoon/WebDAVCMS">WebDAVCMS</link>.
+      </p>
 			<ul>
 				<li>Name : write-source</li>
 				<li>Class: org.apache.cocoon.transformation.SourceWritingTransformer</li>
@@ -101,14 +105,14 @@
 			<s2 title="source:write">
 				<p>The source:write tag can take optional attributes, <code>create</code> (defaults to 'true') and <code>serializer</code> (defaults to the serializer set up in the definition or invocation of the transformer).</p>
 				<p>Replaces the entire content of a <code>Source</code> (specified by the <code><![CDATA[<source:source/>]]></code> tag) with the contents of the <code><![CDATA[<source:fragment/>]]></code> tag, if @create is 'true', a new asset will be created if one does not already exist.</p>
-				<p>The <code><![CDATA[<source:source/>]]></code> and <code><![CDATA[<source:fragment/>]]></code> tags are required, a <code><![CDATA[<source:path/>]]></code> tag is optional, if specified, the value is an used as an XPath to generate xml in your <code>Source</code>, inwhich to wrap your content.</p>
+				<p>The <code><![CDATA[<source:source/>]]></code> and <code><![CDATA[<source:fragment/>]]></code> tags are required, a <code><![CDATA[<source:path/>]]></code> tag is optional, if specified, the value is used as an XPath to generate xml in your <code>Source</code>, in which to wrap your content.</p>
 				<s3 title="source:source">
 					<p>The System ID of the <code>Source</code> to be written to.</p>
-					<p>eg: <code><![CDATA[<source:source>docs/blah.xml</source:source>]]></code> or <code><![CDATA[<source:source>context:/blah.xml</source:source>]]></code> etc.</p>
+					<p>e.g. <code><![CDATA[<source:source>docs/blah.xml</source:source>]]></code> or <code><![CDATA[<source:source>context:/blah.xml</source:source>]]></code> etc.</p>
 				</s3>
 				<s3 title="source:fragment">
 					<p>The XML Fragment to be written.</p>
-					<p>eg: </p>
+					<p>For example:</p>
 						<source>
 							<![CDATA[
 	<source:fragment><foo>
@@ -133,7 +137,7 @@
 				</s3>
 				<s3 title="source:path">
 					<p>[Optional] XPath to specify how your content is wrapped</p>
-					<p>eg: <code><![CDATA[<source:path>doc</source:path>]]></code> - your content is placed inside a <code><![CDATA[<doc/>]]></code> root tag.</p>
+					<p>e.g. <code><![CDATA[<source:path>doc</source:path>]]></code> - your content is placed inside a <code><![CDATA[<doc/>]]></code> root tag.</p>
 					<note>If this parameter is omitted, your content MUST have only ONE top-level node.</note>
 				</s3>
  			</s2>
@@ -144,11 +148,11 @@
 				<p>The <code><![CDATA[<source:source/>]]></code>, <code><![CDATA[<source:path/>]]></code> and <code><![CDATA[<source:fragment/>]]></code> tags are all required, the <code><![CDATA[<source:replace/>]]></code> and <code><![CDATA[<source:reinsert/>]]></code> tags are optional.</p>
 				<s3 title="source:source">
 					<p>The System ID of the <code>Source</code> to be inserted into.</p>
-					<p>eg: <code><![CDATA[<source:source>docs/blah.xml</source:source>]]></code> or <code><![CDATA[<source:source>context:/blah.xml</source:source>]]></code> etc.</p>
+					<p>e.g. <code><![CDATA[<source:source>docs/blah.xml</source:source>]]></code> or <code><![CDATA[<source:source>context:/blah.xml</source:source>]]></code> etc.</p>
 				</s3>
 				<s3 title="source:fragment">
 					<p>The XML Fragment to be written.</p>
-					<p>eg:</p>
+					<p>e.g.</p>
 						<source>
 							<![CDATA[
 	<source:fragment>
@@ -176,12 +180,12 @@
 				</s3>
 				<s3 title="source:replace">
 					<p>[Optional] XPath (from <code><![CDATA[<source:path/>]]></code>) to select the node that is replaced by your new content</p>
-					<p>eg: <code><![CDATA[<source:replace>foo/bar/dogcow/@status='cut'</source:replace>]]></code> (is equivalent to this in XSLT: <code>select="foo[bar/dogcow/@status='cut']"</code>), what gets replaced is the <code><![CDATA[<foo/>]]></code> which has a <code><![CDATA[<bar/>]]></code> with a <code><![CDATA[<dogcow status="cut"/>]]></code> in it.</p>
+					<p>e.g. <code><![CDATA[<source:replace>foo/bar/dogcow/@status='cut'</source:replace>]]></code> (is equivalent to this in XSLT: <code>select="foo[bar/dogcow/@status='cut']"</code>), what gets replaced is the <code><![CDATA[<foo/>]]></code> which has a <code><![CDATA[<bar/>]]></code> with a <code><![CDATA[<dogcow status="cut"/>]]></code> in it.</p>
 					<p>The <code>overwrite</code> attribute of the parent <code><![CDATA[<source:insert/>]]></code> is used to check if replacing is allowed. If <code>overwrite</code> is 'true' (the default) the node is replaced. If <code>overwrite</code> is 'false' the node is only inserted if the replace node is found.</p>
 				</s3>
 				<s3 title="source:reinsert">
 					<p>[Optional] The XPath (relative to <code><![CDATA[<source:replace/>]]></code>) to backup the contents of the overwritten node to.</p>
-					<p>eg: <code><![CDATA[<source:reinsert>foo/versions</source:reinsert>]]></code> or <code><![CDATA[<source:reinsert>/doc/versions/foo</source:reinsert>]]></code>.</p>
+					<p>e.g. <code><![CDATA[<source:reinsert>foo/versions</source:reinsert>]]></code> or <code><![CDATA[<source:reinsert>/doc/versions/foo</source:reinsert>]]></code>.</p>
 					<p>If specified and a node is replaced, all children of this replaced node will be reinserted at the given path.</p>
 				</s3>
  			</s2>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml	Mon Aug 16 01:30:40 2004
@@ -31,11 +31,11 @@
 This documentation describes the features as implemented
 by patch attachment
 
-http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=4879
+http://issues.apache.org/bugzilla/showattachment.cgi?attach_id=4879
 
 to
 
-http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15005
+http://issues.apache.org/bugzilla/show_bug.cgi?id=15005
 -->
 
     <authors>

Mime
View raw message