Return-Path: 
 <forrest-cvs-return-473-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 88194 invoked by uid 500); 15 Jan 2003 11:55:54 -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 88183 invoked from network); 15 Jan 2003 11:55:54 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 15 Jan 2003 11:55:54 -0000
Received: (qmail 87572 invoked by uid 1464); 15 Jan 2003 11:55:54 -0000
Date: 15 Jan 2003 11:55:54 -0000
Message-ID: <20030115115554.87571.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/01/15 03:55:54

  Modified:    src/resources/conf sitemap.xmap
  Log:
  Update Jetty to latest version
  
  Revision  Changes    Path
  1.55      +37 -13    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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- sitemap.xmap	12 Jan 2003 20:00:30 -0000	1.54
  +++ sitemap.xmap	15 Jan 2003 11:55:53 -0000	1.55
  @@ -17,16 +17,11 @@
     </map:generators>
   
     <map:transformers default="xslt">
  -  <!--
  -   <map:transformer     name="xslt"      src="org.apache.cocoon.transformation.TraxTransformer">
  -    <use-request-parameters>false</use-request-parameters>
  -    <use-browser-capabilities-db>false</use-browser-capabilities-db>
  -   </map:transformer>
  -  -->
  -  <map:transformer name="idgen" src="org.apache.cocoon.transformation.IdGeneratorTransformer">
  -    <element>/document/body//*[local-name() = 'section']</element>
  -    <id>title/text()</id>
  -  </map:transformer>
  +    <map:transformer name="idgen" src="org.apache.cocoon.transformation.IdGeneratorTransformer">
  +      <element>/document/body//*[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"/>
  @@ -36,11 +31,11 @@
           <suffix>/@href</suffix>
         </input-module>
       </map:transformer>
  +    
       <map:transformer name="xpath"
          logger="sitemap.transformer.xpath"
          src="org.apache.cocoon.transformation.XPathTransformer"
        />
  -
    
       <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"
                           logger="sitemap.transformer.xsltc"
  @@ -77,13 +72,14 @@
                   src="org.apache.cocoon.serialization.FOPSerializer"
                   mime-type="application/pdf"/>
   
  -
      <map:serializer name="links"                               src="org.apache.cocoon.serialization.LinkSerializer">
        <encoding>ISO-8859-1</encoding>
      </map:serializer>
  +   
      <map:serializer name="svg2jpeg" mime-type="image/jpeg"     src="org.apache.cocoon.serialization.SVGSerializer">
          <parameter name="quality" type="float" value="1.0"/>
      </map:serializer>
  +   
      <map:serializer name="svg2png" mime-type="image/png"       src="org.apache.cocoon.serialization.SVGSerializer"/>
     </map:serializers>
   
  @@ -122,6 +118,7 @@
   
     <!--
        The different pipeline implementations
  +     @todo use map:pipe and map:pipes with next cocoon CVS update
     -->
     <map:pipelines default="caching">
        <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  @@ -356,6 +353,20 @@
   
      <!-- Generates body HTML for files in subdirs -->
      <map:match pattern="body-**/*.xml">
  +         
  +     <!-- 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}/{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:/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"/>
  @@ -370,6 +381,20 @@
   
      <!-- Generates body HTML for root-level files -->
      <map:match pattern="body-**.xml">
  +      
  +     <!-- 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> 
  +   
       <map:generate src="content/xdocs/{1}.xml"/>
       <map:transform type="linkrewriter" src="cocoon:/linkmap"/>
       <map:transform type="idgen"/>
  @@ -382,7 +407,6 @@
       </map:call>
      </map:match>
    </map:pipeline>
  -
   
    <map:pipeline>
      <map:match pattern="abs-linkmap">