forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ferdin...@apache.org
Subject svn commit: r628226 [2/5] - in /forrest/branches/UpdateFOPto094: ./ bin/ main/fresh-site/ main/fresh-site/src/documentation/ main/fresh-site/src/documentation/content/xdocs/ main/fresh-site/src/documentation/content/xdocs/samples-a/ main/fresh-site/src...
Date Sat, 16 Feb 2008 02:19:31 GMT
Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/catalog.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/catalog.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/catalog.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/catalog.xml Fri Feb 15 18:19:17 2008
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+  "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Using Catalog Entity Resolver for local DTDs</title>
@@ -121,16 +122,16 @@
         </source>
         <p>
           See other notes about using
-          <link href="http://www.pinkjuice.com/howto/vimxml/">Vim as XML
-          editor</link>.
+          <a href="http://www.pinkjuice.com/howto/vimxml/" rel="nofollow">Vim as XML
+          editor</a>.
         </p>
       </section>
       <section id="emacs">
         <title>Emacs</title>
         <p>
-          See <link href="http://www.thaiopensource.com/nxml-mode/">nXML
-          mode</link> and
-          <link href="http://www.dpawson.co.uk/relaxng/nxml/">FAQ</link>.
+          See <a href="http://www.thaiopensource.com/nxml-mode/" rel="nofollow">nXML
+          mode</a> and
+          <a href="http://www.dpawson.co.uk/relaxng/nxml/" rel="nofollow">FAQ</a>.
         </p>
       </section>
       <section id="onsgmls">
@@ -215,8 +216,8 @@
           <p>
             XXE supports catalogs by automatic detection via configuration
             files. Download the
-            <fork href="http://www.splike.com/howtos/xxe_forrest.html">XXE
-            Forrest Config</fork> files from splike.com; this also add support
+            <a href="http://www.splike.com/howtos/xxe_forrest.html" rel="nofollow">XXE
+            Forrest Config</a> files from splike.com; this also add support
             for WYSIWYG editing of forrest documents. Note: This configuration
             suite has recently been added to the Forrest scratchpad.
           </p>
@@ -227,20 +228,20 @@
       <title>Further information and resources</title>
       <p>
         Forrest and Cocoon use the
-        <link href="http://xml.apache.org/commons/components/resolver/">Catalog
-        Entity Resolver</link> that is provided by the
-        <link href="http://xml.apache.org/commons/">Apache XML Commons</link>
+        <a href="http://xml.apache.org/commons/components/resolver/">Catalog
+        Entity Resolver</a> that is provided by the
+        <a href="http://xml.apache.org/commons/">Apache XML Commons</a>
         project. The resolver is packaged with the Forrest distribution at
         <code>lib/core/xml-commons-resolver-x.y.jar</code>
       </p>
       <p>
         Other Forrest documentation has some notes about configuring the entity
-        resolver for your own DTDs. See <link href="site:validation">XML
-        Validation</link>.
+        resolver for your own DTDs. See <a href="site:validation">XML
+        Validation</a>.
       </p>
       <p>
         Cocoon has extensive documentation about the entity resolver. See
-        <link href="ext:cocoon/catalogs">Entity resolution with catalogs</link>.
+        <a href="ext:cocoon/catalogs">Entity resolution with catalogs</a>.
       </p>
     </section>
   </body>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/faq.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/faq.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/faq.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/faq.xml Fri Feb 15 18:19:17 2008
@@ -339,7 +339,9 @@
       <question>How can I generate one pdf-file out of the whole site or selected pages of the site?</question>
       <answer>
         <p>
