forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/common/xslt/html book2menu.xsl pathutils.xsl
Date Wed, 08 Jan 2003 05:44:35 GMT
jefft       2003/01/07 21:44:35

  Modified:    etc      DTD_DEFICIENCIES.txt
               src/documentation/content/xdocs contrib.xml dreams.xml
                        faq.xml forrest-contract.xml forrestbot-intro.xml
                        forrestbot.xml index.xml libre-intro.xml
                        linking.xml live-sites.xml mail-lists.xml
                        primer.xml validation.xml your-project.xml
               src/documentation/content/xdocs/community index.xml
               src/documentation/content/xdocs/community/howto index.xml
               src/documentation/content/xdocs/community/howto/bugzilla-patch
                        howto-bugzilla-patch.xml
               src/documentation/content/xdocs/community/howto/xmlform
                        howto-xmlform.xml step1.xml step2.xml step3.xml
                        step4.xml step5.xml
               src/resources/conf cocoon.xconf sitemap.xmap
               src/resources/forrest-shbat forrest.build.xml
               src/resources/fresh-site forrest.properties
               src/resources/fresh-site/src/documentation/content/xdocs
                        index.xml sample.xml
               src/resources/schema/relaxng sitemap-v06.rng
               src/resources/skins/common/xslt/html book2menu.xsl
                        pathutils.xsl
  Added:       lib/core avalon-framework-4.1.3.jar
                        linkrewriter-block-20021226-vm1.3.jar
                        xpathtransformer.jar
               src/documentation/content/xdocs site.xml
               src/documentation/resources/images menu.png menu2.png
               src/resources/fresh-site/src/documentation/content/xdocs
                        site.xml
               src/resources/fresh-site/src/documentation/content/xdocs/subdir
                        book-sample.xml
               src/resources/library/xslt absolutize-linkmap.xsl
                        dotdots.xsl relativize-linkmap.xsl site2book.xsl
  Removed:     lib/core avalon-framework-20020627.jar
               src/documentation/content/xdocs book.xml
               src/documentation/content/xdocs/community book.xml
               src/documentation/content/xdocs/community/howto book.xml
               src/documentation/content/xdocs/community/howto/cvs-ssh
                        book.xml
               src/documentation/content/xdocs/community/howto/v10 book.xml
               src/documentation/content/xdocs/community/howto/xmlform
                        book.xml
               src/resources/fresh-site/src/documentation/content/xdocs/subdir
                        book.xml
               src/resources/library/xslt doclist.xsl doclist2document.xsl
  Log:
  Implement linkmaps (merge with LINKMAP_BRANCH)
  
  Revision  Changes    Path
  1.6       +3 -3      xml-forrest/etc/DTD_DEFICIENCIES.txt
  
  Index: DTD_DEFICIENCIES.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/etc/DTD_DEFICIENCIES.txt,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DTD_DEFICIENCIES.txt	15 Dec 2002 22:53:53 -0000	1.5
  +++ DTD_DEFICIENCIES.txt	8 Jan 2003 05:44:32 -0000	1.6
  @@ -59,8 +59,8 @@
   I can see no reason why being a "list item" implies being limited to a single
   paragraph.
   
  -4) Allow <p>, <li> etc inside <dd>
  -----------------------------------
  +4) Allow <p>, <li>, <source> etc inside <dd>
  +--------------------------------------------
   Submittor: Jeff Turner
   Date: 2002-11-20
   Yeas: jefft
  
  
  
  1.2       +267 -0    xml-forrest/lib/core/avalon-framework-4.1.3.jar
  
  	<<Binary file>>
  
  
  1.2       +41 -0     xml-forrest/lib/core/linkrewriter-block-20021226-vm1.3.jar
  
  	<<Binary file>>
  
  
  1.2       +40 -0     xml-forrest/lib/core/xpathtransformer.jar
  
  	<<Binary file>>
  
  
  1.7       +3 -3      xml-forrest/src/documentation/content/xdocs/contrib.xml
  
  Index: contrib.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/contrib.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- contrib.xml	6 Jun 2002 14:32:39 -0000	1.6
  +++ contrib.xml	8 Jan 2003 05:44:32 -0000	1.7
  @@ -17,7 +17,7 @@
         resource donations (money, time, publicity, hardware, software, conference
         presentations, speeches, etc...). </p>
         <p> To begin with, we suggest you to subscribe to the
  -        <link href="mail-lists.html">Forrest mailing lists</link> (follow the link for
  +        <link href="site:mail-lists">Forrest mailing lists</link> (follow the link for
         information on how to subscribe and to access the mail list archives).
         Listen-in for a while, to hear how others make contributions. </p>
         <p>You can get your local working copy of the
  @@ -49,7 +49,7 @@
         <li>Specifying/analysing/designing new features - and beyond. (If you
           wish to get involved with this, please join <code>general Forrest mailing
           list</code>, install and try out Forrest and read some of the
  -        <link href="mail-lists.html">mail archives</link>. You should have a strong
  +        <link href="site:mail-lists">mail archives</link>. You should have a strong
         "fluency" in XML technologies, Java and a basic understanding of the Forrest
         architecture - don't just say "it should have XYZ" without reading anything
         first - because chances are, somebodies already thought of that feature!)</li>
  @@ -101,7 +101,7 @@
           patches. So that everyone can be productive, it is important to know which
           method is appropriate for a certain situation and how to go about it without
           confusion. This section explains when to use the <code>developer</code>
  -        <link href="mail-lists.html">mailing list</link> the bug database. </p>
  +        <link href="site:mail-lists">mailing list</link> the bug database. </p>
         <p> Research your topic thoroughly before beginning to discuss a new
           development issue. Search and browse through the email archives - your issue
           may have been discussed before. Prepare your post clearly and concisely. </p>
  
  
  
  1.8       +1 -1      xml-forrest/src/documentation/content/xdocs/dreams.xml
  
  Index: dreams.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/dreams.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- dreams.xml	30 Jul 2002 03:41:46 -0000	1.7
  +++ dreams.xml	8 Jan 2003 05:44:32 -0000	1.8
  @@ -19,7 +19,7 @@
     <p>This is the initial attempt to give focus to the Forrest project. 
      This summary is a loose collection of items from the forrest-dev
      mailing list. Please add and re-arrange so that it can evolve into a
  -   focus document. The <link href="primer.html">Forrest Primer</link>
  +   focus document. The <link href="site:primer">Forrest Primer</link>
      provides an overview.
     </p>
   
  
  
  
  1.17      +8 -10     xml-forrest/src/documentation/content/xdocs/faq.xml
  
  Index: faq.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/faq.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- faq.xml	14 Nov 2002 08:54:37 -0000	1.16
  +++ faq.xml	8 Jan 2003 05:44:32 -0000	1.17
  @@ -11,8 +11,8 @@
     <p>
      Because we are in transition to the new document-v11.dtd
      and there are still some stylesheets that need tweaking.
  -   See the <link href="document-v11.html">Demo document-v11</link>
  -   and <link href="compliance.html">Standards Compliance</link>.
  +   See the <link href="site:samples/document-v11">Demo document-v11</link>
  +   and <link href="site:compliance">Standards Compliance</link>.
     </p>
    </answer>
   </faq>
  @@ -46,10 +46,8 @@
      then copy the basic skin to make your own.
     </p>
     <p>
  -   The <link href="forrestbot.html">forrestbot</link> is under-development to
  +   The <link href="site:forrestbot">forrestbot</link> is under-development to
      automate the production of your documentation.
  -   Set it up for your own projects by following this
  -   <link href="forrestbot-intro.html">concise overview</link>. 
     </p>
    </answer>
   </faq>
  @@ -63,7 +61,7 @@
      Sorry, we are working on that for the next release. Forrest development has
      been very fast recently. Some of the documentation refers to old methods.
      Your best bet is to start with the
  -   <link href="your-project.html">Using Forrest</link> document.
  +   <link href="site:your-project">Using Forrest</link> document.
     </p>
    </answer>
   </faq>
  @@ -74,11 +72,11 @@
    </question>
    <answer>
     <p>
  -   Join the forrest-dev <link href="mail-lists.html">mailing list</link>
  +    Join the forrest-dev <link href="site:mail-lists">mailing list</link>
      and help to discuss it. Read the 
  -   <link href="primer.html">Forrest Primer</link> for an overview.
  +   <link href="site:primer">Forrest Primer</link> for an overview.
      See the 
  -   <link href="todo.html">To Do List </link> and choose something that
  +   <link href="site:todo">To Do List </link> and choose something that
      interests you.
     </p>
    </answer>
  @@ -91,7 +89,7 @@
    <answer>
     <p>
      It is a bug. Workaround: <code>./build.sh clean docs</code> every time.
  -   There is an entry on the <link href="todo.html">To Do List</link>.
  +   There is an entry on the <link href="site:todo">To Do List</link>.
     </p>
    </answer>
   </faq>
  
  
  
  1.6       +2 -2      xml-forrest/src/documentation/content/xdocs/forrest-contract.xml
  
  Index: forrest-contract.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/forrest-contract.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- forrest-contract.xml	24 Dec 2002 02:04:22 -0000	1.5
  +++ forrest-contract.xml	8 Jan 2003 05:44:32 -0000	1.6
  @@ -8,7 +8,7 @@
         contract is described in the implementation details of the full distribution.
         This tries to list (not explain) what the ins and outs of using Forrest is
         about. Please let the forrest-dev
  -      <link href="mail-lists.html">mail list</link> know if
  +      <link href="site:mail-lists">mail list</link> know if
         any of the bullets listed here are out of sync with the real
         implementation.</notice>
       <abstract>This document describes in a very techy bullet-style way how to use Forrest.</abstract> 
  @@ -22,7 +22,7 @@
         <ul> 
           <li>provide DTDs, skins, cocoon-pipelines, and a willing team of
             supporting developers at the forrest-dev
  -          <link href="mail-lists.html">mail list</link></li>
  +          <link href="site:mail-lists">mail list</link></li>
         <li>use Cocoon to generate the HTML documentation for TheProject</li> 
         </ul> 
       </section> 
  
  
  
  1.6       +3 -3      xml-forrest/src/documentation/content/xdocs/forrestbot-intro.xml
  
  Index: forrestbot-intro.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/forrestbot-intro.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- forrestbot-intro.xml	3 Jan 2003 13:26:28 -0000	1.5
  +++ forrestbot-intro.xml	8 Jan 2003 05:44:32 -0000	1.6
  @@ -37,8 +37,8 @@
     </p>
     <p>
      This document provides a concise overview of one particular scenario. See
  -   <link href="forrestbot.html">The ForrestBot</link> for details and understand
  -   <link href="forrest-contract.html">Our Contract</link>.
  +   <link href="site:forrestbot">The ForrestBot</link> for details and understand
  +   <link href="site:forrest-contract">Our Contract</link>.
      We assume that you have built and configured Forrest as described in 
      <link href="your-project.html">Using Forrest</link>.
     </p>
  @@ -125,7 +125,7 @@
   
    <section>
     <title>Other methods</title>
  -  <p>See the <link href="your-project.html">Using Forrest</link> document.</p>
  +  <p>See the <link href="site:your-project">Using Forrest</link> document.</p>
     <p>Forrest can also run as a dynamic webapp.</p>
    </section>
   
  
  
  
  1.6       +6 -6      xml-forrest/src/documentation/content/xdocs/forrestbot.xml
  
  Index: forrestbot.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/forrestbot.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- forrestbot.xml	31 Dec 2002 08:23:36 -0000	1.5
  +++ forrestbot.xml	8 Jan 2003 05:44:32 -0000	1.6
  @@ -18,11 +18,11 @@
         functionality, and how they could be extended in the future.</p> 
       <p>See some related documents:</p>
       <ul>
  -     <li><link href="forrest-contract.html">Our Contract</link>
  +     <li><link href="site:forrest-contract">Our Contract</link>
         - explains the rules with which your project should comply
        </li>
  -     <li><link href="forrestbot-intro.html">Forrestbot introduction</link>
  -      - concise overview of Forrestbot
  +     <li><link href="site:your-project">Your Project</link>
  +      - getting started with using Forrest (concise overview of forrestbot)
        </li>
       </ul>
       </section> 
  @@ -214,7 +214,7 @@
         <note>Once you understand all of this you might decide NOT to run your
           own centralized service but rather ask your project to be taken up in the
           centralized service of the project team itself: just send a mail to
  -        forrest-dev <link href="mail-lists.html">mail list</link>
  +        forrest-dev <link href="site:mail-lists">mail list</link>
           defining the required parameters to be taken up in the
           process.</note> 
         <section> 
  @@ -228,11 +228,11 @@
             all workstages have been completed (or as soon as building failed)</p> 
         </section> 
       </section> 
  -    <section><title>Current supported workstages and types.</title><section><title><code>&lt;prepare&gt;</code></title><p>No specific type versions. (don't use type-attribute)</p><p>Template arguments:</p><ul><li><code>&lt;skin&gt;</code> @name holds the name of the skin to use.</li></ul></section><section><title><code>&lt;get-src ...&gt;</code></title><section><title><code>&lt;get-src type="cvs"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;host&gt;</code> @name holds the ipaddress or dns name of the  cvs serving host</li><li><code>&lt;root&gt;</code> @name holds the cvs-root directory on that host</li><li><code>&lt;user&gt;</code> @name holds the username to use on the cvs repository </li><li><code>&lt;passwd&gt;</code> @name holds the password to use on the cvs repository</li><li><code>&lt;module&gt;</code> @name holds the module name that holds the </li><li><code>&lt;dir&gt;</code> @name holds the relative path to the {docroot} directory.  (This is the dir  that is holding the ./content/xdocs as specified in t. </li></ul></section><section><title><code>&lt;get-src type="local-copy"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;content-dir/&gt;</code> @name holds the path pointing to the {docroot} directory. (See the <link href="forrest-contract.html">contract</link> to understand what should be there.)</li><li><code>&lt;project-dir/&gt;</code> @name holds the path pointing to the {projecthome} directory where the xml project descriptors reside.</li></ul></section></section><section><title><code>&lt;generate&gt;</code></title><p>No specific type versions. (don't use type-attribute)</p><p>Template arguments:</p><ul><li><code>&lt;debuglevel&gt;</code> @name holds the threshold-level for showing debug statements in the cocoon generation process.</li></ul></section><section><title><code>&lt;deploy ...&gt;</code></title><section><title><code>&lt;deploy type="scp"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;host&gt;</code> @name holds the remote host where the file will be copied to.</li><li><code>&lt;user&gt;</code> @name holds the username to be used when logging onto the remote host.</li><li><code>&lt;root&gt;</code> @name holds the prefix part of where the content needs to be published.</li><li><code>&lt;dir&gt;</code> @name holds the suffix part of where the content needs to be published.</li></ul><warning>Using this approach requires that the public key of the user executing the bot target is present in the authorized key file (<code>~/.ssh/authorized_keys2</code>) of the remote user (on the remote host).</warning><note>Might be interesting to understand that the full process actually is bundling all files to copy in a *.tar.gz that is un-tar.gzipped on the remote host using ssh. </note></section><section><title><code>&lt;deploy type="local-copy"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;destination&gt;</code> @name holds the path where the generated content needs to be copied to.</li></ul></section><section><title><code>&lt;deploy type="ftp"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;host&gt;</code> @name holds the hostname of the ftp server to publish to.</li><li><code>&lt;user&gt;</code> @name holds the username to use for loging onto the ftp server.</li><li><code>&lt;passwd&gt;</code> @name holds the password to use.</li><li><code>&lt;destination&gt;</code> @name holds the path to the directory on the remote host where the generated content needs to be published.  The process is using the <code>ftp cd</code> command to get there.  This means this directory has to exist.</li></ul></section><warning>Currently the ant distribution that is included in forrest cvs is not offering the required NetComponents.jar to actually support this type of deployment. If you want to use it anyway you should use get the required jar from <link href="http://www.savarese.org/oro/downloads/index.html#NetComponents">http://www.savarese.org/oro/downloads</link> and drop that into your <code>{forrest-sandbox}/tools/antipede/lib</code> directory.  </warning></section><section><title><code>&lt;cleanup&gt;</code></title><p>No specific type versions. (don't use type-attribute)</p><p>Template arguments: None.</p></section></section><section> 
  +    <section><title>Current supported workstages and types.</title><section><title><code>&lt;prepare&gt;</code></title><p>No specific type versions. (don't use type-attribute)</p><p>Template arguments:</p><ul><li><code>&lt;skin&gt;</code> @name holds the name of the skin to use.</li></ul></section><section><title><code>&lt;get-src ...&gt;</code></title><section><title><code>&lt;get-src type="cvs"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;host&gt;</code> @name holds the ipaddress or dns name of the  cvs serving host</li><li><code>&lt;root&gt;</code> @name holds the cvs-root directory on that host</li><li><code>&lt;user&gt;</code> @name holds the username to use on the cvs repository </li><li><code>&lt;passwd&gt;</code> @name holds the password to use on the cvs repository</li><li><code>&lt;module&gt;</code> @name holds the module name that holds the </li><li><code>&lt;dir&gt;</code> @name holds the relative path to the {docroot} directory.  (This is the dir  that is holding the ./content/xdocs as specified in t. </li></ul></section><section><title><code>&lt;get-src type="local-copy"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;content-dir/&gt;</code> @name holds the path pointing to the {docroot} directory. (See the <link href="site:forrest-contract">contract</link> to understand what should be there.)</li><li><code>&lt;project-dir/&gt;</code> @name holds the path pointing to the {projecthome} directory where the xml project descriptors reside.</li></ul></section></section><section><title><code>&lt;generate&gt;</code></title><p>No specific type versions. (don't use type-attribute)</p><p>Template arguments:</p><ul><li><code>&lt;debuglevel&gt;</code> @name holds the threshold-level for showing debug statements in the cocoon generation process.</li></ul></section><section><title><code>&lt;deploy ...&gt;</code></title><section><title><code>&lt;deploy type="scp"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;host&gt;</code> @name holds the remote host where the file will be copied to.</li><li><code>&lt;user&gt;</code> @name holds the username to be used when logging onto the remote host.</li><li><code>&lt;root&gt;</code> @name holds the prefix part of where the content needs to be published.</li><li><code>&lt;dir&gt;</code> @name holds the suffix part of where the content needs to be published.</li></ul><warning>Using this approach requires that the public key of the user executing the bot target is present in the authorized key file (<code>~/.ssh/authorized_keys2</code>) of the remote user (on the remote host).</warning><note>Might be interesting to understand that the full process actually is bundling all files to copy in a *.tar.gz that is un-tar.gzipped on the remote host using ssh. </note></section><section><title><code>&lt;deploy type="local-copy"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;destination&gt;</code> @name holds the path where the generated content needs to be copied to.</li></ul></section><section><title><code>&lt;deploy type="ftp"&gt;</code></title><p>Template arguments:</p><ul><li><code>&lt;host&gt;</code> @name holds the hostname of the ftp server to publish to.</li><li><code>&lt;user&gt;</code> @name holds the username to use for loging onto the ftp server.</li><li><code>&lt;passwd&gt;</code> @name holds the password to use.</li><li><code>&lt;destination&gt;</code> @name holds the path to the directory on the remote host where the generated content needs to be published.  The process is using the <code>ftp cd</code> command to get there.  This means this directory has to exist.</li></ul></section><warning>Currently the ant distribution that is included in forrest cvs is not offering the required NetComponents.jar to actually support this type of deployment. If you want to use it anyway you should use get the required jar from <link href="http://www.savarese.org/oro/downloads/index.html#NetComponents">http://www.savarese.org/oro/downloads</link> and drop that into your <code>{forrest-sandbox}/tools/antipede/lib</code> directory.  </warning></section><section><title><code>&lt;cleanup&gt;</code></title><p>No specific type versions. (don't use type-attribute)</p><p>Template arguments: None.</p></section></section><section> 
         <title>ForrestBot design</title> 
         <p>Most of us will just like things to work, and will be happy enough
           just using it, maybe even letting the forrest-dev
  -        <link href="mail-lists.html">mail list</link> know if we could improve
  +        <link href="site:mail-lists">mail list</link> know if we could improve
           this or the other. Some however might be drawn to the
         <link href="http://www.howstuffworks.com/">how stuff works</link> of things.
         For them is this section as a start in the rest of their own pursuit.</p> 
  
  
  
  1.20      +8 -8      xml-forrest/src/documentation/content/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/index.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- index.xml	31 Dec 2002 08:23:36 -0000	1.19
  +++ index.xml	8 Jan 2003 05:44:32 -0000	1.20
  @@ -28,7 +28,7 @@
          skinning facility to easily apply a different user interface, local and
          robot-based build systems to draw XML content from a repository and
          publish to local or remote sites, and a
  -      <link href="http://xml.apache.org/cocoon/">Cocoon</link>-based site
  +      <link href="ext:cocoon">Cocoon</link>-based site
         generation mechanism.</p> 
         <p>The Forrest developers ... forrest-dev&lt;at&gt;xml.apache.org</p> 
       </section> 
  @@ -36,21 +36,21 @@
         <title>Project Status</title>
         <p>The Forrest project is new and needs your help.</p>
         <ul>
  -      <li>Read our <link href="primer.html">Forrest Primer</link> to
  +      <li>Read our <link href="site:primer">Forrest Primer</link> to
         understand what Forrest is and how you can use and contribute to it.</li>
  -      <li>Please see the <link href="faq.html">FAQ</link> and join the
  +      <li>Please see the <link href="site:faq">FAQ</link> and join the
         discussion on the forrest-dev&lt;at&gt;xml.apache.org
  -      <link href="mail-lists.html">mail list</link>.
  +      <link href="site:mail-lists">mail list</link>.
         </li>
  -      <li>Follow the <link href="your-project.html">Using Forrest</link>
  +      <li>Follow the <link href="site:your-project">Using Forrest</link>
          document to generate a website for your own project.
         </li>
  -      <li>There is also a fledgling <link href="dreams.html">Dream List</link>
  +      <li>There is also a fledgling <link href="site:dreams">Dream List</link>
         to help provide some direction.</li>
         <li>The 
  -       <link href="http://xml.apache.org/forrest/">Forrest website</link>
  +        <link href="ext:forrest">Forrest website</link>
          is updated irregularly and manually, while we develop the
  -       <link href="forrestbot.html">forrestbot</link> facility
  +       <link href="site:forrestbot">forrestbot</link> facility
          which produces the
          <link href="http://forrestbot.cocoondev.org/">automatically generated</link> site.
          </li>
  
  
  
  1.5       +1 -1      xml-forrest/src/documentation/content/xdocs/libre-intro.xml
  
  Index: libre-intro.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/libre-intro.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- libre-intro.xml	24 Dec 2002 02:04:22 -0000	1.4
  +++ libre-intro.xml	8 Jan 2003 05:44:32 -0000	1.5
  @@ -357,7 +357,7 @@
       <section> 
         <title>Next Libre (0.1)</title> 
         <note>Next libre is in fact largely in your hands... just drop
  -        the forrest-dev <link href="mail-lists.html">mail list</link>
  +        the forrest-dev <link href="site:mail-lists">mail list</link>
           a line, and see what happens...</note> 
         <section> 
           <title>Itches</title> 
  
  
  
  1.2       +1 -1      xml-forrest/src/documentation/content/xdocs/linking.xml
  
  Index: linking.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/linking.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  
  
  
  1.10      +3 -3      xml-forrest/src/documentation/content/xdocs/live-sites.xml
  
  Index: live-sites.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/live-sites.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- live-sites.xml	14 Nov 2002 08:56:00 -0000	1.9
  +++ live-sites.xml	8 Jan 2003 05:44:32 -0000	1.10
  @@ -8,8 +8,8 @@
       <p>These are some of the sites that were created using Apache Forrest
        technology.</p>
       <ul>
  -      <li><link href="http://xml.apache.org/">Apache XML Project (xml.apache.org)</link></li>
  -      <li><link href="http://xml.apache.org/forrest/">Apache Forrest</link></li>
  +      <li><link href="ext:xml.apache.org">Apache XML Project (xml.apache.org)</link></li>
  +      <li><link href="ext:forrest">Apache Forrest</link></li>
         <li><link href="http://www.adriatico.be/">Adriatico</link></li>
         <li><link href="http://outerthought.net/">Outerthought.net</link></li>
         <li><link href="http://www.xmlbelux.be/">The BeLux XML User's Group</link></li>
  @@ -19,7 +19,7 @@
         <li>Some <link href="http://cvs.apache.org/~coar/people.html">Apache
           Committer</link> personal pages</li>
         <li><link href="http://incubator.apache.org/">Apache Incubator</link></li>
  -      <li><link href="http://xml.apache.org/fop/">Apache FOP</link>
  +      <li><link href="ext:fop">Apache FOP</link>
           (Formatting Objects Processor)</li>
       </ul>
     </body>
  
  
  
  1.7       +4 -4      xml-forrest/src/documentation/content/xdocs/mail-lists.xml
  
  Index: mail-lists.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/mail-lists.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mail-lists.xml	14 Nov 2002 09:04:10 -0000	1.6
  +++ mail-lists.xml	8 Jan 2003 05:44:32 -0000	1.7
  @@ -13,12 +13,12 @@
         <p><strong>IMPORTANT: Before posting a question or problem to any mailing
           list, </strong>please first look at the following resources:</p> 
   <ul> 
  -<li><link href="faq.html">Forrest FAQs</link></li> 
  -<li><link href="index.html">Forrest documentation</link></li> 
  +<li><link href="site:faq">Forrest FAQs</link></li> 
  +<li><link href="site:index">Forrest documentation</link></li> 
   <li><link href="http://xml.apache.org/cocoon/link/">Cocoon Links</link>
   for pointers to general XML and XSL and Java related resources.
   Please do not ask such questions here unless they are related to Forrest.</li> 
  -<li><link href="mail-archives.html">Mailing list archives</link> - a
  +<li><link href="site:mail-archives">Mailing list archives</link> - a
   veritable goldmine of Forrest-specific information.</li> 
   </ul> 
         <p><strong>IMPORTANT:</strong> If you are posting about a problem that
  @@ -36,7 +36,7 @@
         </p> 
       </section> 
   
  -    <section>
  +    <section id="forrest-dev">
         <title>Forrest Dev</title>
         <p>Purpose: Any issue related to Forrest. For both developers and users.
          When the list gets too big we may start a -users list.
  
  
  
  1.19      +10 -11    xml-forrest/src/documentation/content/xdocs/primer.xml
  
  Index: primer.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/primer.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- primer.xml	24 Dec 2002 02:04:22 -0000	1.18
  +++ primer.xml	8 Jan 2003 05:44:32 -0000	1.19
  @@ -15,11 +15,10 @@
         places where your contribution could be valuable to all of us.</abstract> 
     </header> 
     <body> 
  -    <note>This document is work-in-progress and will be updated to reflect the
  -      actual progress of the Forrest project. As such, the primer will be enhanced,
  -      restructured and edited to provide an accessible entry point for new
  -      Forresteers. Please send all comments, patches and suggestions to
  -      the forrest-dev <link href="mail-lists.html">mail list</link>.</note> 
  +    <warning>This document is <em>very</em> out of date. There is a lot of good
  +      information here, but the focus of the project has shifted away from the
  +      Sourceforge-like project management system described here, towards being a
  +      simpler project-centric documentation tool -- JT</warning> 
       <section>
         <title>History</title> 
         <p>Forrest has come into existence because of the abysmal state of the
  @@ -40,7 +39,7 @@
         <p>The Forrest vision was articulated by Stefano Mazzocchi and Sam Ruby,
           both long-time contributors to Apache projects, in the beginning of 2002, and
           was rapidly picked up by a bunch of other <link
  -          href="who.html">contributors</link> as well, after a headstart by Nicola Ken
  +          href="site:who">contributors</link> as well, after a headstart by Nicola Ken
           Barozzi. So here we are, plenty of work-in-progress to erect what eventually
           will become a true community website infrastructure for Apache open source
           development.</p> 
  @@ -115,7 +114,7 @@
             valuable and in true community spirit, you can possibly gain commit access to
             the Forrest CVS repository and become an Apache committer. The first stage
             towards becoming a contributor is to join the forrest dev
  -          <link href="mail-lists.html">mailing list</link>, the second is to download
  +          <link href="site:mail-lists">mailing list</link>, the second is to download
             Forrest and start playing with it (see below).</li> 
         </ul> 
         <p>Depending on your role, your potential area of interest in Forrest
  @@ -419,7 +418,7 @@
           them to start contributing to Forrest. We have a decent generation system for
           static project documentation, a nice set of skins and some simple but effective
           DTDs. Our goals however are much more ambitious: we have compiled a
  -        <link href="dreams.html">dream list</link> that lists most of them.</p> 
  +        <link href="site:dreams">dream list</link> that lists most of them.</p> 
         <ul> 
           <li>Our first ambition is to support the project site generation and
             maintenance of other Apache projects in an automated manner, starting with our
  @@ -435,7 +434,7 @@
             <th>URI Namespace Management</th> 
             <td>Forrest will offer access to a broad set of information resources
               using durable URIs: please review
  -            <link href="http://www.w3.org/Provider/Style/URI.html">Tim Berners-Lee</link>'s
  +            <link href="ext:cool-uris">Tim Berners-Lee</link>'s
               and <link href="http://www.useit.com/alertbox/990321.html">Jakob
                 Nielsen</link>'s opinion on this. We need a unified URI Namespace management
               approach, bearing in mind mirroring and 'hackable' URIs.</td> 
  @@ -475,7 +474,7 @@
           <tr> 
             <th>Integration</th> 
             <td> Forrest needs to coexist with existing cross-project collaboration
  -            tools such as <link href="http://jakarta.apache.org/gump/">Gump</link>,
  +            tools such as <link href="site:gump">Gump</link>,
               <link href="http://scarab.tigris.org/">Scarab</link> and
               <link href="http://eyebrowse.tigris.org/">Eyebrowse</link> and provide
               integrated access to them.</td> 
  @@ -519,7 +518,7 @@
           <li>Unix shell scripting / CVS / cron gurus, preferably bearded</li> 
         </ul> 
         <p>Just drop us a line at 
  -       the forrest-dev <link href="mail-lists.html">mail list</link>.
  +       the forrest-dev <link href="site:mail-lists">mail list</link>.
         </p>
   
       </section> 
  
  
  
  1.15      +9 -12     xml-forrest/src/documentation/content/xdocs/validation.xml
  
  Index: validation.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/validation.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- validation.xml	21 Nov 2002 04:48:06 -0000	1.14
  +++ validation.xml	8 Jan 2003 05:44:33 -0000	1.15
  @@ -1,10 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
   "document-v11.dtd" [
  -<!ENTITY catalog_spec
  -'http://www.oasis-open.org/committees/entity/background/9401.html'>
  -<!ENTITY catalog_intro
  -'http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html'>
  +
   ]>
   
   <document>
  @@ -109,12 +106,12 @@
       <section>
         <title>Validating new XML types</title>
         <p>
  -        Forrest provides a <link href="&catalog_spec;">SGML Catalog</link>
  -        [<link href="&catalog_intro;">tutorial</link>],
  +        Forrest provides a <link href="ext:catalog_spec">SGML Catalog</link>
  +        [<link href="ext:catalog_intro">tutorial</link>],
           <code>xml-forrest/src/resources/schema/catalog</code>, as a means of
           associating public identifiers (<code>-//APACHE//DTD Documentation
             V1.1//EN</code> above) with DTDs.
  -        If you <link href="your-project.html#adding_new_content_type">add a new content type</link>, you
  +        If you <link href="site:new_content_type">add a new content type</link>, you
           should add the DTD to <code>${project.schema-dir}/dtd/</code> and add
           an entry to the <code>${project.schema-dir}/catalog</code> file.  This
           section describes the details of this process.
  @@ -126,7 +123,7 @@
             The main Forrest DTDs are designed to be modular and extensible, so
             it is fairly easy to create a new document type that is a superset
             of one from Forrest.  This is what we'll demonstrate here, using our
  -          earlier <link href="your-project.html#adding_new_content_type">download format</link>
  +          earlier <link href="site:new_content_type">download format</link>
             as an example.  Our download format adds a group of new elements to
             the standard 'documentv11' format.  Our new elements are described
             by the following DTD:
  @@ -274,9 +271,9 @@
             on a mapping from the public ID to a stable DTD location, via a
             Catalog file.</p>
           <note>
  -          See <link href="&catalog_intro;">this article</link> for a good
  +          See <link href="ext:catalog_intro">this article</link> for a good
             introduction to catalogs and the Cocoon documentation
  -          <link href="http://xml.apache.org/cocoon/userdocs/concepts/catalog.html">Entity resolution with catalogs</link>.
  +          <link href="ext:cocoon/catalogs">Entity resolution with catalogs</link>.
           </note>
           <p>
             Forrest provides a standard catalog file at
  @@ -300,7 +297,7 @@
             PUBLIC "-//Acme//DTD Download Documentation V1.0//EN" "dtd/download-v11.dtd"
           </source>
           <p>
  -          The format is described in <link href="&catalog_spec;">the
  +          The format is described in <link href="ext:catalog_spec">the
               spec</link>, and is fairly simple.  Lines beginning with
             <code>PUBLIC</code> map a public identifier to a DTD (relative to the
             catalog file).
  
  
  
  1.19      +16 -18    xml-forrest/src/documentation/content/xdocs/your-project.xml
  
  Index: your-project.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/your-project.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- your-project.xml	24 Dec 2002 02:04:22 -0000	1.18
  +++ your-project.xml	8 Jan 2003 05:44:33 -0000	1.19
  @@ -154,7 +154,7 @@
   /src/documentation/skinconf.xml    # Info about your project used by the skin
   /src/documentation/content/xdocs   # XML content.
   /src/documentation/content/xdocs/index.xml # Home page
  -/src/documentation/content/xdocs/book.xml  # Navigation file for site structure
  +/src/documentation/content/xdocs/site.xml  # Navigation file for site structure
   /src/documentation/content/xdocs/tabs.xml  # Skin-specific 'tabs' file.
   /src/documentation/resources/images        # Project images (logos, etc)
   
  @@ -167,7 +167,7 @@
     project.
   - Replace src/documentation/resources/images/project-logo.gif with your project
     logo.
  -- Start adding content in xdocs/, remembering to add new files to book.xml
  +- Start adding content in xdocs/, remembering to add new files to site.xml
   - Provide any feedback to forrest-dev@xml.apache.org
   
   Thanks for using Apache Forrest
  @@ -193,11 +193,10 @@
   |       |-- README.txt
   |       |-- content
   |       |   `-- xdocs
  -|       |       |-- book.xml
  +|       |       |-- site.xml
   |       |       |-- index.xml
   |       |       |-- sample.xml
   |       |       |-- subdir
  -|       |       |   |-- book.xml
   |       |       |   `-- index.xml
   |       |       `-- tabs.xml
   |       |-- resources
  @@ -398,7 +397,7 @@
             Forrest's own xdocs for an example.</p>
           <note>Yes, we know it is a pain having to edit every directory's
             <code>book.xml</code>
  -          file when making changes. The <link href="libre-intro.html">Libre</link>
  +          file when making changes. The <link href="site:libre-intro">Libre</link>
             effort will hopefully put an end to this</note>
         </section>
         <section>
  @@ -430,8 +429,7 @@
         <p>
           The Cocoon sitemap is a set of rules for generating content (HTML, PDFs etc)
           from XML sources. Forrest has a default sitemap, which is adequate for
  -        everyday sites (like the <link href="http://xml.apache.org/forrest">Forrest
  -          site</link> itself).
  +        everyday sites (like the <link href="ext:forrest">Forrest site</link> itself).
         </p>
         <p>
           Sometimes, one needs to go beyond the default set of rules. This is where
  @@ -458,7 +456,7 @@
         </p>
         <p>
           The sitemap syntax is described in the <link
  -          href="http://xml.apache.org/cocoon/userdocs/concepts/sitemap.html">Cocoon
  +          href="ext:cocoon/sitemap">Cocoon
             sitemap docs</link>. The Forrest sitemap is fairly complicated, and
           partially described in <link href="primer.html#sitemap">The Forrest
             Primer</link>. Be aware that order matters; your sitemap additions should
  @@ -468,7 +466,7 @@
         <section id="adding_new_content_type">
           <title>Example: Adding a new content type</title>
           <note>This section will eventually be simplified by <link
  -            href="cap.html">Content Aware Pipelines (CAPs)</link>.</note>
  +            href="site:cap">Content Aware Pipelines (CAPs)</link>.</note>
           <p>
             Say that <code>download.xml</code> lists downloads for a certain package. It would be
             best to represent download information in a custom XML format:
  @@ -615,7 +613,7 @@
                    By default, Forrest requires that all XML files be valid: ie
                    they must have a DOCTYPE declaration and associated DTD, and
                    validate against it.  Our new 'downloads' document type is no
  -                 exception.  The <link href="validation.html">XML
  +                 exception.  The <link href="site:validation">XML
                      Validation</link> section continues this example, showing how
                    to register a new document type.  Briefly, this involves:
                  </p>
  @@ -631,7 +629,7 @@
                        "dtd/download-v11.dtd"</code></li>
                  </ul>
                  <p>
  -                 Please read <link href="validation.html">XML Validation</link>
  +                 Please read <link href="site:validation">XML Validation</link>
                    for the full story.
                  </p>
               </section>
  @@ -794,9 +792,9 @@
           <title>Forrest webapps: developing docs faster</title>
           <p>
             In comparison to simpler tools like <link
  -            href="http://jakarta.apache.org/velocity/anakia.html">Anakia</link>,
  +            href="ext:anakia">Anakia</link>,
             Cocoon's command-line mode (and hence Forrest) is painfully slow.  As the
  -          <link href="dreams.html">dream list</link> notes, Forrest was originally
  +          <link href="site:dreams">dream list</link> notes, Forrest was originally
             intended to be used for dynamic sites, and the Cocoon crawler used only to
             create static snapshots for mirroring.  This section describes how, by
             developing with a "live" Forrest webapp instance, Forrest-based doc
  @@ -806,10 +804,10 @@
             <title>Installing a servlet engine</title>
             <p>
               To run a "live" forrest, you'll need a servlet container, like <link
  -              href="http://jakarta.apache.org/tomcat">Jakarta Tomcat</link>. The
  +              href="ext:tomcat">Jakarta Tomcat</link>. The
               best choice is currently <link
  -              href="http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3.1/bin/">Tomcat
  -              3.3.1</link>, which has been fairly well tested with Forrest,
  +              href="ext:tomcat/r3.3.1">Tomcat 3.3.1</link>, which has been
  +            fairly well tested with Forrest,
               restarts much faster than 4.x, and handles context reloads well.
             </p>
           </section>
  @@ -870,7 +868,7 @@
               into the <code>build/</code> directory.  There are also suggestions for making
               webapp-based content generation the primary technique. Future
               directions like these are debated on 
  -            the forrest-dev <link href="mail-lists.html">mail list</link>.
  +            the forrest-dev <link href="site:mail-lists">mail list</link>.
               Please join if you have any suggestions.
             </note>
           </section>
  
  
  
  1.3       +58 -6     xml-forrest/src/documentation/content/xdocs/site.xml
  
  
  
  
  1.3       +3 -3      xml-forrest/src/documentation/content/xdocs/community/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	10 Nov 2002 00:27:35 -0000	1.2
  +++ index.xml	8 Jan 2003 05:44:33 -0000	1.3
  @@ -7,7 +7,7 @@
    <body>
     <section>
      <title>Introduction</title>
  -    <p>Forrest has certain <link href="../dreams.html">dreams</link> to
  +    <p>Forrest has certain <link href="site:dreams">dreams</link> to
       provide community resources for all Apache projects. Here are some
       that have become reality.
       </p>
  @@ -15,13 +15,13 @@
   
     <section>
      <title>Forrestbot - automated documentation building robot</title>
  -    <p>See <link href="../forrestbot.html">Forrestbot Introduction</link>.
  +    <p>See <link href="site:forrestbot">Forrestbot Introduction</link>.
       </p>
     </section>
   
     <section>
      <title>Your Project - plant the seed for a new documentation project</title>
  -    <p>See <link href="../your-project.html">Using Forrest</link>.
  +    <p>See <link href="site:your-project">Using Forrest</link>.
       </p>
     </section>
   
  
  
  
  1.5       +5 -5      xml-forrest/src/documentation/content/xdocs/community/howto/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/index.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.xml	6 Jun 2002 14:32:40 -0000	1.4
  +++ index.xml	8 Jan 2003 05:44:33 -0000	1.5
  @@ -39,10 +39,10 @@
   on the howto-v10 DTD and stylesheets. Please help to correct any deficiency.
   </p>
         <ul>
  -<li><link href="v10/howto-v10.html">Single Page How-To</link></li>
  -<li><link href="xmlform/howto-xmlform.html">Multi-Page How-To with Revisions</link></li>
  -<li><link href="bugzilla-patch/howto-bugzilla-patch.html">How-To with Images</link></li>
  -  </ul>
  +        <li><link href="site:howto-samples/single-page">Single Page How-To</link></li>
  +        <li><link href="site:howto-samples/xmlform/intro">Multi-Page How-To with Revisions</link></li>
  +        <li><link href="site:howto-samples/with-images">How-To with Images</link></li>
  +      </ul>
     </section>
   
       <section>
  @@ -53,7 +53,7 @@
   grow and the samples will go away.
   </p>
           <ul>
  -<li><link href="cvs-ssh/howto-cvs-ssh.html">CVS through SSH</link></li>
  +          <li><link href="site:howto-committers/cvs-ssh">CVS through SSH</link></li>
     </ul>
   
     </section>
  
  
  
  1.5       +0 -2      xml-forrest/src/documentation/content/xdocs/community/howto/bugzilla-patch/howto-bugzilla-patch.xml
  
  Index: howto-bugzilla-patch.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/bugzilla-patch/howto-bugzilla-patch.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- howto-bugzilla-patch.xml	6 Jun 2002 14:32:40 -0000	1.4
  +++ howto-bugzilla-patch.xml	8 Jan 2003 05:44:33 -0000	1.5
  @@ -41,8 +41,6 @@
   </p>
   <ul>
   <li>Understand what a Patch is and how to make one.
  -<!-- See <link href="howto-patch.html">How to Prepare a Patch</link>
  -     Cocoon Doc under development -->
   Note that a new complete document is still just a &quot;patch&quot;,
   though it does need separate treatment to a normal &quot;diff&quot;.
   </li>
  
  
  
  1.2       +13 -12    xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/howto-xmlform.xml
  
  Index: howto-xmlform.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/howto-xmlform.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto-xmlform.xml	25 May 2002 07:29:52 -0000	1.1
  +++ howto-xmlform.xml	8 Jan 2003 05:44:33 -0000	1.2
  @@ -45,11 +45,11 @@
       <steps title="Five Steps">
        <p>Now you want to know how to create your own forms using the Wizard.  Below are the steps you can follow:</p>
        <ul>
  -       <li><link href="step1.html">Step 1: XML forms</link></li>
  -       <li><link href="step2.html">Step 2: Validation</link></li>
  -       <li><link href="step3.html">Step 3: JavaBean</link></li>
  -       <li><link href="step4.html">Step 4: HowtoWizardAction.java</link></li>
  -       <li><link href="step5.html">Step 5: Sitemap</link></li>
  +       <li><link href="site:xmlform/step1">Step 1: XML forms</link></li>
  +       <li><link href="site:xmlform/step2">Step 2: Validation</link></li>
  +       <li><link href="site:xmlform/step3">Step 3: JavaBean</link></li>
  +       <li><link href="site:xmlform/step4">Step 4: HowtoWizardAction.java</link></li>
  +       <li><link href="site:xmlform/step5">Step 5: Sitemap</link></li>
        </ul>
       </steps>
       
  @@ -57,7 +57,8 @@
       <extension title="Real World Extension">
        <p>Now you have created the Mailing list forms you should know which files are needed to create your own validating forms. The possibities are endless now that you can add dynamic forms to your Cocoon run site. </p>
        <ul>
  -       <li>A simple shopping cart could be created using an XML database such as <link href="http://xml.apache.org/xindice/">Xindices</link>.</li>
  +       <li>A simple shopping cart could be created using an XML database such as
  +         <link href="ext:xindice">Xindice</link>.</li>
          <li>Your site can now become more personalised and interactive for your visitors.  They can create their own login details and set their own preferences with a few simple forms.  Making your web site a home from home for them. </li>
          <li>You can now run surveys and tests from your site</li> 
          <li>Add a voting system for new features to be added on your site</li>
  @@ -70,25 +71,25 @@
        <p>If you have a problem running the example given you can try the following tips:</p>
        <ul>
           <li>Check the logs sometimes they have more information than displayed in your browser.</li>
  -        <li>Check the mail archives at <link href="http://marc.theaimsgroup.com">MARC: Mailing list ARChives at AIMS</link> as the chances are somebody else has had a similar problem too!</li>        
  +        <li>Check the <link href="ext:mail-archive">mail archive</link> as the chances are somebody else has had a similar problem too!</li>        
           <li>Email <link href="mailto:heidi@kutcha.org">me</link> I will try to help you. Again please send the entire error message and all relevant information.  Please use the title "XMLForm Help" in your emails.</li>
  -        <li>Try the <link href="http://xml.apache.org/cocoon/mail-lists.html">Cocoon users mail list</link> and remember to post the whole error message and try to supply all relevant information for a quick reply.</li>
  +        <li>Try the <link href="ext:cocoon/ml">Cocoon users mail list</link> and remember to post the whole error message and try to supply all relevant information for a quick reply.</li>
        </ul>
       </tips> 
       
       <references title="Related Resources">
         <p>Cocoon resources</p>
        <ul>
  -        <li>For all Cocoon basics see the <link href="http://xml.apache.org/cocoon">Cocoon Web site</link>.</li>
  -        <li>For actions take a look at the <link href=" http://xml.apache.org/cocoon/userdocs/concepts/actions.html">actions page</link>. Actions are Avalon Components, so you may want to read Avalon's Whitepaper for more information.</li>
  +        <li>For all Cocoon basics see the <link href="ext:cocoon">Cocoon Web site</link>.</li>
  +        <li>For actions take a look at the <link href="ext:cocoon/actions">actions page</link>. Actions are Avalon Components, so you may want to read Avalon's Whitepaper for more information.</li>
          </ul>
           <p>XPath is simple to learn and the basis of JXPath.</p>
           <ul>
  -        	<li>The W3C has a clear and simple <link href="http://www.w3schools.com/xpath/">tutorial</link>.</li>
  +          <li>The W3C has a clear and simple <link href="ext:xpath-tut">tutorial</link>.</li>
         </ul>
           <p>JXPath is now at beta stage and is based on XPath.</p>
           <ul>
  -        	<li>To learn more vist the home of <link href="http://jakarta.apache.org/commons/jxpath">JXPath</link></li>
  +        	<li>To learn more vist the home of <link href="ext:jxpath">JXPath</link></li>
   		</ul>
       </references>
       
  
  
  
  1.3       +1 -1      xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step1.xml
  
  Index: step1.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step1.xml	6 Jun 2002 14:32:40 -0000	1.2
  +++ step1.xml	8 Jan 2003 05:44:33 -0000	1.3
  @@ -509,7 +509,7 @@
            ]]>
           </source>
     </section>
  -        <p><link href="step2.html">Step 2: Validation</link></p>
  +  <p><link href="site:xmlform/step2">Step 2: Validation</link></p>
           
   
       </steps>
  
  
  
  1.3       +1 -1      xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step2.xml
  
  Index: step2.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step2.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step2.xml	6 Jun 2002 14:32:40 -0000	1.2
  +++ step2.xml	8 Jan 2003 05:44:33 -0000	1.3
  @@ -81,7 +81,7 @@
   </schema>
   ]]>
         </source>  
  -      <p>Now you are ready for <link href="step3.html">Step 3: Java Bean</link> </p>     
  +      <p>Now you are ready for <link href="site:xmlform/step3">Step 3: Java Bean</link> </p>     
       </steps>
   
   </howto>
  
  
  
  1.3       +1 -1      xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step3.xml
  
  Index: step3.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step3.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step3.xml	6 Jun 2002 14:32:40 -0000	1.2
  +++ step3.xml	8 Jan 2003 05:44:33 -0000	1.3
  @@ -210,7 +210,7 @@
   }
   ]]>
           </source>  
  -        <p>Now we move on to <link href="step4.html">Step 4:HowtoWizardAction.java</link></p>
  +        <p>Now we move on to <link href="site:xmlform/step4">Step 4:HowtoWizardAction.java</link></p>
         
         
         </section>
  
  
  
  1.3       +3 -3      xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step4.xml
  
  Index: step4.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step4.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step4.xml	6 Jun 2002 14:32:40 -0000	1.2
  +++ step4.xml	8 Jan 2003 05:44:33 -0000	1.3
  @@ -746,7 +746,7 @@
   
       ]]>
       </source>
  -    <p>Finally <link href="step5.html">Step 5: the Sitemap</link></p>
  +    <p>Finally <link href="site:xmlform/step5">Step 5: the Sitemap</link></p>
       </steps>
   
   </howto>
  
  
  
  1.3       +1 -1      xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step5.xml
  
  Index: step5.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/community/howto/xmlform/step5.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- step5.xml	6 Jun 2002 14:32:40 -0000	1.2
  +++ step5.xml	8 Jan 2003 05:44:33 -0000	1.3
  @@ -156,7 +156,7 @@
         <p>build webapp -Dinclude.webapp.libs=true -Dinclude.scratchpad.libs=true webapp</p>
         <p>Place cocoon.war in your webapp folder if you are using Tomcat then restart Tomcat.</p>
         <p>In a browser go to http://localhost:8080/cocoon/mount/xmlform/howto-wizard.html and you should see the start page of the mailing list forms.</p>
  -      <p>To return to the <link href="howto-xmlform.html">start</link></p>
  +      <p>To return to the <link href="site:xmlform/intro">start</link></p>
       </steps>
   
   </howto>
  
  
  
  1.2       +28 -0     xml-forrest/src/documentation/resources/images/menu.png
  
  	<<Binary file>>
  
  
  1.2       +11 -0     xml-forrest/src/documentation/resources/images/menu2.png
  
  	<<Binary file>>
  
  
  1.10      +53 -27    xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- cocoon.xconf	26 Dec 2002 14:07:25 -0000	1.9
  +++ cocoon.xconf	8 Jan 2003 05:44:34 -0000	1.10
  @@ -451,34 +451,60 @@
         <component-instance name="date"           	class="org.apache.cocoon.components.modules.input.DateInputModule"/>
         <component-instance name="nullinput"      	class="org.apache.cocoon.components.modules.input.NullInputModule"/>
         <component-instance name="xmlmeta"        	class="org.apache.cocoon.components.modules.input.XMLMetaModule"/>
  -      <component-instance name="mapmeta"    	    class="org.apache.cocoon.components.modules.input.MapMetaModule"/>
  -      <component-instance name="defaults"      	class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  -		    <values>
  -         <skin>@skin@</skin>
  -         <base-url>/forrest</base-url>
  -		   </values>
  -     </component-instance>
  -	  
  -      <component-instance logger="core.modules.input" name="forrest"   	class="org.apache.cocoon.components.modules.input.ChainMetaModule">
  -	     <input-module name="request-param"/>
  -	     <input-module name="request-attr"/>
  -	     <input-module name="session-attr"/>
  -	     <input-module name="defaults"/>
  -       </component-instance>
  -
  -
  -       <!--
  -       For backwards-compat: interpret {context:context} as
  -       {request:contextPath}
  -       -->
  -       <component-instance
  -         class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  -         logger="core.modules.mapper" name="context">
  -         <input-module name="request"/>
  -         <suffix>Path</suffix>
  -       </component-instance>
  +      <component-instance name="mapmeta"          class="org.apache.cocoon.components.modules.input.MapMetaModule"/>
  +      <component-instance name="defaults"       class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  +        <values>
  +          <skin>@skin@</skin>
  +          <base-url>/forrest</base-url>
  +        </values>
  +      </component-instance>
  +
  +      <component-instance logger="core.modules.input" name="forrest"    class="org.apache.cocoon.components.modules.input.ChainMetaModule">
  +        <input-module name="request-param"/>
  +        <input-module name="request-attr"/>
  +        <input-module name="session-attr"/>
  +        <input-module name="defaults"/>
  +      </component-instance>
  +
  +      <!-- For the site: scheme -->
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.XMLFileModule"
  +        logger="core.modules.xml" name="linkmap">
  +        <file src="cocoon:/linkmap"/>
  +        <!-- Shouldn't this be the default? -->
  +        <reloadable>true</reloadable>
  +      </component-instance>
  +
  +      <!-- Links to URIs within the site -->
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +        logger="core.modules.mapper" name="site">
  +        <input-module name="linkmap"/>
  +        <prefix>/site//</prefix>
  +        <suffix>/@href</suffix>
  +      </component-instance>
  +
  +      <!-- Links to external URIs, as distinct from 'site' URIs -->
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +        logger="core.modules.mapper" name="ext">
  +        <input-module name="linkmap"/>
  +        <prefix>/site/external-refs//</prefix>
  +        <suffix>/@href</suffix>
  +      </component-instance>
  +
  +
  +      <!--
  +      For backwards-compat: interpret {context:context} as
  +      {request:contextPath}
  +      -->
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +        logger="core.modules.mapper" name="context">
  +        <input-module name="request"/>
  +        <suffix>Path</suffix>
  +      </component-instance>
   
  -	  
      </input-modules>
   
      <output-modules>
  
  
  
  1.52      +84 -33    xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- sitemap.xmap	5 Jan 2003 05:35:23 -0000	1.51
  +++ sitemap.xmap	8 Jan 2003 05:44:34 -0000	1.52
  @@ -23,6 +23,21 @@
       <use-browser-capabilities-db>false</use-browser-capabilities-db>
      </map:transformer>
     -->
  +    <map:transformer name="linkrewriter"
  +      src="org.apache.cocoon.transformation.LinkRewriterTransformer">
  +      <input-module name="linkmap" src="{src}" reloadable="true"/>
  +      <input-module name="site">
  +        <input-module name="linkmap" src="{src}" reloadable="true"/>
  +        <prefix>/site//</prefix>
  +        <suffix>/@href</suffix>
  +      </input-module>
  +    </map:transformer>
  +    <map:transformer name="xpath"
  +       logger="sitemap.transformer.xpath"
  +       src="org.apache.cocoon.transformation.XPathTransformer"
  +     />
  +
  + 
       <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"
                           logger="sitemap.transformer.xsltc"
                           pool-max="32" pool-min="8" pool-grow="2">
  @@ -142,7 +157,23 @@
     </map:resource>
   
     <map:resource name="book">
  -    <map:generate src="content/xdocs/{../1}book.xml"/>
  +    <map:act type="resource-exists">
  +      <!-- If a hand-created book.xml exists, use it -->
  +      <map:parameter name="url" value="content/xdocs/{dir}book.xml"/>
  +      <map:generate src="content/xdocs/{../dir}book.xml"/>
  +      <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
  +      <map:call resource="skinit">
  +        <map:parameter name="type" value="book2menu"/>
  +        <map:parameter name="path" value="{../path}"/>
  +      </map:call>
  +    </map:act>
  +
  +    <!-- If no book.xml, generate it from the linkmap. -->
  +
  +    <map:generate src="cocoon:/{dir}linkmap/{dir}"/>
  +    <!-- The above generates the subset of the linkmap relevant to our
  +    directory. -->
  +    <map:transform src="library/xslt/site2book.xsl"/>
       <map:call resource="skinit">
         <map:parameter name="type" value="book2menu"/>
         <map:parameter name="path" value="{path}"/>
  @@ -179,6 +210,7 @@
   
     <map:match pattern="**tab-**.xml">
       <map:generate src="content/xdocs/tabs.xml"/>
  +    <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
       <map:call resource="skinit">
        <map:parameter name="type" value="tab2menu"/>
        <map:parameter name="path" value="{2}"/>
  @@ -187,18 +219,21 @@
   
     <map:match pattern="**book-**/*.xml">
       <map:call resource="book">
  -     <map:parameter name="path" value="{2}/{3}.xml"/>
  +      <map:parameter name="dir" value="{2}/"/>
  +      <map:parameter name="path" value="{2}/{3}.xml"/>
       </map:call>
     </map:match>
   
     <map:match pattern="**book-**.xml">
       <map:call resource="book">
  +      <map:parameter name="dir" value=""/>
         <map:parameter name="path" value="{2}.xml"/>
       </map:call>
     </map:match>
   
     <map:match pattern="body-todo.xml">
        <map:generate type="file-nolabel" src="status.xml"/>
  +     <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
        <map:transform src="library/xslt/todo2document.xsl" label="content"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
  @@ -208,6 +243,7 @@
   
      <map:match pattern="body-changes.xml">
        <map:generate type="file-nolabel" src="status.xml"/>
  +     <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
        <map:transform src="library/xslt/changes2document.xsl" label="content"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
  @@ -217,6 +253,7 @@
   
      <map:match pattern="body-**/faq.xml">
        <map:generate type="file-nolabel" src="content/xdocs/{1}/faq.xml"/>
  +     <map:transform type="linkrewriter" src="cocoon:/{1}/linkmap"/>
        <map:transform src="library/xslt/faq2document.xsl" label="content"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
  @@ -228,6 +265,7 @@
   
      <map:match pattern="body-faq.xml">
        <map:generate type="file-nolabel" src="content/xdocs/faq.xml"/>
  +     <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
        <map:transform src="library/xslt/faq2document.xsl" label="content"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
  @@ -240,6 +278,7 @@
      <!-- index pages for contribution categories -->
      <map:match pattern="body-community/*/index.xml">
        <map:generate src="content/xdocs/community/{1}/index.xml"/>
  +     <map:transform type="linkrewriter" src="cocoon:/community/{1}/linkmap"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
         <map:parameter name="path" value="community/{1}/index"/>
  @@ -249,6 +288,7 @@
      <!-- no special transformation, yet, for revision pages -->
      <map:match pattern="body-community**revision-*.xml">
        <map:generate src="content/xdocs/community{1}revision-{2}.xml"/>
  +     <map:transform type="linkrewriter" src="cocoon:/community/{1}/linkmap"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
         <map:parameter name="path" value="community/{1}/revision-{2}"/>
  @@ -261,6 +301,7 @@
          <map:part src="content/xdocs/community/{1}/{2}/{3}.xml"/>
          <map:part src="cocoon:/revisions-community/{1}/{2}/{3}" />
        </map:aggregate>
  +     <map:transform type="linkrewriter" src="cocoon:/community/{1}/{2}/linkmap"/>
        <map:transform src="library/xslt/{1}2document.xsl" label="content"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="document2html"/>
  @@ -280,34 +321,6 @@
      <map:serialize type="xml" />
    </map:match>
   
  -
  -
  -   <!-- Generate the "doclist" - list of all documentation
  -     The first match generates each book.xml and adds a new attribute "uri".
  -     The second match aggregates each book.xml into a doclist and
  -     then converts it to a document.
  -   -->
  -   <map:match pattern="doclist/content/xdocs/**book.xml">
  -     <map:generate src="content/xdocs/{1}book.xml"/>
  -     <map:transform src="library/xslt/doclist.xsl">
  -       <map:parameter name="uri" value="{1}"/>
  -     </map:transform>
  -     <map:serialize type="xml"/>
  -    </map:match>
  -
  -   <map:match pattern="body-doclist.xml">
  -     <map:aggregate element="doclist">
  -       <map:part src="cocoon:/doclist/content/xdocs/book.xml"/>
  -       <map:part src="cocoon:/doclist/content/xdocs/community/howto/book.xml"/>
  -     </map:aggregate>
  -     <map:transform src="library/xslt/doclist2document.xsl"/>
  -     <map:call resource="skinit">
  -      <map:parameter name="type" value="document2html"/>
  -      <map:parameter name="path" value="doclist.xml"/>
  -      <map:parameter name="nopdf" value="true"/>
  -     </map:call>
  -   </map:match>
  -
      <!-- HTML DTD Documentation generation pipeline, makes use of NekoDTD tool -->
   
      <map:match pattern="body-**.dtdx.xml">
  @@ -326,6 +339,7 @@
      <!-- Generates body HTML for files in subdirs -->
      <map:match pattern="body-**/*.xml">
       <map:generate src="content/xdocs/{1}/{2}.xml"/>
  +    <map:transform type="linkrewriter" src="cocoon:/{1}/linkmap"/>
       <map:call resource="transform-to-document">
        <map:parameter name="src" value="content/xdocs/{1}/{2}.xml"/>
       </map:call>
  @@ -338,6 +352,7 @@
      <!-- Generates body HTML for root-level files -->
      <map:match pattern="body-**.xml">
       <map:generate src="content/xdocs/{1}.xml"/>
  +    <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
       <map:call resource="transform-to-document">
        <map:parameter name="src" value="content/xdocs/{1}.xml"/>
       </map:call>
  @@ -346,6 +361,42 @@
        <map:parameter name="path" value="{1}.xml"/>
       </map:call>
      </map:match>
  + </map:pipeline>
  +
  +
  + <map:pipeline>
  +   <map:match pattern="abs-linkmap">
  +     <map:generate src="content/xdocs/site.xml"/>
  +     <map:transform src="library/xslt/absolutize-linkmap.xsl"/>
  +     <map:serialize type="xml"/>
  +   </map:match>
  +
  +   <map:match pattern="abs-linkmap/**">
  +     <map:generate src="cocoon:/abs-linkmap"/>
  +     <map:transform type="xpath">
  +       <map:parameter name="include" value="//*[@href='{1}']"/>
  +     </map:transform>
  +     <map:serialize type="xml"/>
  +   </map:match>
  +
  +   <map:match pattern="**linkmap">
  +     <map:generate src="cocoon:/abs-linkmap"/>
  +     <map:transform src="library/xslt/relativize-linkmap.xsl">
  +       <map:parameter name="path" value="{0}"/>
  +     </map:transform>
  +     <map:serialize type="xml"/>
  +   </map:match>
  +
  +   <!-- This derivation of '**linkmap' is used when generating book.xml from a
  +   site.xml.  The /** suffix identifies a @href prefix which all nodes in the
  +   returned subtree must have. -->
  +   <map:match pattern="**linkmap/**">
  +     <map:generate src="cocoon:/abs-linkmap/{2}"/>
  +     <map:transform src="library/xslt/relativize-linkmap.xsl">
  +       <map:parameter name="path" value="{1}linkmap"/>
  +     </map:transform>
  +     <map:serialize type="xml"/>
  +   </map:match>
   
     </map:pipeline>
   
  @@ -356,7 +407,7 @@
      <map:match pattern="edit**">
        <map:mount uri-prefix="edit" src="editor.xmap" check-reload="yes"/>
      </map:match>
  -   
  +
      <!-- ==================   External URI-space    ========================= -->   
   
   
  @@ -513,7 +564,7 @@
      <!-- ================  Directory redirects   =========================== -->
      <!-- Redirect any request for a directory to the directory's index.html file  -->
      <map:match pattern="**/">
  -     <map:redirect-to uri="{request:contextPath}/{1}/index.html"/>
  +    <map:redirect-to uri="{request:contextPath}/{1}/index.html"/>
      </map:match>
   
      <!-- ================  Libre   =========================== -->
  @@ -603,7 +654,7 @@
      </map:match>
   
      </map:match>
  -   
  +
     </map:pipeline>
    </map:pipelines>
   
  
  
  
  1.34      +3 -3      xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- forrest.build.xml	4 Jan 2003 16:46:56 -0000	1.33
  +++ forrest.build.xml	8 Jan 2003 05:44:34 -0000	1.34
  @@ -133,7 +133,7 @@
         </and>
       </condition>
       <property name="forrest.validate.xdocs.includes" value="**/*.x*"/>
  -    <property name="forrest.validate.xdocs.excludes" value=""/>
  +    <property name="forrest.validate.xdocs.excludes" value="site.xml,.*.swp"/>
       <property name="forrest.validate.xdocs.failonerror"
         value="${forrest.validate.failonerror}" />
   
  @@ -687,7 +687,7 @@
   /src/documentation/content/        # Site content.
   /src/documentation/content/xdocs   # XML content.
   /src/documentation/content/xdocs/index.xml # Home page
  -/src/documentation/content/xdocs/book.xml  # Navigation file for site structure
  +/src/documentation/content/xdocs/site.xml  # Navigation file for site structure
   /src/documentation/content/xdocs/tabs.xml  # Skin-specific 'tabs' file.
   /src/documentation/content/*.html,pdf      # Static content files
   /src/documentation/resources/images        # Project images (logos, etc)
  @@ -701,7 +701,7 @@
     project.
   - Replace src/documentation/resources/images/project-logo.gif with your project
     logo.
  -- Start adding content in xdocs/, remembering to add new files to book.xml
  +- Start adding content in xdocs/, remembering to add new files to site.xml
   - Provide any feedback to forrest-dev@xml.apache.org
   
   Thanks for using Apache Forrest
  
  
  
  1.18      +1 -1      xml-forrest/src/resources/fresh-site/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/forrest.properties,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- forrest.properties	21 Nov 2002 04:17:43 -0000	1.17
  +++ forrest.properties	8 Jan 2003 05:44:34 -0000	1.18
  @@ -72,7 +72,7 @@
   #forrest.validate.xdocs.failonerror=${forrest.validate.failonerror}
   #
   #forrest.validate.xdocs.includes=**/*.x*
  -#forrest.validate.xdocs.excludes=
  +#forrest.validate.xdocs.excludes=site.xml
   #
   #forrest.validate.skinconf.includes=${skinconf-file}
   #forrest.validate.skinconf.excludes=
  
  
  
  1.4       +16 -16    xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	1 Nov 2002 03:05:13 -0000	1.3
  +++ index.xml	8 Jan 2003 05:44:34 -0000	1.4
  @@ -1,17 +1,17 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -      <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
  -      <document> 
  -        <header> 
  -          <title>Welcome to MyProj</title> 
  -        </header> 
  -        <body> 
  -          <section>
  -            <title>Congratulations</title>
  -            <p>You have successfully generated and rendered an <link
  -                href="http://xml.apache.org/forrest/">Apache Forrest</link> site.
  -              This page is from the site template. It is found in
  -             <code>my-site/src/documentation/content/xdocs/index.xml</code>
  -              Please edit it and replace this text with content of your own.</p>
  -          </section>
  -        </body>
  -    </document>
  +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
  +<document> 
  +  <header> 
  +    <title>Welcome to MyProj</title> 
  +  </header> 
  +  <body> 
  +    <section>
  +      <title>Congratulations</title>
  +      <p>You have successfully generated and rendered an <link
  +          href="ext:forrest">Apache Forrest</link> site.
  +        This page is from the site template. It is found in
  +        <code>my-site/src/documentation/content/xdocs/index.xml</code>
  +        Please edit it and replace this text with content of your own.</p>
  +    </section>
  +  </body>
  +</document>
  
  
  
  1.5       +43 -10    xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/sample.xml
  
  Index: sample.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/sample.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sample.xml	11 Dec 2002 08:28:11 -0000	1.4
  +++ sample.xml	8 Jan 2003 05:44:34 -0000	1.5
  @@ -31,17 +31,34 @@
           which offers the ability to refer to an image map.</li> 
         <li>We have elements for hyperlinking: 
           <dl> 
  -          <dt><code>&lt;link href="index.html"&gt;</code></dt> 
  +          <dt><code>&lt;link href="site:index"&gt;</code></dt> 
             <dd>Use this to
  -            <link href="index.html" title="Example of a document via link">link</link>
  -           to another document. As per normal, this will open the new document
  -           in the same browser window.</dd> 
  +            <link href="site:index" title="Example of a document via link">link</link>
  +            to another document in the project, irrespective of where it is and
  +            what it's extension will be.  The 'index' node must be defined in
  +            site.xml, eg:
  +            <!-- FIXME: use 'source' instead when it's allowed -->
  +            <code><![CDATA[
  +              <site>
  +                <index label="Index" href="index.html"/>
  +                ...
  +                </site>
  +            ]]></code>
  +          </dd> 
  +
  +          <dt><code>&lt;link href="index.html"&gt;</code></dt> 
  +          <dd>Old-style <link href="index.html" title="Example of a document via
  +              link">link</link> directly to a generated file.  The
  +            <code>site:</code> equivalent is preferred, as it avoids having to
  +            work out <code>..</code>'s, and leaves rendition (HTML, PDF etc) up
  +            to the sitemap.
  +          </dd> 
   
             <dt><code>&lt;link href="#section"&gt;</code></dt> 
             <dd>Use this to
               <link href="#section" title="Example of a document via local anchor">link</link>
              to the named anchor in the current document.
  -          </dd> 
  +         </dd> 
   
             <dt><code>&lt;link href="sample.html#top"&gt;</code></dt> 
             <dd>Use this to
  @@ -50,11 +67,27 @@
              the new document in the same browser window.
             </dd> 
   
  -          <dt><code>&lt;jump href="sample.html"&gt;</code></dt> 
  +         <dt><code>&lt;link href="site:sample/section"&gt;</code></dt> 
  +         <dd>Same as <code>#section</code> above, <link href="site:sample/section"
  +             title="Example of a document via local anchor">links</link> to a
  +           named anchor in this file, except is location-independent.  Depends
  +           on a site.xml definition like:
  +           <!-- FIXME: use 'source' here instead -->
  +           <code><![CDATA[
  +             <site>
  +               <sample label="Sample page" href="sample.html">
  +                 <section href="#section"/>
  +               </sample>
  +             </site>
  +             ]]>
  +           </code>
  +          </dd> 
  +
  +          <dt><code>&lt;jump href="site:sample"&gt;</code></dt> 
             <dd>Use this to
  -            <jump href="sample.html" title="Example of a document via jump">jump</jump>
  +            <jump href="site:sample" title="Example of a document via jump">jump</jump>
              to another document and optionally go to a named
  -            <jump href="sample.html#top" title="Example of a document via jump to anchor">anchor</jump>
  +           <jump href="site:sample/top" title="Example of a document via jump to anchor">anchor</jump>
              within that document. This will open the new document in the same
              browser window. So what is the difference between link and jump?
              The jump behaves differently, in that it will replace any frames
  @@ -63,9 +96,9 @@
              <code>&lt;a ... target="_top"&gt;</code>
             </dd>
   
  -          <dt><code>&lt;fork href="changes.html"&gt;</code></dt> 
  +          <dt><code>&lt;fork href="site:changes"&gt;</code></dt> 
             <dd>Use this to
  -            <fork href="changes.html" title="Example of a document via fork">fork</fork>
  +            <fork href="site:changes" title="Example of a document via fork">fork</fork>
              your webbrowser to another document. This will open the document
              in a new, unnamed browser window.
              This is the equivalent of
  
  
  
  1.3       +0 -0      xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/site.xml
  
  
  
  
  1.3       +0 -0      xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/subdir/book-sample.xml
  
  
  
  
  1.2       +58 -0     xml-forrest/src/resources/library/xslt/absolutize-linkmap.xsl
  
  
  
  
  1.2       +63 -0     xml-forrest/src/resources/library/xslt/dotdots.xsl
  
  
  
  
  1.2       +60 -0     xml-forrest/src/resources/library/xslt/relativize-linkmap.xsl
  
  
  
  
  1.2       +48 -0     xml-forrest/src/resources/library/xslt/site2book.xsl
  
  
  
  
  1.3       +20 -0     xml-forrest/src/resources/schema/relaxng/sitemap-v06.rng
  
  Index: sitemap-v06.rng
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/relaxng/sitemap-v06.rng,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap-v06.rng	29 Nov 2002 07:09:09 -0000	1.2
  +++ sitemap-v06.rng	8 Jan 2003 05:44:34 -0000	1.3
  @@ -302,6 +302,17 @@
       <optional><ref name="exclude-name"/></optional>
     </define>
   
  +  <define name="linkRewriterTransformer.contents">
  +    <zeroOrMore>
  +      <element name="input-module">
  +        <ref name="anyAttribute"/>
  +        <zeroOrMore>
  +          <ref name="anyElement"/>
  +        </zeroOrMore>
  +      </element>
  +    </zeroOrMore>
  +  </define>
  +
   <!-- CPA: contents confirmed by inspection of AbstractTextSerializer.java -->
     <define name="textSerializer.contents">
       <optional><ref name="cdata-section-elements"/></optional>
  @@ -447,6 +458,7 @@
             <ref name="xsltTransformer.contents"/>
             <ref name="i18nTransformer.contents"/>
             <ref name="encodeURLTransformer.contents"/>
  +          <ref name="linkRewriterTransformer.contents"/>
             <optional><ref name="mapping"/></optional>
           </interleave>
       </element>
  @@ -811,6 +823,14 @@
       </zeroOrMore>
     </element>
   </define>
  +
  +  <define name="anyAttribute">
  +    <zeroOrMore>
  +      <attribute>
  +        <anyName/>
  +      </attribute>
  +    </zeroOrMore>
  +  </define>
   
   <!-- Matchers ========================================== -->
     <define name="map.matchers">
  
  
  
  1.8       +8 -2      xml-forrest/src/resources/skins/common/xslt/html/book2menu.xsl
  
  Index: book2menu.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/book2menu.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- book2menu.xsl	28 Nov 2002 14:22:34 -0000	1.7
  +++ book2menu.xsl	8 Jan 2003 05:44:35 -0000	1.8
  @@ -66,9 +66,15 @@
         </xsl:call-template>
       </xsl:variable>
   
  +    <xsl:variable name="actual-path">
  +      <xsl:call-template name="normalize">
  +        <xsl:with-param name="path" select="concat($dirname, $href-noext)"/>
  +      </xsl:call-template>
  +    </xsl:variable>
  +
       <xsl:choose>
         <!-- Compare with extensions stripped -->
  -      <xsl:when test="concat($dirname, $href-noext) = $path-noext">
  +      <xsl:when test="$actual-path = $path-noext">
           <xsl:choose>
             <xsl:when test="contains(@href, '#')">
               <xsl:call-template name="selected-anchor"/>
  
  
  
  1.3       +72 -8     xml-forrest/src/resources/skins/common/xslt/html/pathutils.xsl
  
  Index: pathutils.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/pathutils.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pathutils.xsl	22 Nov 2002 11:36:38 -0000	1.2
  +++ pathutils.xsl	8 Jan 2003 05:44:35 -0000	1.3
  @@ -29,6 +29,18 @@
     </xsl:if>
   </xsl:template>
   
  +<!-- Normalized (..'s eliminated) version of 'dirname' -->
  +<xsl:template name="dirname-nz">
  +  <xsl:param name="path" />
  +  <xsl:call-template name="normalize">
  +    <xsl:with-param name="path">
  +      <xsl:call-template name="dirname">
  +        <xsl:with-param name="path" select="$path" />
  +      </xsl:call-template>
  +    </xsl:with-param>
  +  </xsl:call-template>
  +</xsl:template>
  +
   
   <!-- Returns the filename part of a path.  Equivalent to Unix 'basename'
   Examples:
  @@ -111,27 +123,79 @@
     <xsl:value-of select="substring($path, 1, string-length($path) - string-length($ext))"/>
   </xsl:template>
   
  +<!-- Normalized (..'s eliminated) version of 'path-noext' -->
  +<xsl:template name="path-noext-nz">
  +  <xsl:param name="path" />
  +  <xsl:call-template name="normalize">
  +    <xsl:with-param name="path">
  +      <xsl:call-template name="path-noext">
  +        <xsl:with-param name="path" select="$path" />
  +      </xsl:call-template>
  +    </xsl:with-param>
  +  </xsl:call-template>
  +</xsl:template>
  +
  +
  +<!-- Normalizes a path, converting '/' to '\' and eliminating ..'s
  +Examples:
  +'foo/bar/../baz/index.html' -> foo/baz/index.html'
  +-->
  +<xsl:template name="normalize">
  +  <xsl:param name="path"/>
  +  <xsl:variable name="path-" select="translate($path, '\', '/')"/>
  +  <xsl:choose>
  +    <xsl:when test="contains($path-, '/../')">
  +
  +      <xsl:variable name="pa" select="substring-before($path-, '/../')"/>
  +      <xsl:variable name="th" select="substring-after($path-, '/../')"/>
  +      <xsl:variable name="pa-">
  +        <xsl:call-template name="dirname">
  +          <xsl:with-param name="path" select="$pa"/>
  +        </xsl:call-template>
  +      </xsl:variable>
  +      <xsl:variable name="pa-th" select="concat($pa-, $th)"/>
  +      <xsl:call-template name="normalize">
  +        <xsl:with-param name="path" select="$pa-th"/>
  +      </xsl:call-template>
  +    </xsl:when>
  +
  +    <xsl:otherwise>
  +      <xsl:value-of select="$path-"/>
  +    </xsl:otherwise>
  +  </xsl:choose>
  +
  +</xsl:template>
  +
   <!--
   Uncomment this to test.
   Usage: saxon pathutils.xsl pathutils.xsl path=foo/bar
   
  -<xsl:param name="path" select="'/foo/bar/index.html'"/>
  +<xsl:param name="path" select="'/foo/bar/../baz/index.html'"/>
   <xsl:template match="/">
     <xsl:message>
  -    path= <xsl:value-of select="$path"/>
  -    dirname= <xsl:call-template name="dirname">
  +    path           = <xsl:value-of select="$path"/>
  +    normalize      = <xsl:call-template name="normalize">
  +      <xsl:with-param name="path" select="$path"/>
  +    </xsl:call-template>
  +    dirname        = <xsl:call-template name="dirname">
  +      <xsl:with-param name="path" select="$path"/>
  +    </xsl:call-template>
  +    dirname-nz     = <xsl:call-template name="dirname-nz">
  +      <xsl:with-param name="path" select="$path"/>
  +    </xsl:call-template>
  +    filename       = <xsl:call-template name="filename">
         <xsl:with-param name="path" select="$path"/>
       </xsl:call-template>
  -    filename= <xsl:call-template name="filename">
  +    ext            = <xsl:call-template name="ext">
         <xsl:with-param name="path" select="$path"/>
       </xsl:call-template>
  -    ext= <xsl:call-template name="ext">
  +    filename-noext = <xsl:call-template name="filename-noext">
         <xsl:with-param name="path" select="$path"/>
       </xsl:call-template>
  -    filename-noext= <xsl:call-template name="filename-noext">
  +    path-noext     = <xsl:call-template name="path-noext">
         <xsl:with-param name="path" select="$path"/>
       </xsl:call-template>
  -    path-noext= <xsl:call-template name="path-noext">
  +    path-noext-nz  = <xsl:call-template name="path-noext-nz">
         <xsl:with-param name="path" select="$path"/>
       </xsl:call-template>
     </xsl:message>
  
  
  

Mime
View raw message