You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/12/08 15:49:00 UTC

cvs commit: cocoon-2.1/src/blocks/xmldb/samples sitemap.xmap

vgritsenko    2003/12/08 06:49:00

  Modified:    src/blocks/xmldb/samples sitemap.xmap
  Log:
  cleanup
  
  Revision  Changes    Path
  1.2       +55 -64    cocoon-2.1/src/blocks/xmldb/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xmldb/samples/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	28 Nov 2003 01:23:09 -0000	1.1
  +++ sitemap.xmap	8 Dec 2003 14:49:00 -0000	1.2
  @@ -1,82 +1,73 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
   <!-- ========================= Components ================================ -->
   
  - <map:components>
  -  <map:generators default="file">
  -    <!-- =================== XML:DB Generators ========================= -->
  -    <!-- BEWARE: these are unmaintained XML:DB generators, going to be   -->
  -    <!-- removed soon.                                                   -->
  -    <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
  -    <map:generator name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator" label="content">
  -      <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
  -      <base>xmldb:xindice-embed:///db/</base>
  -    </map:generator>
  -    <map:generator name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator" label="content">
  -      <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
  -      <base>xmldb:xindice-embed:///db/</base>
  -    </map:generator>
  -  </map:generators>
  -
  -  <map:transformers default="xslt"/>
  -  <map:readers default="resource"/>
  -  <map:serializers default="html"/>
  -  <map:matchers default="wildcard"/>
  -  <map:selectors default="browser"/>
  - </map:components>
  +  <map:components>
  +    <map:generators default="file">
  +      <!-- =================== XML:DB Generators ========================= -->
  +      <!-- BEWARE: these are unmaintained XML:DB generators, going to be   -->
  +      <!-- removed soon.                                                   -->
  +      <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
  +      <map:generator name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator" label="content">
  +        <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
  +        <base>xmldb:xindice-embed:///db/</base>
  +      </map:generator>
  +      <map:generator name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator" label="content">
  +        <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
  +        <base>xmldb:xindice-embed:///db/</base>
  +      </map:generator>
  +    </map:generators>
  +  </map:components>
   
   <!-- =========================== Views =================================== -->
   
  - <map:views>
  -  <map:view name="content" from-label="content">
  -   <map:serialize type="xml"/>
  -  </map:view>
  -
  -  <map:view from-label="content" name="pretty-content">
  -    <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  -    <map:serialize type="html"/>
  -  </map:view>
  -  
  -  <map:view name="links" from-position="last">
  -   <map:serialize type="links"/>
  -  </map:view>
  +  <map:views>
  +    <map:view name="content" from-label="content">
  +      <map:serialize type="xml"/>
  +    </map:view>
   
  - </map:views>
  +    <map:view from-label="content" name="pretty-content">
  +      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  +      <map:serialize type="html"/>
  +    </map:view>
  +
  +    <map:view name="links" from-position="last">
  +      <map:serialize type="links"/>
  +    </map:view>
  +  </map:views>
   
   <!-- =========================== Pipelines ================================= -->
   
  - <map:pipelines>
  -
  -  <map:pipeline>
  -    <!-- =================== XML:DB Generators ========================= -->
  -    <!-- BEWARE: the following examples use the unmaintained XML:DB      -->
  -    <!-- generators, going to be deprecated soon.                        -->
  -    <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
  -    <map:match pattern="xmldb-generator/db/**/">
  -      <map:generate type="xmldbcollection" src="/{1}"/>
  -      <map:serialize type="xml"/>
  -    </map:match>
  -
  -    <map:match pattern="xmldb-generator/db/**">
  -      <map:generate type="xmldb" src="/{1}"/>
  -      <map:serialize type="xml"/>
  -    </map:match>
  -  </map:pipeline>
  -
  -  <map:pipeline>
  -    <!-- ======================= XML:DB ============================== -->
  -    <map:match pattern="**">
  -      <map:match type="request-parameter" pattern="xpath">
  -        <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}"/>
  +  <map:pipelines>
  +    <map:pipeline>
  +      <!-- =================== XML:DB Generators ========================= -->
  +      <!-- BEWARE: the following examples use the unmaintained XML:DB      -->
  +      <!-- generators, going to be deprecated soon.                        -->
  +      <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
  +      <map:match pattern="xmldb-generator/db/**/">
  +        <map:generate type="xmldbcollection" src="/{1}"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +      <map:match pattern="xmldb-generator/db/**">
  +        <map:generate type="xmldb" src="/{1}"/>
           <map:serialize type="xml"/>
         </map:match>
  +    </map:pipeline>
   
  -      <map:generate src="xmldb:xindice-embed:///db/{1}"/>
  -      <map:serialize type="xml"/>
  -    </map:match>
  -  </map:pipeline>
  +    <map:pipeline>
  +      <!-- ======================= XML:DB ============================== -->
  +      <map:match pattern="**">
  +        <map:match type="request-parameter" pattern="xpath">
  +          <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}"/>
  +          <map:serialize type="xml"/>
  +        </map:match>
   
  - </map:pipelines>
  +        <map:generate src="xmldb:xindice-embed:///db/{1}"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +    </map:pipeline>
   
  +  </map:pipelines>
   </map:sitemap>