-          Add the following entries to your site.xml file:
+          Add the following entries to your site.xml file.
+          Note that the href must be exactly "wholesite" or "site" which triggers
+          a special match in the sitemap to aggregate all documents.
         </p>
         <source>
 <![CDATA[
@@ -352,14 +354,21 @@
         </source>
         <p>
           In this case the menu labeled "About" will have 2 new items: "Full
-          PDF" and "Full HTML". (See also <link href="site:pdf-tab">How to
-          create a PDF document for each tab</link>.)
+          PDF" and "Full HTML".
+        </p>
+        <p>
+          See also <link href="site:pdf-tab">How to
+          create a PDF document for each tab</link>.
         </p>
         <p>
           This assumes that you use the
           <link href="site:linking">site.xml</link> method for your site
           structure and navigation, rather than the old book.xml method.
         </p>
+        <warning>
+          There are many issues with the "wholesite" aggregation. Search the
+          issue tracker and mail lists.
+        </warning>
       </answer>
     </faq>
     <faq id="pageBreaks">
@@ -422,7 +431,7 @@
           for rendering PDFs. FOP cannot handle all image types natively, and
           requires third-party jars to be added. FOP natively handles BMP, GIF,
           JPG, TIFF and EPS (with a few limitations). FOP can also handle SVG
-          (via Batik!and PNG (see below). For details, see
+          (via Batik) and PNG (see below). For details, see
           <link
             href="http://xml.apache.org/fop/graphics.html">FOP
           Graphics formats</link>
@@ -970,7 +979,7 @@
       <answer>
         <p>
           Certain patterns are claimed by the default sitemaps for special
-          processing. These reserved words include: <code>site, changes, todo,
+          processing. These reserved words include: <code>site, wholesite, changes, todo,
           faq, images, my-images, skinconf, community, howto</code>
         </p>
         <p>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-buildPlugin.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-buildPlugin.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-buildPlugin.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-buildPlugin.xml Fri Feb 15 18:19:17 2008
@@ -315,7 +315,7 @@
       <p>
         It is also a really good idea to build proper tests for your plugins
         using a suitable testing framework, for example,
-        <a href="http://webtest.canoo.com/">WebTest</a>. We recommend that you
+        <a href="http://webtest.canoo.com/" rel="nofollow">WebTest</a>. We recommend that you
         extend the <code>test</code> target in your plugins build file because
         this target is also used when performing integration tests on Forrest.
         In addition, we recommend that you use the samples in your documentation

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-corner-images.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-corner-images.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-corner-images.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-corner-images.xml Fri Feb 15 18:19:17 2008
@@ -38,7 +38,7 @@
   <purpose title="Purpose">
     <p>
       Forrest renders the corner images through
-      <a href="http://www.w3.org/TR/SVG/">Scalable Vector Graphics (SVG)</a>. It
+      <a href="http://www.w3.org/TR/SVG/" rel="nofollow">Scalable Vector Graphics (SVG)</a>. It
       may be necessary to change the color of the corner images to be suitable
       for your own skin colors.
     </p>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-editcss.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-editcss.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-editcss.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/howto/howto-editcss.xml Fri Feb 15 18:19:17 2008
@@ -61,11 +61,11 @@
         Firefox-Browser installed on your system. 
         If you don't already use it, you can 
         download it from <a 
-        href="http://www.mozilla.org/products/firefox/">http://www.mozilla.org/products/firefox/</a></li>
+        href="http://www.mozilla.org/products/firefox/" rel="nofollow">http://www.mozilla.org/products/firefox/</a></li>
       <li>The Firefox-PlugIn EditCSS. It downloads 
         and installs in just a few seconds from the 
         Install-Link at <a 
-        href="http://editcss.mozdev.org/">http://editcss.mozdev.org/</a>
+        href="http://editcss.mozdev.org/" rel="nofollow">http://editcss.mozdev.org/</a>
         <note>
           With standard security settings in place, Firefox will pop up a line
           at the top of the window because this site has by default no
@@ -77,7 +77,7 @@
       <li>A basic understanding of CSS and access to 
         a good CSS-reference. Tutorials and 
         Reference can be found at <a 
-        href="http://www.htmlhelp.com/reference/css/">http://www.htmlhelp.com/reference/css/</a>.</li>
+        href="http://www.htmlhelp.com/reference/css/" rel="nofollow">http://www.htmlhelp.com/reference/css/</a>.</li>
     </ol>
   </prerequisites>
   <steps title="Steps">

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/your-project.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/your-project.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/docs_0_90/your-project.xml Fri Feb 15 18:19:17 2008
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+  "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Using Forrest</title>
@@ -34,10 +35,10 @@
     <section id="installing">
       <title>Installing Forrest</title>
       <p>
-        <link href="ext:forrest/download">Download</link> the latest release of
+        <a href="ext:forrest/download">Download</a> the latest release of
         Forrest and follow the index.html in the top-level, or if you want to
-        try the development version, then <link href="site:build">build
-        Forrest</link> from source.
+        try the development version, then <a href="site:build">build
+        Forrest</a> from source.
       </p>
       <section>
         <title>Setting up the Environment</title>
@@ -47,7 +48,7 @@
           available everywhere and it can locate its home directory and
           resources. It is beyond the scope of Forrest to explain how to manage
           your operating system. Some tips are listed below and this
-          <link href="http://mail-archives.apache.org/mod_mbox/forrest-user/200610.mbox/%3ceab855560610181625u6e49b49at7df6c0c5e6812c74@mail.gmail.com%3e">message</link>
+          <a href="http://mail-archives.apache.org/mod_mbox/forrest-user/200610.mbox/%3ceab855560610181625u6e49b49at7df6c0c5e6812c74@mail.gmail.com%3e" rel="nofollow">message</a>
           explains further and provides other tips about using Windows.
         </p>
         <section>
@@ -358,7 +359,7 @@
         Forrest where the XML sources are, rather than rearrange your project
         directories to accommodate Forrest. This can be done by editing
         <code>forrest.properties</code> (consult the
-        <link href="#Changing_the_layout">Changing the layout</link> section for
+        <a href="#Changing_the_layout">Changing the layout</a> section for
         more details).
       </p>
     </section>
@@ -456,9 +457,9 @@
     (if the skin supports it).
   -->
   <trail>
-    <link1 name="myGroup" href="http://www.apache.org/"/>
-    <link2 name="myProject" href="http://forrest.apache.org/"/>
-    <link3 name="" href=""/>
+    <a1 name="myGroup" href="http://www.apache.org/"/>
+    <a2 name="myProject" href="http://forrest.apache.org/"/>
+    <a3 name="" href=""/>
   </trail>
 
   <!-- Configure the TOC, i.e. the Table of Contents.
@@ -596,7 +597,7 @@
         <source>project.xdocs-dir=src/xdocs</source>
         <p>
           For example, to emulate the simple
-          <link href="http://maven.apache.org/">Maven</link> format:
+          <a href="http://maven.apache.org/">Maven</a> format:
         </p>
         <source>
          /xdocs
@@ -638,7 +639,7 @@
           index, and is rendered as the vertical column of links in the default
           skin. Look at Forrest's own xdocs for an example. More detailed info
           about site.xml is provided in the document
-          <link href="site:linking">Menus and Linking</link>.
+          <a href="site:linking">Menus and Linking</a>.
         </p>
       </section>
       <section id="tabs.xml">
@@ -646,7 +647,7 @@
         <p>
           The <code>tabs.xml</code> file is used to produce the 'tabs'. which
           enable users to quickly jump to sections of your site. See the
-          <link href="site:menu_generation">menu generation</link> documentation
+          <a href="site:menu_generation">menu generation</a> documentation
           for more details, and again, consult Forrest's own docs for a usage
           example.
         </p>
@@ -688,8 +689,8 @@
       <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. For example, the <link href="site:forrest">Forrest
-        website</link> itself uses the default sitemap.
+        for everyday sites. For example, the <a href="site:forrest">Forrest
+        website</a> itself uses the default sitemap.
       </p>
       <p>
         Sometimes, one needs to go beyond the default set of rules. This is
@@ -699,7 +700,7 @@
       <ul>
         <li>Transform custom XML content types with XSLT stylesheets.</li>
         <li>Generate PNG or JPEG images from 
-        <link href="http://www.w3.org/TR/SVG/">SVG</link> XML files.
+        <a href="http://www.w3.org/TR/SVG/" rel="nofollow">SVG</a> XML files.
           (<strong>Note:</strong> Forrest's sitemap now does this natively.)</li>
         <li>Integrate external XML feeds (e.g. RSS) into your site's content.
           (<strong>Note:</strong> See issues.xmap for an example.)</li>
@@ -710,9 +711,9 @@
           and PDF, available as the standard names <code>wholesite.html</code>
           and <code>wholesite.pdf</code>.)</li>
         <li>Read content from exotic sources like
-        <link href="http://www.rpbourret.com/xml/XMLDBLinks.htm">XML
-            databases</link>.</li>
-        <li>Integrate any of <link href="ext:cocoon">Cocoon's</link> vast array
+        <a href="http://www.rpbourret.com/xml/XMLDBLinks.htm" rel="nofollow">XML
+            databases</a>.</li>
+        <li>Integrate any of <a href="ext:cocoon">Cocoon's</a> vast array
           of capabilities.  The possibilities are best appreciated by
           downloading the latest Cocoon distribution and playing with the
           samples.</li>
@@ -729,17 +730,17 @@
       <p>
         Any match that is not handled, passes through to be handled by the
         default Forrest sitemaps - obviously extremely powerful. The capability
-        is described in "<link href="site:project-sitemap">Using project
-        sitemaps</link>" and some worked examples are shown in the following
+        is described in "<a href="site:project-sitemap">Using project
+        sitemaps</a>" and some worked examples are shown in the following
         sections here.
       </p>
       <note>
         We advise you to spend time to understand the Apache Cocoon sitemap. See
-        <link href="ext:cocoon/sitemap">Cocoon sitemap</link> and
-        <link href="ext:cocoon/concepts">Cocoon concepts</link> and related
+        <a href="ext:cocoon/sitemap">Cocoon sitemap</a> and
+        <a href="ext:cocoon/concepts">Cocoon concepts</a> and related
         component documentation. The Forrest sitemap is broken into multiple
         files. The main one is <strong>sitemap.xmap</strong> which delegates to
-        others. See the <link href="site:sitemap-ref">Sitemap Reference</link>
+        others. See the <a href="site:sitemap-ref">Sitemap Reference</a>
         for a tour of the default sitemap.
       </note>
       <section id="adding_new_content_type">
@@ -747,7 +748,7 @@
         <p>
           There are two methods for detecting types of documents and doing
           special handling. The more complete solution is
-          <link href="#adding_new_content_type_2">described</link> in the
+          <a href="#adding_new_content_type_2">described</a> in the
           advanced section below. However, this basic method is also worth
           understanding.
         </p>
@@ -835,7 +836,7 @@
 
   <xsl:template match="file">
     <tr>
-      <td><link href="{@url}"><xsl:value-of select="@name"/></link></td>
+      <td><a href="{@url}"><xsl:value-of select="@name"/></a></td>
       <td><xsl:value-of
            select="format-number(@size div (1024*1024), '##.##')"/> MB</td>
     </tr>
@@ -862,7 +863,7 @@
           structure.
         </p>
         <note>
-          The <link href="site:sitemap-ref">Sitemap Reference</link> provides
+          The <a href="site:sitemap-ref">Sitemap Reference</a> provides
           details about how the sitemap works.
         </note>
         <p>
@@ -902,7 +903,7 @@
             By default, Forrest requires that all XML files be valid, i.e. they
             must have a DOCTYPE declaration and associated DTD, and validate
             against it. Our new 'downloads' document type is no exception. The
-            <link href="site:validation">XML Validation</link> document
+            <a href="site:validation">XML Validation</a> document
             continues this example, showing how to register a new document type.
             Briefly, this involves:
           </p>
@@ -916,7 +917,7 @@
             <li>Tell the system about your catalog.</li>
           </ul>
           <note>
-            Please see <link href="site:validation">XML Validation</link> for
+            Please see <a href="site:validation">XML Validation</a> for
             the complete description for those steps.
           </note>
         </section>
@@ -931,8 +932,8 @@
         </p>
         <p>
           We need to digress and explain the powerful
-          <link href="site:cap">SourceTypeAction (content aware
-          pipelines)</link>. It is a Cocoon sitemap component that peeks at the
+          <a href="site:cap">SourceTypeAction (content aware
+          pipelines)</a>. It is a Cocoon sitemap component that peeks at the
           top-part of a document to look for hints about the type of the
           document. It has four methods: document-declaration, document-element
           and namespace, processing-instruction, w3c-xml-schema.
@@ -994,10 +995,10 @@
           This is the type of processing that happens in the main
           <code>main/webapp/forrest.xmap</code> sitemap. We have added similar
           handling to our project sitemap. Basically, this uses the
-          <link href="site:cap">SourceTypeAction (content aware
-          pipelines)</link> to detect the doctype. The new document-v11.dtd
+          <a href="site:cap">SourceTypeAction (content aware
+          pipelines)</a> to detect the doctype. The new document-v11.dtd
           needs to be also added to your project Catalog as
-          <link href="#new_dtd">described above</link>.
+          <a href="#new_dtd">described above</a>.
         </p>
         <p>
           Note that any sitemap component must be declared before it can be
@@ -1056,8 +1057,8 @@
         dynamic mode you need to restart Forrest in order to see the new skin.
       </p>
       <note>
-        Forrest supplies a collection of <link href="site:default-skins">default
-        skins</link> which are configurable and so should meet the needs of most
+        Forrest supplies a collection of <a href="site:default-skins">default
+        skins</a> which are configurable and so should meet the needs of most
         projects. The aim is to provide many capabilities so that extra skins
         are not needed.
       </note>
@@ -1144,9 +1145,9 @@
       <title>Interactive Forrest: faster turnaround when developing your docs</title>
       <p>
         In comparison to simpler tools (like
-        <link href="ext:anakia">Anakia</link>) the Cocoon command-line mode (and
+        <a href="ext:anakia">Anakia</a>) the Cocoon command-line mode (and
         hence Forrest command-line mode) is slow. As the
-        <link href="site:dreams">dream list</link> notes, Forrest was originally
+        <a href="site:dreams">dream list</a> 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
         using a "live" Forrest webapp instance, the Forrest-based documentation
@@ -1158,7 +1159,7 @@
           Type '<code>forrest run</code>' in your project root to start
           Forrest's built-in Jetty web server. Once it has started, point your
           browser at
-          <link href="http://localhost:8888/">http://localhost:8888/</link>,
+          <a href="http://localhost:8888/">http://localhost:8888/</a>,
           which will show your website, rendered on demand as each link is
           followed.
         </p>
@@ -1181,7 +1182,7 @@
       <title>Invoking Forrest from Ant</title>
       <p>
         Ant has an
-        <link href="http://ant.apache.org/manual/CoreTasks/import.html">&lt;import&gt;</link>
+        <a href="http://ant.apache.org/manual/CoreTasks/import.html">&lt;import&gt;</a>
         task which can be used to invoke Forrest from Ant. All targets and
         properties are imported and can be used in your project build. Here is a
         simple example:
@@ -1203,7 +1204,7 @@
       </source>
       <warning>
         See issue
-        <link href="http://issues.apache.org/jira/browse/FOR-145">FOR-145</link>
+        <a href="http://issues.apache.org/jira/browse/FOR-145">FOR-145</a>
         which causes clashes of Ant target names.
       </warning>
       <warning>
@@ -1228,11 +1229,11 @@
       </p>
       <p>
         Another option is to use the Forrest Antlet from the Krysalis Project's
-        <link href="http://antworks.sourceforge.net/importer/">Antworks
-        Importer</link>.
+        <a href="http://antworks.sourceforge.net/importer/">Antworks
+        Importer</a>.
       </p>
       <p>
-        The <link href="site:forrestbot">Forrestbot</link> provides workstages
+        The <a href="site:forrestbot">Forrestbot</a> provides workstages
         to get source, build, deploy, and notify. This is very useful for
         automating builds; you may want to consider using the Forrestbot.
       </p>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/dtdx/document-v20.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/dtdx/document-v20.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/dtdx/document-v20.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/dtdx/document-v20.xml Fri Feb 15 18:19:17 2008
@@ -19,11 +19,20 @@
 <document>
   <header>
     <title>The Apache Forrest xdocs document-v2.0 DTD</title>
+    <subtitle>This is a subtitle</subtitle>
+    <version>SVN: $Revision$ $Date$</version>
+    <type>Example</type>
+    <authors>
+      <person name="Joe Bloggs" email="joe@example.org" />
+      <person name="Fred Bloggs" email="fred@example.org" />    
+    </authors>
     <notice>The content of this document doesn't make any sense at all.</notice>
     <abstract>
       This is a demonstration document using all possible elements in the
       current Apache Forrest xdocs <code>document-v20.dtd</code>
     </abstract>
+    <meta name="keywords">Forrest, Apache, example</meta>
+    <meta name="resource-type">document</meta>
   </header>
   <body>
     <note>
@@ -50,7 +59,8 @@
           way special.
         </p>
         <p>
-          This next paragraph has a class attribute of 'quote'. CSS can be used
+          This next paragraph has a class attribute of 'quote'.
+          <acronym title="Cascading Style Sheets">CSS</acronym> can be used
           to present this <code>&lt;p class='quote'&gt;</code> in a different
           style than the other paragraphs. The handling of this quoted paragraph
           is defined in the &lt;extra-css&gt; element in the skinconf.xml.
@@ -82,7 +92,7 @@
           <li>Another possibility is the <code>&lt;img&gt;</code> element:
           <img src="images/icon.png" alt="another feather" height="22" width="26"/>,
           which offers the ability to refer to an image map.</li>
-          <li>We have elements for hyperlinking: 
+          <li>We have elements for hyperlinking:
           <dl>
               <dt><code>&lt;a href="../index.html"&gt;</code></dt>
               <dd>Use this to
@@ -336,6 +346,23 @@
           can also be implemented with an <code>&lt;img&gt;</code> element.
         </p>
         <figure src="images/project-logo.png" alt="The fine Forrest logo" width="220" height="65"/>
+      </section>
+      <section id="area-map">
+        <title>Using map and area</title>
+        <p>
+          <img src="/images/usemap.gif" usemap="#my-map"
+            alt="usemap demo" width="256" height="256"/>
+        </p>
+        <p>
+          <map name="my-map">
+            <area shape="rect" coords="173,14,240,71"
+               alt="Rectangle" href="ext:forrest"/>
+            <area shape="circle" coords="53,172,28"
+               alt="Circle" href="../index.html"/>
+            <area shape="default" coords="0,0.256,256"
+               alt="Default" href="http://www.apache.org"/>
+          </map>
+        </p>
       </section>
       <section id="link-class">
         <title>Using class attribute on links</title>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/events.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/events.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/events.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/events.xml Fri Feb 15 18:19:17 2008
@@ -23,19 +23,13 @@
   <body>
     <section id="upcoming">
       <title>Upcoming events</title>
-      <section id="cocoon-gt-2007">
-        <title>Apache Cocoon Get-Together 2007 (3-5 October 2007)</title>
-        <p>
-          <a href="http://www.cocoongt.org/">Apache Cocoon Get-Together 2007</a> - Please
-          make plans to meet Cocoon people in Rome, Italy on 3-5 October 2007.
-        </p>
-      </section>
-      <section id="apachecon-us-2007">
-        <title>ApacheCon US 2007 (12-16 November 2007)</title>
-        <p>
-          <a href="http://us.apachecon.com/">ApacheCon US 2007</a> - Please
-          make plans to join us for the conference in Atlanta, Georgia, USA on 12-16 November 2007.
-        </p>
+	<section id="apachecon-eu-2008">
+          <title>ApacheCon Europe 2008 (7-11 April 2008)</title>
+          <p>
+           <a href="http://eu.apachecon.com/eu2008/">ApacheCon Europe 2008</a> - Please
+           make plans to join us for the conference in Amsterdam, The Netherlands on 7-11
+           April 2008.
+         </p>
       </section>
       <section id="forrest-friday">
         <title>ForrestFriday monthly get-together</title>
@@ -50,6 +44,20 @@
     </section>
     <section id="past">
       <title>Past events</title>
+      <section id="cocoon-gt-2007">
+        <title>Apache Cocoon Get-Together 2007 (3-5 October 2007)</title>
+        <p>
+          <a href="http://www.cocoongt.org/">Apache Cocoon Get-Together 2007</a> - Please
+          make plans to meet Cocoon people in Rome, Italy on 3-5 October 2007.
+        </p>
+      </section>
+      <section id="apachecon-us-2007">
+        <title>ApacheCon US 2007 (12-16 November 2007)</title>
+        <p>
+          <a href="http://us.apachecon.com/">ApacheCon US 2007</a> - Please
+          make plans to join us for the conference in Atlanta, Georgia, USA on 12-16 November 2007.
+        </p>
+      </section>
       <section id="apachecon-eu-2007">
         <title>ApacheCon Europe 2007 (1-4 May 2007)</title>
         <p>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-dev.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-dev.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-dev.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-dev.xml Fri Feb 15 18:19:17 2008
@@ -140,7 +140,7 @@
       <p>
         Whether you use the svn command-line client or a fancy client, then you
         still need to make sure you know how to operate SVN properly.
-        <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com</a>
+        <a href="http://svnbook.red-bean.com/" rel="nofollow">http://svnbook.red-bean.com</a>
         is a must.
       </p>
       <section id="multiple">
@@ -224,7 +224,7 @@
           </source>
         <p>
           More information can be found at
-          <a href="http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2">Common
+          <a href="http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2" rel="nofollow">Common
           use-cases for merging</a> section of the Red Bean SVN Book.
         </p>
       </section>
@@ -249,7 +249,7 @@
         <ul>
           <li>
             Keep a copy of this book, or the online version, close at hand:
-            <a href="http://svnbook.red-bean.com/">Version Control with Subversion</a>
+            <a href="http://svnbook.red-bean.com/" rel="nofollow">Version Control with Subversion</a>
             - the opensource SVN book.
           </li>
           <li>
@@ -310,7 +310,7 @@
         <fixme author="open">
           The issues of whitespace and line endings needs to be very clearly
           described. See some
-          <a href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=112450886218545">mail
+          <a href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=112450886218545" rel="nofollow">mail
           discussion</a> references.
         </fixme>
       </section>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-howto.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-howto.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-howto.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/howto-howto.xml Fri Feb 15 18:19:17 2008
@@ -223,10 +223,10 @@
     </p>
     <ul>
       <li>Joel D. Canfield's <a
-      href="http://www.evolt.org/article/How_To_Write_A_How_To/9741/18250/index.html">How
+      href="http://www.evolt.org/article/How_To_Write_A_How_To/9741/18250/index.html" rel="nofollow">How
       to Write a How-To</a> on evolt.org.</li>
       <li>The Linux Documentation Project's <a
-      href="http://www.tldp.org/HOWTO/HOWTO-INDEX/index.html">HOWTO</a>
+      href="http://www.tldp.org/HOWTO/HOWTO-INDEX/index.html" rel="nofollow">HOWTO</a>
       index page provides many excellent How-To documents to inspire your
       efforts.</li>
     </ul>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/live-sites.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/live-sites.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/live-sites.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/live-sites.xml Fri Feb 15 18:19:17 2008
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+"http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Examples Built-With-Forrest</title>
@@ -27,8 +28,8 @@
     </p>
     <p>
       If you want your site added to the list, then please send a request to the
-      <link href="site:mail-lists">mailing lists</link> or to the
-      <link href="site:bugs">Issue tracker</link>. Tell us the URL, Name, and
+      <a href="site:mail-lists">mailing lists</a> or to the
+      <a href="site:bugs">Issue tracker</a>. Tell us the URL, Name, and
       catch-phrase.
     </p>
     <section id="skinned">
@@ -40,130 +41,130 @@
         section for some examples of such sites.
       </p>
       <ul>
-        <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="site:references/cocoon">Apache Cocoon</link></li>
-        <li><link href="site:references/lenya">Apache Lenya</link></li>
-        <li><link href="http://aft.sourceforge.net/">Anteater</link> - Ant-based functional testing</li>
-        <li><link href="http://chaperon.sourceforge.net">Chaperon</link> - text parser</li>
-        <li><link href="http://www.iasandcb.pe.kr/3g/">IAS&amp;CB</link></li>
-        <li>Some <link href="http://www.apache.org/~coar/people.html">Apache
-        Committer</link> personal pages</li>
-        <li><link href="ext:fop">Apache FOP</link>
+        <li><a href="ext:xml.apache.org">Apache XML Project (xml.apache.org)</a></li>
+        <li><a href="ext:forrest">Apache Forrest</a></li>
+        <li><a href="site:references/cocoon">Apache Cocoon</a></li>
+        <li><a href="site:references/lenya">Apache Lenya</a></li>
+        <li><a href="http://aft.sourceforge.net/" rel="nofollow">Anteater</a> - Ant-based functional testing</li>
+        <li><a href="http://chaperon.sourceforge.net" rel="nofollow">Chaperon</a> - text parser</li>
+        <li><a href="http://www.iasandcb.pe.kr/3g/" rel="nofollow">IAS&amp;CB</a></li>
+        <li>Some <a href="http://www.apache.org/~coar/people.html">Apache
+        Committer</a> personal pages</li>
+        <li><a href="ext:fop">Apache FOP</a>
         (Formatting Objects Processor)</li>
-        <li><link href="http://www.dream-models.com/">Dream Models</link>
+        <li><a href="http://www.dream-models.com/" rel="nofollow">Dream Models</a>
         - gather information about electric radio controlled helicopters</li>
-        <li><link href="http://people.apache.org/~vgritsenko/stats/">Apache Stats (Vadim's Home Page)</link> - some web statistics</li>
-        <li><link href="http://www.indexgeo.net/zalarm/">Z-alarm - Ensure
-        information server integrity</link></li>
-        <li><link href="http://jakarta.apache.org/poi/">Apache Jakarta POI</link></li>
-        <li><link href="http://terra-intl.com/">Terra-International, Inc. (Japanese)</link></li>
-        <li><link href="http://jakarta.terra-intl.com/poi/">Apache Jakarta POI (Japanese Translation)</link></li>
-        <li><link href="http://xfp.sourceforge.net/">XFP</link> - eXtensible Filtering Pipelines</li>
-        <li><link href="http://www.atlassian.com/software/jira/docs/latest">JIRA bugtracker documentation</link></li>
-        <li><link href="http://www.phpopentracker.de/">phpOpenTracker</link> - A framework solution for the analysis of website traffic and visitor analysis</li>
-        <li><link href="http://ws.apache.org/">Apache Web Services Project</link></li>
-        <li><link href="http://ws.apache.org/wsif/">Apache WSIF Project</link> - Web Services Invocation Framework</li>
-        <li><link href="http://xml.apache.org/xmlbeans/">Apache XMLBeans</link> - An XML-Java binding tool</li>
-        <li><link href="http://druid.sourceforge.net/">Druid: The Database Manager</link> - GUI tool to create databases (GPL)</li>
-        <li><link href="http://ws.apache.org/axis/">Apache Axis</link> - an implementation of the SOAP ("Simple Object Access Protocol")</li>
-        <li><link href="http://ws.apache.org/soap/">Apache SOAP</link> - an implementation of the SOAP submission</li>
-        <li><link href="http://www.kanaputs.org/">Kanaputs</link> - an interpreter for Java</li>
-        <li><link href="http://cese.sourceforge.net/">Cell Electrophysiology Simulation Environment (CESE)</link>
+        <li><a href="http://people.apache.org/~vgritsenko/stats/">Apache Stats (Vadim's Home Page)</a> - some web statistics</li>
+        <li><a href="http://www.indexgeo.net/zalarm/">Z-alarm - Ensure
+        information server integrity</a></li>
+        <li><a href="http://jakarta.apache.org/poi/">Apache Jakarta POI</a></li>
+        <li><a href="http://terra-intl.com/" rel="nofollow">Terra-International, Inc. (Japanese)</a></li>
+        <li><a href="http://jakarta.terra-intl.com/poi/">Apache Jakarta POI (Japanese Translation)</a></li>
+        <li><a href="http://xfp.sourceforge.net/" rel="nofollow">XFP</a> - eXtensible Filtering Pipelines</li>
+        <li><a href="http://www.atlassian.com/software/jira/docs/latest" rel="nofollow">JIRA bugtracker documentation</a></li>
+        <li><a href="http://www.phpopentracker.de/" rel="nofollow">phpOpenTracker</a> - A framework solution for the analysis of website traffic and visitor analysis</li>
+        <li><a href="http://ws.apache.org/">Apache Web Services Project</a></li>
+        <li><a href="http://ws.apache.org/wsif/">Apache WSIF Project</a> - Web Services Invocation Framework</li>
+        <li><a href="http://xml.apache.org/xmlbeans/">Apache XMLBeans</a> - An XML-Java binding tool</li>
+        <li><a href="http://druid.sourceforge.net/" rel="nofollow">Druid: The Database Manager</a> - GUI tool to create databases (GPL)</li>
+        <li><a href="http://ws.apache.org/axis/">Apache Axis</a> - an implementation of the SOAP ("Simple Object Access Protocol")</li>
+        <li><a href="http://ws.apache.org/soap/">Apache SOAP</a> - an implementation of the SOAP submission</li>
+        <li><a href="http://www.kanaputs.org/" rel="nofollow">Kanaputs</a> - an interpreter for Java</li>
+        <li><a href="http://cese.sourceforge.net/" rel="nofollow">Cell Electrophysiology Simulation Environment (CESE)</a>
         - a framework for computational electrophysiological simulations</li>
-        <li><link href="ext:gump">Apache Gump</link></li>
-        <li><link href="http://www.agssa.net/">AG Software</link></li>
-        <li><link href="http://jdbc.postgresql.org/">PostgreSQL JDBC Driver</link></li>
-        <li><link href="http://www.sbbi.net/">SuperBonBon Industries</link></li>
-        <li><link href="http://learnlinux.tsf.org.za/">Learn Linux</link> - developing Free/Open Source GNU/Linux Training Materials</li>
-        <li><link href="http://computerdictionary.tsf.org.za">Computer Dictionary Project</link> - develop a DocBook XML computer nomenclature glossary database</li>
-        <li><link href="http://www.softoutfit.com/">Ca&#241;ones Software Outfitter</link></li>
-        <li><link href="http://www.cirquedigital.com/">Cirque|Digital, LLC</link></li>
-        <li><link href="http://db.apache.org/derby/">Apache Derby</link>
+        <li><a href="ext:gump">Apache Gump</a></li>
+        <li><a href="http://www.agssa.net/" rel="nofollow">AG Software</a></li>
+        <li><a href="http://jdbc.postgresql.org/" rel="nofollow">PostgreSQL JDBC Driver</a></li>
+        <li><a href="http://www.sbbi.net/" rel="nofollow">SuperBonBon Industries</a></li>
+        <li><a href="http://learnlinux.tsf.org.za/" rel="nofollow">Learn Linux</a> - developing Free/Open Source GNU/Linux Training Materials</li>
+        <li><a href="http://computerdictionary.tsf.org.za" rel="nofollow">Computer Dictionary Project</a> - develop a DocBook XML computer nomenclature glossary database</li>
+        <li><a href="http://www.softoutfit.com/" rel="nofollow">Ca&#241;ones Software Outfitter</a></li>
+        <li><a href="http://www.cirquedigital.com/" rel="nofollow">Cirque|Digital, LLC</a></li>
+        <li><a href="http://db.apache.org/derby/">Apache Derby</a>
         - a zero admin, embeddable java rdbms</li>
-        <li><link href="http://www.atbymjm.com/">ATbyMJM</link>
+        <li><a href="http://www.atbymjm.com/" rel="nofollow">ATbyMJM</a>
         - Assistive Technology, using augmentive communication devices, by Martha Jane McLellan</li>
-        <li><link href="http://www.cccp-project.org/">CCCP Common Clan Portal</link>
+        <li><a href="http://www.cccp-project.org/" rel="nofollow">CCCP Common Clan Portal</a>
          - Primarily a J2EE website application for game clans</li>
-        <li><link href="http://www.verit.de/">verit Informationssysteme GmbH</link></li>
-        <li><link href="http://www.sello-propio.com/">Sello Propio</link> - Feng Shui in Columbia</li>
-        <li><link href="http://www.divvun.no/">S&aacute;mi proofing tools development project</link></li>
-        <li><link href="http://www.risten.no/">S&aacute;mi terminology portal</link> 
+        <li><a href="http://www.verit.de/" rel="nofollow">verit Informationssysteme GmbH</a></li>
+        <li><a href="http://www.sello-propio.com/" rel="nofollow">Sello Propio</a> - Feng Shui in Columbia</li>
+        <li><a href="http://www.divvun.no/" rel="nofollow">S&aacute;mi proofing tools development project</a></li>
+        <li><a href="http://www.risten.no/" rel="nofollow">S&aacute;mi terminology portal</a> 
         - (background documentation uses Forrest, the main page uses eXist+Cocoon)</li>
-        <li><link href="http://www.discountdracula.com/">DisCountDracula</link>
+        <li><a href="http://www.discountdracula.com/" rel="nofollow">DisCountDracula</a>
         - bargains/deals on various products and services</li>
-        <li><link href="http://www.cfas.org/">Central Florida Astronomical
-          Society</link>
+        <li><a href="http://www.cfas.org/" rel="nofollow">Central Florida Astronomical
+          Society</a>
         - The Central Florida Astronomical Society, Inc.
         (CFAS) is a 501(c)(3) organization operating in the Greater Orlando Metropolitan 
         area and surrounding communities.</li>
-        <li><link href="http://uml2svg.sourceforge.net/">uml2svg</link>
+        <li><a href="http://uml2svg.sourceforge.net/" rel="nofollow">uml2svg</a>
         - an
         XSLT-based tool for converting XMI-compliant UML Diagrams into
         SVG</li>
-        <li><link href="http://www.technicat.com/">technicat</link>
+        <li><a href="http://www.technicat.com/" rel="nofollow">technicat</a>
         - consulting
         and development expertise to the Internet, educational software,
         computer graphics and video game industries</li>
-        <li><link href="http://icdl.tsf.org.za/">OpenICDL</link>
+        <li><a href="http://icdl.tsf.org.za/" rel="nofollow">OpenICDL</a>
         - training materials for International Computer Driving License certification</li>
-        <li><link href="http://www.thesummitjournal.com/">The Summit Journal</link> -
+        <li><a href="http://www.thesummitjournal.com/" rel="nofollow">The Summit Journal</a> -
         A global, free, translated and syndicated Adventure and Exploration publication. </li>
-        <li><link href="http://www.xprime.com.au/">X'Prime</link>
+        <li><a href="http://www.xprime.com.au/" rel="nofollow">X'Prime</a>
         - Software company specialising in optimisation techniques
         using evolutionary algorithms
       </li>
-        <li><link href="http://www.art-painter.com/">Snjezana Vidovic - Art Painter</link>
+        <li><a href="http://www.art-painter.com/" rel="nofollow">Snjezana Vidovic - Art Painter</a>
         - Virtual Gallery
       </li>
-        <li><link href="http://www.j2world.net/">j2world</link>
+        <li><a href="http://www.j2world.net/" rel="nofollow">j2world</a>
               - smart solutions for a mobile world</li>
-        <li><link href="http://j2ee.by.ru/">J2EE Quick Start</link></li>
-        <li><link href="http://javaworkshop.sourceforge.net ">Java Workshop</link> online web book - show cases some of the tools that every java developer should have in his / her toolbox </li>
-        <li><link href="http://www.krabbelkaefer.de">Die Krabbelkäfer</link> - 
+        <li><a href="http://j2ee.by.ru/" rel="nofollow">J2EE Quick Start</a></li>
+        <li><a href="http://javaworkshop.sourceforge.net" rel="nofollow">Java Workshop</a> online web book - show cases some of the tools that every java developer should have in his / her toolbox </li>
+        <li><a href="http://www.krabbelkaefer.de" rel="nofollow">Die Krabbelkäfer</a> - 
         homepage of the association for the promotion of child care in Usingen 
         (Germany).</li>
-        <li><link href="http://www.solvkroken.no/ekat/produkter/HK_00/">Produktkatalog for S&oslash;lvkroken</link>
+        <li><a href="http://www.solvkroken.no/ekat/produkter/HK_00/" rel="nofollow">Produktkatalog for S&oslash;lvkroken</a>
         - biggest supplier of sports fishing equipment in Norway, with export all over the world.
       </li>
-        <li><link href="http://www.apwebco.com">Design Patterns</link> - GoF Design Patterns Tutorial</li>
-        <li><link href="http://www.usefuldomains.co.uk">Generic Domain 
-        Names</link> - Domain sales site specialising in industrial, business 
+        <li><a href="http://www.apwebco.com" rel="nofollow">Design Patterns</a> - GoF Design Patterns Tutorial</li>
+        <li><a href="http://www.usefuldomains.co.uk" rel="nofollow">Generic Domain 
+        Names</a> - Domain sales site specialising in industrial, business 
         and home themed generic domains.</li>
-        <li><link href="http://www.travelvisas.eu/">travel visas</link>
+        <li><a href="http://www.travelvisas.eu/" rel="nofollow">travel visas</a>
         - travel information for backpackers and other travellers in Europe and
 beyond
       </li>
-        <li><link href="http://www.xmlmath.org">XMLMath</link> - XML-Based Mathematical Expression Evaluator</li>
-        <li><link href="http://g11ntoolkit.sourceforge.net/">Globalization Tool Kit</link>
+        <li><a href="http://www.xmlmath.org" rel="nofollow">XMLMath</a> - XML-Based Mathematical Expression Evaluator</li>
+        <li><a href="http://g11ntoolkit.sourceforge.net/" rel="nofollow">Globalization Tool Kit</a>
         - Introduction to the G11NToolKit.</li>
-        <li><link href="http://barcode4j.krysalis.org/">Barcode4J</link>
+        <li><a href="http://barcode4j.krysalis.org/" rel="nofollow">Barcode4J</a>
         - a flexible generator for barcodes written in Java.</li>
-        <li><link href="http://maemo.org/">Maemo</link> - 
+        <li><a href="http://maemo.org/" rel="nofollow">Maemo</a> - 
           open development platform to create applications
           for Nokia 770 Internet Tablet and other maemo compliant
           handheld devices in the future.</li>
-        <li><link href="http://www.primordion.com/Xholon/">Xholon</link>
+        <li><a href="http://www.primordion.com/Xholon/" rel="nofollow">Xholon</a>
         - A Java framework for developing UML 2.0 and other event-driven systems.
       </li>
-        <li><link href="http://www.primordion.com/Cellontro/">Cellontro</link>
+        <li><a href="http://www.primordion.com/Cellontro/" rel="nofollow">Cellontro</a>
         - Modeling and simulation of cells, other biological entities, and
         biochemical networks, using Xholon.
       </li>
-        <li><link href="http://www.erbox.org/">ER/Box Site</link> An all Java, open source ERP system built on Compiere and Apache Derby. Some customisations have been <link href="http://www.erbox.org/documentation/Other/ForrestNotes/forrestNotesOverview.html">documented</link>.</li>
-        <li><link href="http://apfw.sourceforge.net/">Apparatus Framework</link> -
+        <li><a href="http://www.erbox.org/" rel="nofollow">ER/Box Site</a> An all Java, open source ERP system built on Compiere and Apache Derby. Some customisations have been <a href="http://www.erbox.org/documentation/Other/ForrestNotes/forrestNotesOverview.html">documented</a>.</li>
+        <li><a href="http://apfw.sourceforge.net/" rel="nofollow">Apparatus Framework</a> -
           An object-oriented software framework written in C++ for
           embedded applications.</li>
-        <li><link href="http://www.skiclub-troisdorf.de/">Skiclub 
-      Troisdorf-Sieglar e.V.</link> The skiclub aims to provide ski related
+        <li><a href="http://www.skiclub-troisdorf.de/" rel="nofollow">Skiclub 
+      Troisdorf-Sieglar e.V.</a> The skiclub aims to provide ski related
       activities and social events for our members in and around Troisdorf area 
       (near Cologne and Bonn).</li>
-        <li><link href="http://scriptella.javaforge.com">Scriptella ETL</link> Open source ETL (Extract-Transform-Load) and script execution tool. </li>
-        <li><link href="http://open.controltier.com/">open.controltier.com</link> Open Source tools for automating the build and deployment of complex applications.</li>
-        <li><link href="http://antdepo.org/">antdepo.org</link> Open Source automation harness built on top of Apache Ant</li>
-        <li><link href="http://stephane.galles.free.fr/jagraffe/english">JAgraffe</link> Quickly send scaled down
+        <li><a href="http://scriptella.javaforge.com" rel="nofollow">Scriptella ETL</a> Open source ETL (Extract-Transform-Load) and script execution tool. </li>
+        <li><a href="http://open.controltier.com/" rel="nofollow">open.controltier.com</a> Open Source tools for automating the build and deployment of complex applications.</li>
+        <li><a href="http://antdepo.org/" rel="nofollow">antdepo.org</a> Open Source automation harness built on top of Apache Ant</li>
+        <li><a href="http://stephane.galles.free.fr/jagraffe/english" rel="nofollow">JAgraffe</a> Quickly send scaled down
 pictures by email only via DnD</li>
-<!--  <li><link href=""></link></li> -->
+<!--  <li><a href=""></a></li> -->
       </ul>
     </section>
     <section id="dispatcher">
@@ -179,18 +180,18 @@
         in an upcoming release at which point we will be encouraging their use.
       </note>
       <ul>
-        <li><link href="http://floatingsun.net/">Floating Sun</link> - Diwaker Gupta :: Web/Blog/Gallery</li>
-        <li><link href="http://cyriaque.dupoirieux.free.fr/">Cyriaque</link> family website...</li>
-        <li><link href="http://lenya.zones.apache.org/">Apache Lenya 
-          Zone</link> - this site is using v2 with some nice demonstrations of 
+        <li><a href="http://floatingsun.net/">Floating Sun</a> - Diwaker Gupta :: Web/Blog/Gallery</li>
+        <li><a href="http://cyriaque.dupoirieux.free.fr/">Cyriaque</a> family website...</li>
+        <li><a href="http://lenya.zones.apache.org/">Apache Lenya 
+          Zone</a> - this site is using v2 with some nice demonstrations of 
           new features like the theme switcher.</li>
-        <li><link href="http://www.target-x.de/">tarGET-X - know the unknown</link> 
+        <li><a href="http://www.target-x.de/">tarGET-X - know the unknown</a> 
           by thorsten.</li>
-        <li><link href="http://www.criaturitas.org/">CDK - club deportivo kriaturitas</link>.
+        <li><a href="http://www.criaturitas.org/" rel="nofollow">CDK - club deportivo kriaturitas</a>.
           Website of the basketball club CDK located in Sevilla, España.</li>
-        <li><link href="http://www.varietee.com.au/">varietee&trade; adjustable golf practice platforms</link></li>
-        <li><link href="http://simal.oss-watch.ac.uk">An RDF/XML project catalogue, an example of the DOAP plugin in use.</link></li>
-<!--  <li><link href=""></link></li> -->
+        <li><a href="http://www.varietee.com.au/" rel="nofollow">varietee&trade; adjustable golf practice platforms</a></li>
+        <li><a href="http://simal.oss-watch.ac.uk">An RDF/XML project catalogue, an example of the DOAP plugin in use.</a></li>
+<!--  <li><a href=""></a></li> -->
       </ul>
     </section>
   </body>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/mail-lists.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/mail-lists.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/mail-lists.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/mail-lists.xml Fri Feb 15 18:19:17 2008
@@ -38,6 +38,7 @@
           - a veritable goldmine of Forrest-specific information.</li>
         <li>Contribution <link href="contrib.html#tips">notes and tips</link>
         (e.g. a clear subject heading; being patient).</li>
+        <li><link href="http://www.apache.org/foundation/public-archives.html">ASF Public Forum Archive Policy</link></li>
       </ul>
       <p>
         If you are posting about a problem that you are having, it will aid in

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/mirrors.html
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/mirrors.html?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/mirrors.html (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/mirrors.html Fri Feb 15 18:19:17 2008
@@ -32,6 +32,9 @@
       Use the links below to download a distribution of Apache Forrest from one
       of our mirrors. It is good practice to <a href="[location]#verify">verify
       the integrity</a> of the distribution files.
+      Apache Forrest releases are available under the
+      <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
+      - see the README.txt and LICENSE.txt and NOTICE.txt files contained in each release artifact.
     </p>
     <p>
       Apache Forrest is distributed as a <code>zip</code> archive (for Windows)
@@ -85,13 +88,6 @@
 [<a href="http://www.apache.org/dist/forrest/apache-forrest-0.8.zip.asc">PGP</a>]
 [<a href="http://www.apache.org/dist/forrest/apache-forrest-0.8.zip.md5">MD5</a>]</li>
     </ul>
-    <h1><a name="svn" />Current development and head SVN repository</h1>
-    <p>
-      Developers can use the latest Apache Forrest features, the source code is
-      under version control with Subversion (read how to
-      <a href="site:documentation/developers/build">obtain</a> your working
-      copy).
-    </p>
     <h1><a name="archive" />Archive of old releases</h1>
     <p>
       Older releases are available in the
@@ -103,10 +99,11 @@
     <h1><a name="verify" />Verify releases</h1>
     <p>
       It is essential that you verify the integrity of the downloaded files
-      using the PGP and MD5 signatures. MD5 verification ensures the file was
+      using the MD5 and PGP signatures. MD5 verification ensures the file was
       not corrupted or tampered with. PGP verification ensures that the file
       came from a certain person.
     </p>
+    <h2><a name="pgp" />PGP Signature</h2>
     <p>
       The PGP signatures can be verified using
       <a href="http://www.pgpi.org/">PGP</a> or
@@ -131,8 +128,15 @@
 % gpg --import KEYS
 % gpg --verify apache-forrest-X.Y.tar.gz.asc
 </pre>
+
+    <p>
+    The files <code>apache-forrest-0.8.*</code>
+    are signed by David Crossley <code>23CB7A2A</code>
+    </p>
+
+    <h2><a name="md5" />MD5 Checksum</h2>
     <p>
-      To verify the MD5 signature on the files, you need to use a program called
+      To verify the MD5 checksum on the files, you need to use a program called
       <code>md5</code> or <code>md5sum</code>, which is included in many unix
       distributions. It is also available as part of
       <a href="http://www.gnu.org/software/textutils/textutils.html">GNU

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/procedures/release/How_to_release.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/procedures/release/How_to_release.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/procedures/release/How_to_release.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/procedures/release/How_to_release.xml Fri Feb 15 18:19:17 2008
@@ -228,7 +228,7 @@
                             href="http://issues.apache.org/jira/browse/FOR-853">FOR-853</a>.
             Look at
             <a
-                            href="http://www.mail-archive.com/dev@forrest.apache.org/msg02310.html">msg02310.html</a>
+                            href="http://www.mail-archive.com/dev@forrest.apache.org/msg02310.html" rel="nofollow">msg02310.html</a>
             for an example of such a message.
           </p></li>
         <li><p>
@@ -315,7 +315,7 @@
         ensures that it is the PMC as a whole that prepares and issues the
         release, rather than an individual. Such procedures give us the
         protection accorded by the ASF being a corporation. See a good
-        discussion <a href="http://marc.theaimsgroup.com/?t=114296877800003">in
+        discussion <a href="http://marc.theaimsgroup.com/?t=114296877800003" rel="nofollow">in
         the archives</a>.
       </note>
     </section>
@@ -530,7 +530,7 @@
             a text like:
           </p>
           <source>
- Apache Forrest &d; was released on &rdate;.
+ Apache Forrest &d; was released on ## YYYY-MM-DD ##.
  [### Add some important new features ###]</source></li>
         <li>Ensure that the documentation is building properly, do 'cd site-author; forrest'.
           Fix any linking errors. Review changes.html to ensure section numbering.</li>
@@ -538,6 +538,8 @@
         <li><p>
             Edit the forrest/site-author/content/xdocs/mirrors.html and adjust
             all version-specific content.
+            In the "Verify" section near the end, add the name of the Release Manager
+            and the PGP key Id used to sign the release.
           </p></li>
         <li>Commit all of the above changes after the code-freeze has started
                   in the next section.</li>
@@ -1024,30 +1026,30 @@
           </p>
           <p>
             See previous announcements for examples:
-            <a href="http://marc.info/?l=apache-announce&amp;m=117688881228702">0.8</a>
+            <a href="http://marc.info/?l=apache-announce&amp;m=117688881228702" rel="nofollow">0.8</a>
             |
-            <a href="http://marc.info/?l=xml-apache-announce&amp;m=111960678028211">0.7</a>
+            <a href="http://marc.info/?l=xml-apache-announce&amp;m=111960678028211" rel="nofollow">0.7</a>
             |
-            <a href="http://marc.info/?l=xml-apache-announce&amp;m=109784461425740">0.6</a>
+            <a href="http://marc.info/?l=xml-apache-announce&amp;m=109784461425740" rel="nofollow">0.6</a>
             |
-            <a href="http://marc.info/?l=xml-apache-announce&amp;m=106541447606765">0.5.1</a>
+            <a href="http://marc.info/?l=xml-apache-announce&amp;m=106541447606765" rel="nofollow">0.5.1</a>
             |
-            <a href="http://marc.info/?l=xml-apache-announce&amp;m=106352706005681">0.5</a>
+            <a href="http://marc.info/?l=xml-apache-announce&amp;m=106352706005681" rel="nofollow">0.5</a>
             |
-            <a href="http://marc.info/?l=jakarta-announce&amp;m=104510734501302">0.4</a>
+            <a href="http://marc.info/?l=jakarta-announce&amp;m=104510734501302" rel="nofollow">0.4</a>
             |
-            <a href="http://marc.info/?l=xml-apache-announce&amp;m=104399934113331">0.3</a>
+            <a href="http://marc.info/?l=xml-apache-announce&amp;m=104399934113331" rel="nofollow">0.3</a>
             |
-            <a href="http://marc.info/?l=xml-apache-announce&amp;m=103746673310573">0.2</a>
+            <a href="http://marc.info/?l=xml-apache-announce&amp;m=103746673310573" rel="nofollow">0.2</a>
           </p>
         </li>
         <li><p>
             Do the Freshmeat announcement:
-            <a href="http://freshmeat.net/projects/forrest/">http://freshmeat.net/projects/forrest/</a>
+            <a href="http://freshmeat.net/projects/forrest/" rel="nofollow">http://freshmeat.net/projects/forrest/</a>
           </p></li>
         <li>
                   Update the release information at our
-                  <a href="http://en.wikipedia.org/wiki/Apache_Forrest">Wikipedia</a> page.
+                  <a href="http://en.wikipedia.org/wiki/Apache_Forrest" rel="nofollow">Wikipedia</a> page.
                </li>
       </ol>
     </section>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/subversion_bestpractices.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/subversion_bestpractices.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/subversion_bestpractices.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/subversion_bestpractices.xml Fri Feb 15 18:19:17 2008
@@ -40,12 +40,12 @@
         </li>
         <li>See ASF-wide notes for <a href="http://www.apache.org/dev/#svn">developers</a>.
         </li>
-        <li>Use the <a href="http://svnbook.red-bean.com/">SVN Book</a> - Version Control with Subversion.
+        <li>Use the <a href="http://svnbook.red-bean.com/" rel="nofollow">SVN Book</a> - Version Control with Subversion.
         </li>
         <li><a href="contrib.html#svn-config">Configure</a> your svn client.
           <fixme author="">
             Move the notes from contrib.html to here. See other notes in
-            <a href="http://marc.theaimsgroup.com/?t=114834506800002">email</a>.
+            <a href="http://marc.theaimsgroup.com/?t=114834506800002" rel="nofollow">email</a>.
           </fixme></li>
         <li>When moving an existing file  please use "svn move fromFile toFile". This ensures 
              that the history of the item is not lost.</li>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/svn.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/svn.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/svn.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/svn.xml Fri Feb 15 18:19:17 2008
@@ -27,7 +27,7 @@
       manage their source code and other resources.
     </p>
     <p>
-      The "trunk" is where the main development happens. From time-to-time
+      The Forrest "trunk" is where the main development happens. From time-to-time
       "branches" are used for specific short-term development tasks and later
       merged to trunk.
     </p>
@@ -35,7 +35,9 @@
       Developers can browse the trunk via
       <a href="http://svn.apache.org/repos/asf/forrest/">direct access</a> or
       via the <a href="http://svn.apache.org/viewvc/forrest/trunk">ViewVC web
-      interface</a>. Similarly branches can be browsed (go up one level).
+      interface</a>.
+      Pay attention to LICENSE.txt and NOTICE.txt files.
+      Similarly branches can be browsed (go up one level).
     </p>
     <p>
       For every change, a notification email is automatically sent to the

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/eclipse.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/eclipse.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/eclipse.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/eclipse.xml Fri Feb 15 18:19:17 2008
@@ -38,8 +38,7 @@
       <p>
         To get you started while the documentation is being developed, see this
         forrest-dev mail thread:
-        <a href="http://marc.theaimsgroup.com/?t=112059632000001"> [eclipse] How
-        to install? </a> .
+        <a href="http://marc.theaimsgroup.com/?t=112059632000001" rel="nofollow"> [eclipse] How to install? </a> .
       </p>
     </section>
     <section>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/xxe.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/xxe.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/xxe.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/tools/xxe.xml Fri Feb 15 18:19:17 2008
@@ -15,8 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" 
-  "http://forrest.apache.org/dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>XXE Forrest Configuration</title>
@@ -27,7 +26,7 @@
       just that we provide this tool to take advantage of XXE.
     </note>
     <p>
-      <link href="http://www.xmlmind.com/xmleditor/">XMLmind XML Editor</link>
+      <a href="http://www.xmlmind.com/xmleditor/" rel="nofollow">XMLmind XML Editor</a>
       is a validating XML editor featuring a word processor-like view. We
       support the Forrest plugin for XXE only, please direct all XXE-related
       questions to XXE support or mailing lists.
@@ -71,9 +70,9 @@
         the build there to copy the DTDs
       </p>
       <p>
-        <link 
-          href="http://www.xmlmind.com/xmleditor/_distrib/doc/configure/index.html">
-        XXE Custom Configuration Info</link>
+        <a 
+          href="http://www.xmlmind.com/xmleditor/_distrib/doc/configure/index.html" rel="nofollow">
+        XXE Custom Configuration Info</a>
       </p>
     </section>
     <section>

Modified: forrest/branches/UpdateFOPto094/site-author/content/xdocs/zone.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/content/xdocs/zone.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/content/xdocs/zone.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/content/xdocs/zone.xml Fri Feb 15 18:19:17 2008
@@ -39,7 +39,6 @@
       <p>
         <strong>config</strong>
       </p>
-<!-- FIXME: create better layout for notes, just dumping text inside source elements for now. -->
       <source>
 creates /export/home/config ... $CONFIG
 directories /forrestbot-*/ are the forrestbot homes, see below.
@@ -85,6 +84,12 @@
         Various local software is installed in <code>/export/opt/</code> (not
         managed with SVN) ...
       </p>
+      <p>
+        Our Apache httpd server is managed using
+        <a href="http://www.apache.org/dev/solaris-zones.html#apache2_smf">Solaris SMF</a>
+        
+       so should always come back up automatically after a failure or machine reboot.
+      </p>
       <section id="s-forrest">
         <title>Forrest</title>
         <p>
@@ -133,7 +138,6 @@
 forrestbot operating with trunk.
 builds various sites automatically, triggered via cron.
 Configuration files and the generated results are at $DOC_ROOT/ft/
-FIXME: The web interface is coming soon.
 </source>
       <p>
         <strong>$CONFIG/forrestbot-trunk-stable</strong>
@@ -185,17 +189,7 @@
         Keep an occasional eye on $CONFIG/update-forrest-trunk.log This is
         the output of the cronjob to do svn update to trunk and re-build.
       </p>
-      <p>
-        FIXME: Start apache2 on boot (using new Solaris init.d replacement
-        called smf). At the moment we need to realise that it is down and
-        manually restart as per http://www.apache.org/dev/solaris-zones.html
-        Also it seems that /var/run/apache2 is wiped out on reboot, so need to
-        mkdir again.
-      </p>
-      <source>
-sudo mkdir /var/run/apache2
-sudo /usr/apache2/bin/apachectl -k start
-</source>
+
       <section id="admin-user">
         <title>User administration</title>
         <p>
@@ -217,7 +211,7 @@
       <title>Other notes</title>
       <ul>
         <li>See some other discussion in the thread
-          <a href="http://marc.info/?l=forrest-dev&amp;m=111717382712670">Re: zone for testing forrest</a></li>
+          <a href="http://marc.info/?l=forrest-dev&amp;m=111717382712670" rel="nofollow">Re: zone for testing forrest</a></li>
       </ul>
     </section>
   </body>

Modified: forrest/branches/UpdateFOPto094/site-author/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/skinconf.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/skinconf.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/skinconf.xml Fri Feb 15 18:19:17 2008
@@ -269,13 +269,6 @@
       <height>22</height>
     </credit>
     <credit box-location="alt2">
-      <name>ApacheCon US 2007</name>
-      <url>http://us.apachecon.com/</url>
-      <image>http://apache.org/ads/ApacheCon/2007-usa-125x125.png</image>
-      <width>125</width>
-      <height>125</height>
-    </credit>
-    <credit box-location="alt2">
       <name>ApacheCon Europe 2008</name>
       <url>http://eu.apachecon.com/</url>
       <image>http://apache.org/ads/ApacheCon/2008-europe-125x125.png</image>

Modified: forrest/branches/UpdateFOPto094/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/site-author/status.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/site-author/status.xml (original)
+++ forrest/branches/UpdateFOPto094/site-author/status.xml Fri Feb 15 18:19:17 2008
@@ -151,6 +151,17 @@
         Added document to facilitate
         <link href="site:upgrading_09">upgrading to v0.9</link>
       </action>
+<!-- 2008-01 -->
+      <action context="docs" type="update" dev="DC" fixes-bug="FOR-1062" due-to="Carlos Tejo">
+        Added demonstration of more xdoc elements to the sample document-v20
+      </action>
+      <action context="code" type="update" dev="TS" fixes-bug="FOR-733">
+        The "wholesite" html/pdf ability was broken with the locationmap.
+      </action>
+<!-- 2007-12 -->
+      <action context="code" type="update" dev="GM" fixes-bug="FOR-940">
+        Re-configured Forrest Zone to use SMF.
+      </action>
 <!-- 2007-10 -->
       <action context="code" type="update" dev="RDG" due-to="Uwe Kreibaum" fixes-bug="FOR-640">
          Fix unkown font error in FO generation.
@@ -168,9 +179,9 @@
       <action context="docs" type="update" dev="DC">
         Enhance the "<link href="site:howto/asf-mirror">HowTo Generate an ASF mirrors page</link>" doc to better explain.
         Refer to Forrest site-author as an example. This doc explains many things
-        which are usefule beyond the "ASF mirrors" example. It shows how to
+        which are useful beyond the "ASF mirrors" example. It shows how to
         add a specialised HTML form to a forrest-based site, howto to include
-        and exclude non-linked extra documents to the processingi using the
+        and exclude non-linked extra documents to the processing using the
         Cocoon CLI.
       </action>
       <action context="docs" type="update" dev="DC">

Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties Fri Feb 15 18:19:17 2008
@@ -23,4 +23,4 @@
 # FIXME: FOR-785
 forrest.validate.skinconf=false
 
-project.required.plugins=org.apache.forrest.plugin.input.XDoc,org.apache.forrest.plugin.input.projectInfo
+project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule,org.apache.forrest.plugin.input.XDoc,org.apache.forrest.plugin.input.projectInfo

Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/descriptorIndex-to-JSON.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/descriptorIndex-to-JSON.xsl?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/descriptorIndex-to-JSON.xsl (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/resources/stylesheets/descriptorIndex-to-JSON.xsl Fri Feb 15 18:19:17 2008
@@ -86,13 +86,13 @@
   </xsl:template>
   
   <xsl:template name="contributors">
-    <xsl:if test="doap:maintainer|doap:developer|doap:helper">
-      "person" : [<xsl:apply-templates select="doap:maintainer|doap:developer|doap:helper"/>],
+    <xsl:if test="doap:documentor|doap:maintainer|doap:developer|doap:helper">
+      "person" : [<xsl:apply-templates select="doap:maintainer|doap:documentor|doap:developer|doap:helper"/>],
     </xsl:if>
   </xsl:template>
   
-  <xsl:template match="doap:maintainer|doap:developer|doap:helper">
-    <xsl:apply-templates select="foaf:Person"/><xsl:if test="not(following-sibling::doap:maintainer|doap:developer|doap:helper)">,</xsl:if>
+  <xsl:template match="doap:documentor|doap:maintainer|doap:developer|doap:helper">
+    <xsl:apply-templates select="foaf:Person"/><xsl:if test="following-sibling::doap:maintainer|following-sibling::doap:documentor|following-sibling::doap:developer|following-sibling::doap:helper">,</xsl:if>
   </xsl:template>
   
   <xsl:template match="foaf:Person">

Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/locationmap.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/locationmap.xml (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.doap/src/documentation/content/locationmap.xml Fri Feb 15 18:19:17 2008
@@ -34,6 +34,9 @@
     <match pattern="doap.descriptor.forrest">
       <location src="{properties:content}doap/doap-forrest.xml" />
     </match>
+    <match pattern="doap.descriptor.simal">
+      <location src="http://simal.googlecode.com/svn/trunk/simal/src/documentation/content/rdf/simal.xml" />
+    </match>
     <match pattern="doap.categoryDefinitions">
       <location src="{properties:content}doap/categoryDefinitions.xml" />
     </match>

Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/forrest.properties?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/forrest.properties (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/forrest.properties Fri Feb 15 18:19:17 2008
@@ -22,5 +22,6 @@
 
 # FIXME: FOR-785
 forrest.validate.skinconf=false
-
-project.required.plugins=org.apache.forrest.plugin.input.skos,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf
+project.url=http://sina.khakbaz.com:8888/
+project.name=SKOS Plugin
+project.required.plugins=org.apache.forrest.plugin.input.skos,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.projectInfo

Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/input.xmap Fri Feb 15 18:19:17 2008
@@ -16,12 +16,35 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
   <!-- Components -->
   <map:components>
+    <map:generators>
+      <map:generator name="directory"
+                     src="org.apache.cocoon.generation.DirectoryGenerator"/>
+    </map:generators>
     <map:selectors default="parameter">
       <map:selector logger="sitemap.selector.parameter" name="parameter"
                     src="org.apache.cocoon.selection.ParameterSelector"/>
     </map:selectors>
+    <map:transformers default="xslt">
+      <map:transformer name="cinclude" 
+                  src="org.apache.cocoon.transformation.CIncludeTransformer"/>
+      <map:transformer name="i18n"
+                       src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="projectInfo">
+          <!--
+          <catalogue id="skos" name="SKOSMessages"
+                     location="{lm:skos.translations}"/>
+          -->
+          <catalogue id="projectInfo" name="ProjectInfoMessages" 
+                     location="{lm:project.translations}"/>
+          <catalogue id="other" name="OtherMessages"
+                     location="{lm:project.translations}"/>
+        </catalogues>
+        <cache-at-startup>true</cache-at-startup>
+      </map:transformer>
+    </map:transformers>
     <map:actions>
       <map:action logger="sitemap.action.sourcetype" name="sourcetype"
                   src="org.apache.forrest.sourcetype.SourceTypeAction">
@@ -30,11 +53,62 @@
         </sourcetype>
       </map:action>
     </map:actions>
+    <map:pipes>
+      <map:pipe name="navigation"
+                src="org.apache.cocoon.components.pipeline.impl.ExpiresCachingProcessingPipeline">
+        <parameter name="cache-expires" value="0"/>
+      </map:pipe>
+    </map:pipes>
   </map:components>
   <!-- /Components -->
 
   <!-- Pipelines -->
   <map:pipelines>
+    <map:pipeline type="navigation">
+      <!-- Glossary bundle -->
+      <map:match pattern="samples/glossary/glossaryBundle.xml">
+        <map:generate type="file" src="{properties:content}/locationmap.xml"/>
+        <map:transform src="{lm:skos.transform.locationmap.glossaryBundle}"/>
+        <map:transform type="cinclude"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <!-- Not being used by samples -->
+      <map:match pattern="samples/glossary/index.siteSnippet.xml">
+        <map:generate type="file" src="cocoon:/samples/glossary/glossaryBundle.xml"/>
+        <map:transform src="{lm:skos.transform.glossaryBundle.siteSnippet}"/>
+        <map:serialize type="xml-document"/>
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline>
+      <!-- Glossary Indexs  -->
+      <map:match pattern="samples/glossary/index/*.xml">
+        <map:generate type="file" src="cocoon://samples/glossary/glossaryBundle.xml"/>
+        <map:transform src="{lm:skos.transform.glossaryBundle.index.{1}}">
+          <map:parameter name="documentPath" value="{0}"/>
+        </map:transform>
+        <map:serialize type="xml-document"/>
+      </map:match>
+      <map:match pattern="samples/glossary/index/*/*.xml">
+        <map:generate type="file" src="cocoon://samples/glossary/glossaryBundle.xml"/>
+        <map:transform src="{lm:skos.transform.glossaryBundle.index.{1}}">
+          <map:parameter name="documentPath" value="{0}"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+      <!-- Glossary sources in SKOS RDF/XML -->
+      <map:match pattern="samples/glossary/**.source.xml">
+        <map:generate type="file" src="{lm:skos.glossary.{1}}"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="samples/glossary/**.xml">
+        <map:generate type="file" src="cocoon://samples/glossary/{1}.source.xml"/>
+        <map:transform src="{lm:skos.transform.skos.document}"/>
+        <map:serialize type="xml-document"/>
+      </map:match>
+    </map:pipeline>
+
+    <!-- SourceTypeAction
     <map:pipeline>
       <map:match pattern="**skos.xml">
         <map:generate src="{properties:content.xdocs}{1}skos.xml"/>
@@ -53,6 +127,7 @@
         <map:serialize type="xml"/>
       </map:match>
     </map:pipeline>
+    -->
   </map:pipelines>
   <!-- /Pipelines -->
 </map:sitemap>

Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.plugin.input.skos/locationmap.xml Fri Feb 15 18:19:17 2008
@@ -30,5 +30,23 @@
     <match pattern="skos.transform.*.*">
       <location src="resources/stylesheets/{1}-to-{2}.xsl"/>
     </match>
+    <match pattern="resolvePluginContract.*.**">
+      <select type="exists">
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.skos/resources/themes/{properties:dispatcher.theme}/{1}/{2}.ft" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.skos/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.ft" />
+      </select>
+    </match>
+    <match pattern="resolvePluginThemes.*.**">
+      <select type="exists">
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.skos/resources/themes/{properties:dispatcher.theme}/{1}/{2}.{1}" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.skos/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.{1}" />
+      </select>
+    </match>
+    <match pattern="resolvePluginPanels.**">
+      <select type="exists">
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.skos/resources/themes/{properties:dispatcher.theme}/panels/{1}.panel.xml" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.skos/resources/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml" />
+      </select>
+    </match>
   </locator>
 </locationmap>



Mime
View raw message