Return-Path: 
 <forrest-cvs-return-672-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 92107 invoked by uid 500); 14 Feb 2003 11:20:12 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 92096 invoked from network); 14 Feb 2003 11:20:12 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 14 Feb 2003 11:20:12 -0000
Received: (qmail 46166 invoked by uid 1464); 14 Feb 2003 11:20:10 -0000
Date: 14 Feb 2003 11:20:10 -0000
Message-ID: <20030214112010.46165.qmail@icarus.apache.org>
From: nicolaken@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/conf sitemap.xmap
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

nicolaken    2003/02/14 03:20:10

  Modified:    src/resources/conf sitemap.xmap
  Log:
        <action dev="NKB" type="update" context="webapp">
          Refactored the "transform-to-document" sitemap resource to do the
          the xinclude,  linkrewriter, and idgen steps.
        </action>
        <action dev="NKB" type="add" context="webapp">
          Added XInclude capability  to the documents. Remember to
          disable validations for files with xincludes as the xinclude is not
          performed during validation.
        </action>
        <action dev="NKB" type="add" context="schemas">
          Added DocBook 4.2 and symplified DocBook 1.0 to the schemas and
          to the validation catalogue.
          Added Docbook and symplified Docbook rendering capability for documents.
        </action>
  
  Revision  Changes    Path
  1.67      +54 -186   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.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- sitemap.xmap	12 Feb 2003 02:30:39 -0000	1.66
  +++ sitemap.xmap	14 Feb 2003 11:20:10 -0000	1.67
  @@ -4,7 +4,7 @@
      <map:components>
         <map:generators default="file">
            <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator" label="content" />
  -
  +         
            <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" label="content" />
   
            <map:generator name="html" src="org.apache.cocoon.generation.HTMLGenerator" label="content" />
  @@ -22,18 +22,14 @@
         <map:transformers default="xslt">
            <map:transformer name="idgen" src="org.apache.cocoon.transformation.IdGeneratorTransformer">
               <element>//*[local-name() = 'section']</element>
  -
               <id>title/text()</id>
            </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>
  @@ -42,14 +38,13 @@
   
            <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer" logger="sitemap.transformer.xsltc" pool-max="32" pool-min="8" pool-grow="2">
               <use-request-parameters>false</use-request-parameters>
  -
               <use-browser-capabilities-db>false</use-browser-capabilities-db>
  -
               <use-deli>false</use-deli>
  -
   <!-- transformer-factory>com.icl.saxon.TransformerFactoryImpl</transformer-factory -->
   <!-- transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory -->
            </map:transformer>
  +
  +         <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer" logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" />
         </map:transformers>
   
         <map:readers default="resource">
  @@ -115,6 +110,14 @@
               <sourcetype name="howto-v10">
                  <document-declaration public-id="-//APACHE//DTD How-to V1.0//EN" />
               </sourcetype>
  +
  +            <sourcetype name="docbook-v4.2">
  +               <document-declaration public-id="-//OASIS//DTD DocBook XML V4.2//EN" />
  +            </sourcetype>
  +
  +            <sourcetype name="sdocbook-v1.0">
  +               <document-declaration public-id="-//OASIS//DTD Simplified DocBook XML V1.0//EN" />
  +            </sourcetype>
            </map:action>
         </map:actions>
   
  @@ -128,7 +131,6 @@
     -->
         <map:pipelines default="caching">
            <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
  -
            <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
   
   <!-- The following two can be used for profiling:
  @@ -146,13 +148,11 @@
   
         <map:view name="pretty-content" from-label="content">
            <map:transform src="library/xslt/simple-xml2html.xsl" />
  -
            <map:serialize type="html" />
         </map:view>
   
         <map:view name="links" from-position="last">
            <map:transform src="library/xslt/filterlinks.xsl" />
  -
            <map:serialize type="links" />
         </map:view>
      </map:views>
  @@ -160,18 +160,14 @@
      <map:resources>
         <map:resource name="skinit">
            <map:transform src="skins/{forrest:skin}/xslt/html/{type}.xsl">
  -           <map:parameter name="notoc" value="{notoc}" />
  -
  -           <!-- For backwards-compat with 0.2 - 0.4 skins -->
  -            <map:parameter name="isfaq" value="{notoc}" />
  -
  -            <map:parameter name="nopdf" value="{nopdf}" />
  -
  -            <map:parameter name="path" value="{path}" />
  -
  +         <map:parameter name="notoc" value="{notoc}" />
  +<!-- For backwards-compat with 0.2 - 0.4 skins -->
  +         <map:parameter name="isfaq" value="{notoc}" />
  +         <map:parameter name="nopdf" value="{nopdf}" />
  +         <map:parameter name="path" value="{path}" />
   <!-- Can set an alternative project skinconfig here 
  -     <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  -     -->
  +             <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  +             -->
            </map:transform>
   
            <map:serialize />
  @@ -181,28 +177,21 @@
            <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:/{../dir}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. -->
  +              directory. -->
            <map:transform src="library/xslt/site2book.xsl" />
  -
            <map:call resource="skinit">
               <map:parameter name="type" value="book2menu" />
  -
               <map:parameter name="path" value="{path}" />
            </map:call>
         </map:resource>
  @@ -214,6 +203,9 @@
   <!-- Checks the document type of the resource passed in the "src" parameter
          and converts it to document if necessary -->
         <map:resource name="transform-to-document">
  +         <map:transform type="xinclude" />
  +         <map:transform type="linkrewriter" src="{linkmap}" />
  +         <map:transform type="idgen" />
            <map:act type="sourcetype" src="{src}">
               <map:select type="parameter">
                  <map:parameter name="parameter-selector-test" value="{sourcetype}" />
  @@ -222,6 +214,14 @@
                     <map:transform src="library/xslt/howto2document.xsl" label="content" />
                  </map:when>
   
  +               <map:when test="docbook-v4.2">
  +                  <map:transform src="library/xslt/docbook2document.xsl" label="content" />
  +               </map:when>
  +
  +               <map:when test="sdocbook-v1.0">
  +                  <map:transform src="library/xslt/docbook2document.xsl" label="content" />
  +               </map:when>
  +
                  <map:otherwise />
               </map:select>
            </map:act>
  @@ -237,9 +237,7 @@
               <map:generate type="textparser" src="chaperon/{1}.rgrm">
                  <map:parameter name="grammar" value="chaperon/grammars/rgrm.grm" />
               </map:generate>
  -
               <map:transform src="chaperon/stylesheets/rgrm2grm.xsl" />
  -
               <map:serialize type="xml" />
            </map:match>
         </map:pipeline>
  @@ -250,12 +248,9 @@
         <map:pipeline internal-only="false">
            <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}" />
               </map:call>
            </map:match>
  @@ -263,7 +258,6 @@
            <map:match pattern="**book-**/*.xml">
               <map:call resource="book">
                  <map:parameter name="dir" value="{2}/" />
  -
                  <map:parameter name="path" value="{2}/{3}.xml" />
               </map:call>
            </map:match>
  @@ -271,32 +265,24 @@
            <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" />
  -
                  <map:parameter name="path" value="/todo.xml" />
               </map:call>
            </map:match>
   
            <map:match pattern="body-forrest-issues.xml">
               <map:generate type="file-nolabel" src="http://issues.cocoondev.org/jira/secure/IssueNavigator.jspa?pid=10000&amp;resolutionIds=-1&amp;view=rss&amp;reset=true" />
  -
               <map:transform src="library/xslt/rssissues2document.xsl" label="content" />
  -
               <map:transform type="idgen" />
  -
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
                  <map:parameter name="nopdf" value="true" />
  @@ -306,61 +292,45 @@
   
            <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" />
  -
                  <map:parameter name="path" value="/changes.xml" />
               </map:call>
            </map:match>
   
            <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" />
  -
  -               <map:parameter name="path" value="{1}/faq.xml" />
  -
  -               <map:parameter name="notoc" value="true" />
  +              <map:parameter name="type" value="document2html" />
  +              <map:parameter name="path" value="{1}/faq.xml" />
  +              <map:parameter name="isfaq" value="true" />
  +              <map:parameter name="notoc" value="true" />
               </map:call>
            </map:match>
   
            <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" />
  -
  -               <map:parameter name="path" value="faq.xml" />
  -
  -               <map:parameter name="notoc" value="true" />
  +              <map:parameter name="type" value="document2html" />
  +              <map:parameter name="path" value="faq.xml" />
  +              <map:parameter name="isfaq" value="true" />
  +              <map:parameter name="notoc" value="true" />
               </map:call>
            </map:match>
   
   <!-- 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:transform type="idgen" />
  -
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
  -
                  <map:parameter name="path" value="community/{1}/index" />
               </map:call>
            </map:match>
  @@ -368,14 +338,10 @@
   <!-- 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:transform type="idgen" />
  -
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
  -
                  <map:parameter name="path" value="community/{1}/revision-{2}" />
               </map:call>
            </map:match>
  @@ -384,19 +350,13 @@
            <map:match pattern="body-community/*/*/**.xml">
               <map:aggregate element="all">
                  <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 type="idgen" />
  -
               <map:transform src="library/xslt/{1}2document.xsl" label="content" />
  -
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
  -
                  <map:parameter name="path" value="community/{1}/{2}/{3}.xml" />
               </map:call>
            </map:match>
  @@ -406,13 +366,10 @@
               <map:generate type="directory" src="content/xdocs/community/{1}/{2}">
                  <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
               </map:generate>
  -
               <map:transform src="library/xslt/directory2revisions.xsl" label="content">
                  <map:parameter name="use-request-parameters" value="true" />
  -
                  <map:parameter name="page" value="{3}" />
               </map:transform>
  -
               <map:serialize type="xml" />
            </map:match>
   
  @@ -421,92 +378,68 @@
               <map:generate type="nekodtd" src="resources/schema/dtd/{1}.dtd">
                  <map:parameter name="config-class" value="org.cyberneko.dtd.DTDConfiguration" />
               </map:generate>
  -
               <map:transform src="library/xslt/dtdx2flat.xsl" />
  -
               <map:transform src="library/xslt/flat2document.xsl" />
  -
               <map:transform type="idgen" />
  -
               <map:call resource="skinit">
  -               <map:parameter name="type" value="document2html" />
  -
  -               <map:parameter name="notoc" value="true" />
  -
  -               <map:parameter name="path" value="{1}.dtdx.xml" />
  +              <map:parameter name="type" value="document2html" />
  +              <map:parameter name="isfaq" value="true" />
  +              <map:parameter name="notoc" value="true" />
  +              <map:parameter name="path" value="{1}.dtdx.xml" />
               </map:call>
            </map:match>
   
   <!-- Generates body HTML for files in subdirs -->
            <map:match pattern="body-**/*.xml">
  -           <!-- if the file is present as ihtml, convert to doc-v11... -->
  +<!-- if the file is present as ihtml, convert to doc-v11... -->
               <map:act type="resource-exists">
                  <map:parameter name="url" value="content/xdocs/{1}/{2}.ihtml" />
  -
                  <map:generate src="content/xdocs/{../1}/{../2}.ihtml" type="html" />
  -
                  <map:transform src="library/xslt/html2document.xsl" />
  -
                  <map:transform type="linkrewriter" src="cocoon:/{../1}/linkmap" />
  -
                  <map:transform type="idgen" />
  -
                  <map:call resource="skinit">
                     <map:parameter name="type" value="document2html" />
  -
                     <map:parameter name="path" value="{../1}/{../2}.xml" />
                  </map:call>
               </map:act>
   
  -            <!-- if the file is present as html, give that to the user... -->
  +<!-- if the file is present as html, give that to the user... -->
               <map:act type="resource-exists">
                  <map:parameter name="url" value="content/xdocs/{1}/{2}.ehtml" />
  -               <map:generate src="content/xdocs/{../1}/{../2}.ehtml"/>
  +               <map:generate src="content/xdocs/{../1}/{../2}.ehtml" />
                  <map:transform src="library/xslt/html2htmlbody.xsl" />
                  <map:transform type="linkrewriter" src="cocoon:/{../1}/linkmap" />
  -               <map:serialize type="xml"/>
  +               <map:serialize type="xml" />
               </map:act>
   
   <!-- if the file is present as .cwiki, give that to the user... -->
               <map:act type="resource-exists">
                  <map:parameter name="url" value="content/xdocs/{1}/{2}.cwiki" />
  -
                  <map:generate src="content/xdocs/{../1}/{../2}.cwiki" type="textparser">
                     <map:parameter name="grammar" value="chaperon/grammars/wiki.grm" />
   
                     <map:parameter name="includeignorabletokens" value="true" />
                  </map:generate>
  -
                  <map:transform src="library/xslt/wiki2htmlpage.xsl" />
  -
                  <map:transform src="library/xslt/wiki2html.xsl" />
  -
                  <map:transform src="library/xslt/html2document.xsl" />
  -
                  <map:transform type="linkrewriter" src="cocoon:/{../1}/linkmap" />
  -
                  <map:transform type="idgen" />
  -
                  <map:call resource="skinit">
                     <map:parameter name="type" value="document2html" />
  -
                     <map:parameter name="path" value="{../1}/{../2}.xml" />
                  </map:call>
               </map:act>
   
               <map:generate src="content/xdocs/{1}/{2}.xml" />
  -
  -            <map:transform type="linkrewriter" src="cocoon:/{1}/linkmap" />
  -
  -            <map:transform type="idgen" />
  -
               <map:call resource="transform-to-document">
                  <map:parameter name="src" value="content/xdocs/{1}/{2}.xml" />
  +               <map:parameter name="linkmap" value="cocoon:/{1}/linkmap" />
               </map:call>
  -
  +            
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
  -
                  <map:parameter name="path" value="{1}/{2}.xml" />
               </map:call>
            </map:match>
  @@ -516,29 +449,23 @@
   <!-- if the file is present as ihtml, give that to the user... -->
               <map:act type="resource-exists">
                  <map:parameter name="url" value="content/xdocs/{1}.ihtml" />
  -
                  <map:generate src="content/xdocs/{../1}.ihtml" type="html" />
  -
                  <map:transform src="library/xslt/html2document.xsl" />
  -
                  <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  -
                  <map:transform type="idgen" />
  -
                  <map:call resource="skinit">
                     <map:parameter name="type" value="document2html" />
  -
                     <map:parameter name="path" value="{../1}.xml" />
                  </map:call>
               </map:act>
   
  -            <!-- if the file is present as html, give that to the user... -->
  +<!-- if the file is present as html, give that to the user... -->
               <map:act type="resource-exists">
                  <map:parameter name="url" value="content/xdocs/{1}.ehtml" />
  -               <map:generate src="content/xdocs/{../1}.ehtml"/>
  +               <map:generate src="content/xdocs/{../1}.ehtml" />
                  <map:transform src="library/xslt/html2htmlbody.xsl" />
                  <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  -               <map:serialize type="xml"/>
  +               <map:serialize type="xml" />
               </map:act>
   
   <!-- if the file is present as .cwiki, give that to the user... -->
  @@ -547,40 +474,27 @@
   
                  <map:generate src="content/xdocs/{../1}.cwiki" type="textparser">
                     <map:parameter name="grammar" value="chaperon/grammars/wiki.grm" />
  -
                     <map:parameter name="includeignorabletokens" value="true" />
                  </map:generate>
  -
                  <map:transform src="library/xslt/wiki2htmlpage.xsl" />
  -
                  <map:transform src="library/xslt/wiki2html.xsl" />
  -
                  <map:transform src="library/xslt/html2document.xsl" />
  -
                  <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  -
                  <map:transform type="idgen" />
  -
                  <map:call resource="skinit">
                     <map:parameter name="type" value="document2html" />
  -
                     <map:parameter name="path" value="{../1}.xml" />
                  </map:call>
               </map:act>
   
               <map:generate src="content/xdocs/{1}.xml" />
  -
  -            <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  -
  -            <map:transform type="idgen" />
  -
               <map:call resource="transform-to-document">
                  <map:parameter name="src" value="content/xdocs/{1}.xml" />
  +               <map:parameter name="linkmap" value="cocoon:/linkmap" />
               </map:call>
   
               <map:call resource="skinit">
                  <map:parameter name="type" value="document2html" />
  -
                  <map:parameter name="path" value="{1}.xml" />
               </map:call>
            </map:match>
  @@ -589,29 +503,23 @@
         <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>
   
  @@ -620,11 +528,9 @@
      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>
  @@ -644,20 +550,17 @@
   <!-- if the file is present verbatim as content, give that to the user... -->
               <map:act type="resource-exists">
                  <map:parameter name="url" value="content/{1}" />
  -
                  <map:match pattern="**.html">
   <!--
           Use this instead if you don't want JTidy to clean up your HTML
           <map:read src="content/{0}" mime-type="text/html"/>
           -->
                     <map:generate type="html" src="content/{1}.html" />
  -
                     <map:serialize type="html" />
                  </map:match>
   
                  <map:match pattern="**.xml">
                     <map:generate type="file" src="content/{1}.xml" />
  -
                     <map:serialize type="xml" />
                  </map:match>
   
  @@ -690,8 +593,7 @@
                  </map:match>
   
                  <map:match pattern="**.swf">
  -                 <map:read src="content/{1}.swf"
  -                   mime-type="application/x-shockwave-flash" />
  +                  <map:read src="content/{1}.swf" mime-type="application/x-shockwave-flash" />
                  </map:match>
   
                  <map:match pattern="**">
  @@ -711,15 +613,12 @@
               <map:match pattern="*.html">
                  <map:aggregate element="site">
                     <map:part src="cocoon:/book-{1}.xml" />
  -
                     <map:part src="cocoon:/tab-{1}.xml" />
  -
                     <map:part src="cocoon:/body-{1}.xml" label="content" />
                  </map:aggregate>
   
                  <map:call resource="skinit">
                     <map:parameter name="type" value="site2xhtml" />
  -
                     <map:parameter name="path" value="{0}" />
                  </map:call>
               </map:match>
  @@ -735,7 +634,6 @@
   
                  <map:call resource="skinit">
                     <map:parameter name="type" value="site2xhtml" />
  -
                     <map:parameter name="path" value="{0}" />
                  </map:call>
               </map:match>
  @@ -744,13 +642,9 @@
                  <map:generate type="nekodtd" src="resources/schema/dtd/{1}.dtd">
                     <map:parameter name="config-class" value="org.cyberneko.dtd.DTDConfiguration" />
                  </map:generate>
  -
                  <map:transform src="library/xslt/dtdx2flat.xsl" />
  -
                  <map:transform src="library/xslt/flat2document.xsl" />
  -
                  <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl" />
  -
                  <map:serialize type="fo2pdf" />
               </map:match>
   
  @@ -758,63 +652,46 @@
                  <map:generate type="nekodtd" src="resources/schema/dtd/{2}.dtd">
                     <map:parameter name="config-class" value="org.cyberneko.dtd.DTDConfiguration" />
                  </map:generate>
  -
                  <map:transform src="library/xslt/dtdx2flat.xsl" />
  -
                  <map:transform src="library/xslt/flat2document.xsl" />
  -
                  <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl" />
  -
                  <map:serialize type="fo2pdf" />
               </map:match>
   
               <map:match pattern="changes.pdf">
                  <map:generate type="file-nolabel" src="status.xml" />
  -
                  <map:transform src="library/xslt/changes2document.xsl" label="content" />
  -
                  <map:transform src="skins/forrest-site/xslt/fo/document2fo.xsl" />
  -
                  <map:serialize type="fo2pdf" />
               </map:match>
   
               <map:match pattern="changes.rss">
                  <map:generate type="file-nolabel" src="status.xml" />
  -
                  <map:transform src="library/xslt/changes2rss.xsl" label="content" />
  -
                  <map:serialize type="rss091" />
               </map:match>
   
               <map:match pattern="todo.pdf">
                  <map:generate type="file-nolabel" src="status.xml" />
  -
                  <map:transform src="library/xslt/todo2document.xsl" label="content" />
  -
                  <map:transform src="skins/forrest-site/xslt/fo/document2fo.xsl" />
  -
                  <map:serialize type="fo2pdf" />
               </map:match>
   
               <map:match pattern="faq.pdf">
                  <map:generate type="file-nolabel" src="content/xdocs/faq.xml" />
  -
                  <map:transform src="library/xslt/faq2document.xsl" label="content" />
  -
                  <map:transform src="skins/forrest-site/xslt/fo/document2fo.xsl" />
  -
                  <map:serialize type="fo2pdf" />
               </map:match>
   
               <map:match pattern="**.pdf">
                  <map:generate src="content/xdocs/{1}.xml" />
  -
                  <map:call resource="transform-to-document">
                     <map:parameter name="src" value="content/xdocs/{1}.xml" />
  +                  <map:parameter name="linkmap" value="cocoon:/linkmap" />
                  </map:call>
  -
                  <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl" />
  -
                  <map:serialize type="fo2pdf" />
               </map:match>
   
  @@ -837,7 +714,6 @@
               <map:match pattern="skin/**.js">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="scripts/{1}.js" />
  -
                     <map:parameter name="mime-type" value="application/javascript" />
                  </map:call>
               </map:match>
  @@ -845,7 +721,6 @@
               <map:match pattern="**/skin/**.js">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="scripts/{2}.js" />
  -
                     <map:parameter name="mime-type" value="application/javascript" />
                  </map:call>
               </map:match>
  @@ -857,7 +732,6 @@
               <map:match pattern="skin/**.css">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="css/{1}.css" />
  -
                     <map:parameter name="mime-type" value="text/css" />
                  </map:call>
               </map:match>
  @@ -865,7 +739,6 @@
               <map:match pattern="**/skin/**.css">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="css/{2}.css" />
  -
                     <map:parameter name="mime-type" value="text/css" />
                  </map:call>
               </map:match>
  @@ -877,7 +750,6 @@
               <map:match pattern="skin/images/**.*">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="images/{1}.{2}" />
  -
                     <map:parameter name="mime-type" value="image/{2}" />
                  </map:call>
               </map:match>
  @@ -889,7 +761,6 @@
               <map:match pattern="**/skin/images/**.*">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="images/{2}.{3}" />
  -
                     <map:parameter name="mime-type" value="image/{3}" />
                  </map:call>
               </map:match>
  @@ -902,9 +773,7 @@
               <map:match pattern="images/**.png">
                  <map:act type="resource-exists">
                     <map:parameter name="url" value="resources/images/{1}.svg" />
  -
                     <map:generate src="resources/images/{../1}.svg" />
  -
                     <map:serialize type="svg2png" />
                  </map:act>
   
  @@ -923,7 +792,6 @@
               <map:match pattern="**favicon.ico">
                  <map:call resource="skin-read">
                     <map:parameter name="path" value="images/favicon.ico" />
  -
                     <map:parameter name="mime-type" value="image/x-ico" />
                  </map:call>
               </map:match>