Return-Path: 
 <forrest-cvs-return-725-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 90630 invoked by uid 500); 15 Mar 2003 07:08:59 -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 90612 invoked from network); 15 Mar 2003 07:08:58 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 15 Mar 2003 07:08:58 -0000
Received: (qmail 79384 invoked by uid 1352); 15 Mar 2003 07:08:57 -0000
Date: 15 Mar 2003 07:08:57 -0000
Message-ID: <20030315070857.79383.qmail@icarus.apache.org>
From: jefft@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

jefft       2003/03/14 23:08:57

  Modified:    src/resources/conf sitemap.xmap
  Log:
  Some cleanups
  
  Revision  Changes    Path
  1.73      +2 -25     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.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- sitemap.xmap	15 Mar 2003 06:21:52 -0000	1.72
  +++ sitemap.xmap	15 Mar 2003 07:08:57 -0000	1.73
  @@ -1,6 +1,5 @@
   <?xml version="1.0"?>
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -  <!-- =========================== Components ================================ -->
     <map:components>
       <map:generators default="file">
         <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator" label="content" />
  @@ -91,10 +90,6 @@
   
       </map:actions>
   
  -    <!--
  -    The different pipeline implementations
  -    @todo use map:pipe and map:pipes with next cocoon CVS update
  -    -->
       <map:pipes default="caching">
         <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
         <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  @@ -103,7 +98,6 @@
       </map:pipes>
     </map:components>
   
  -  <!-- =========================== Views =================================== -->
     <map:views>
       <map:view name="content" from-label="content">
         <map:serialize type="xml" />
  @@ -131,8 +125,6 @@
         <map:serialize/>
       </map:resource>
   
  -    <!-- Checks the document type of the resource passed in the "src" parameter
  -    and converts it to document if necessary -->
     </map:resources>
   
     <!-- =========================== Pipelines ================================= -->
  @@ -143,19 +135,6 @@
         <!-- ============================================================ -->
         <!-- OUTPUT FORMATS                                               -->
         <!-- ============================================================ -->
  -      <!--
  -      <map:match pattern="dombug/*">
  -        <map:mount check-reload="yes" src="dombug/" uri-prefix="dombug"/>
  -      </map:match>
  -      -->
  -
  -      <map:match pattern="test">
  -        <map:generate src="content/xdocs/tabs.xml"/>
  -        <map:transform type="linkrewriter" src="cocoon:/community/linkmap">
  -          <map:parameter name="schemes" value="site ext"/>
  -        </map:transform>
  -        <map:serialize type="xml"/>
  -      </map:match>
   
         <map:match pattern="*.html">
           <map:aggregate element="site">
  @@ -199,7 +178,7 @@
       <!-- INTERMEDIATE FORMATS                                         -->
       <!-- ============================================================ -->
       <map:pipeline internal-only="false">
  -  
  +
         <map:match pattern="**body-*.xml">
           <map:generate src="cocoon:/{1}{2}.xml"/>
           <map:transform type="xinclude"/>
  @@ -240,7 +219,6 @@
       <!-- ============================================================ -->
       <!-- SOURCE FORMATS                                               -->
       <!-- ============================================================ -->
  -
       <map:pipeline internal-only="false">
         <map:match pattern="**book.xml">
           <map:mount uri-prefix="" src="navigation.xmap" check-reload="yes" />
  @@ -313,8 +291,7 @@
           <map:mount uri-prefix="" src="redirect.xmap" check-reload="yes" />
         </map:match>
   
  -
  -       <map:match pattern="**">
  +      <map:match pattern="**">
           <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
         </map:match>