Return-Path: 
 <cvs-return-16794-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 16178 invoked from network); 31 Jan 2004 16:58:27 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 31 Jan 2004 16:58:27 -0000
Received: (qmail 20150 invoked by uid 500); 31 Jan 2004 16:58:19 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 19993 invoked by uid 500); 31 Jan 2004 16:58:18 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 19976 invoked by uid 500); 31 Jan 2004 16:58:18 -0000
Delivered-To: apmail-cocoon-2.2-cvs@apache.org
Received: (qmail 19956 invoked from network); 31 Jan 2004 16:58:18 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 31 Jan 2004 16:58:18 -0000
Received: (qmail 16140 invoked by uid 1758); 31 Jan 2004 16:58:24 -0000
Date: 31 Jan 2004 16:58:24 -0000
Message-ID: <20040131165824.16139.qmail@minotaur.apache.org>
From: unico@apache.org
To: cocoon-2.2-cvs@apache.org
Subject: cvs commit: cocoon-2.2/src/webapp/WEB-INF cocoon.xconf
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

unico       2004/01/31 08:58:24

  Modified:    src/webapp sitemap.xmap
               src/webapp/WEB-INF cocoon.xconf
  Log:
  make caching work
  
  Revision  Changes    Path
  1.39      +8 -12     cocoon-2.2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/sitemap.xmap,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- sitemap.xmap	26 Jan 2004 16:07:18 -0000	1.38
  +++ sitemap.xmap	31 Jan 2004 16:58:24 -0000	1.39
  @@ -198,7 +198,6 @@
         mime-type="text/html" 
         pool-grow="4" pool-max="32" pool-min="4" 
       />
  -    <!--
       <map:serializer logger="sitemap.serializer.wml" mime-type="text/vnd.wap.wml" name="wml" src="org.apache.cocoon.serialization.XMLSerializer">
        <doctype-public>-//WAPFORUM//DTD WML 1.1//EN</doctype-public>
        <doctype-system>http://www.wapforum.org/DTD/wml_1.1.xml</doctype-system>
  @@ -206,9 +205,9 @@
        <omit-xml-declaration>yes</omit-xml-declaration>
       </map:serializer>
       <map:serializer logger="sitemap.serializer.chtml" mime-type="text/html" name="chtml" src="org.apache.cocoon.serialization.HTMLSerializer">
  -     <!- -+ Compact HTML for Small Information Appliances,
  +     <!--+ Compact HTML for Small Information Appliances,
            | based on http://www.w3.org/TR/1998/NOTE-compactHTML-19980209/
  -         + - ->
  +         + -->
        <doctype-public>-//W3C//DTD Compact HTML 1.0 Draft//EN</doctype-public>
       </map:serializer>
       <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg+xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
  @@ -219,7 +218,7 @@
         <doctype-public>-//W3C//DTD XHTML 1.1//EN</doctype-public>
         <doctype-system>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</doctype-system>
         <encoding>UTF-8</encoding>
  -    </map:serializer>   
  +    </map:serializer>
       <map:serializer logger="sitemap.serializer.text" mime-type="text/plain" name="text" src="org.apache.cocoon.serialization.TextSerializer"/>
       <map:serializer logger="sitemap.serializer.vrml" mime-type="model/vrml" name="vrml" src="org.apache.cocoon.serialization.TextSerializer"/>
       <map:serializer logger="sitemap.serializer.zip"  mime-type="application/zip" name="zip" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
  @@ -227,7 +226,6 @@
       <map:serializer logger="sitemap.serializer.sxc"  mime-type="application/vnd.sun.xml.calc" name="sxc" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
       <map:serializer logger="sitemap.serializer.sxd"  mime-type="application/vnd.sun.xml.draw" name="sxd" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
       <map:serializer logger="sitemap.serializer.sxi"  mime-type="application/vnd.sun.xml.impress" name="sxi" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
  -    -->
     </map:serializers>
   
     <!--+
  @@ -396,9 +394,8 @@
         | cache points.
         +-->
      <map:pipes default="caching">
  -     <!--
        <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
  -       <!- -+
  +       <!--+
              | If not specified, the value of the outputBufferSize parameter is -1.
              | This will cause Cocoon to buffer all output until processing has finished
              | before sending it to the client. This has the advantage that in case
  @@ -410,14 +407,13 @@
              | is being generated.
              | For more granularity, you can also supply this parameter to
              | individual map:pipeline elements (using map:parameter syntax).
  -           +- ->
  -       <!- - parameter name="outputBufferSize" value="8192"/ - ->
  +           +-->
  +       <!-- parameter name="outputBufferSize" value="8192"/ -->
        </map:pipe>
        <map:pipe name="caching-point" src="org.apache.cocoon.components.pipeline.impl.CachingPointProcessingPipeline">
          <autoCachingPoint>On</autoCachingPoint>
  -       <!- - parameter name="outputBufferSize" value="8192"/ - ->
  +       <!-- parameter name="outputBufferSize" value="8192"/ -->
        </map:pipe>
  -     -->
        <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline">
          <!-- parameter name="outputBufferSize" value="8192"/ -->
        </map:pipe>
  
  
  
  1.40      +47 -10    cocoon-2.2/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- cocoon.xconf	26 Jan 2004 16:07:18 -0000	1.39
  +++ cocoon.xconf	31 Jan 2004 16:58:24 -0000	1.40
  @@ -118,25 +118,25 @@
         |            enable it on one xslt-processor, enable it on all.
         +-->
     <xslt-processor id="xslt" logger="core.xslt-processor" default="true">
  -     <parameter name="use-store" value="false"/>
  -     <parameter name="incremental-processing" value="false"/>
  +    <parameter name="use-store" value="false"/>
  +    <parameter name="incremental-processing" value="false"/>
     </xslt-processor>
   
     <!--+
         | XSLT Processor using xsltc from Xalan
         +-->
     <xslt-processor id="xsltc" logger="core.xslt-processor">
  -     <parameter name="use-store" value="false"/>
  -     <parameter name="transformer-factory" value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
  +    <parameter name="use-store" value="false"/>
  +    <parameter name="transformer-factory" value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
     </xslt-processor>
     
     <!--+
         | Xalan XSLT Processor
         +-->
     <xslt-processor id="xalan" logger="core.xslt-processor">
  -     <parameter name="use-store" value="false"/>
  -     <parameter name="incremental-processing" value="false"/>
  -     <parameter name="transformer-factory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
  +    <parameter name="use-store" value="false"/>
  +    <parameter name="incremental-processing" value="false"/>
  +    <parameter name="transformer-factory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
     </xslt-processor>
   
     <!--+
  @@ -146,7 +146,7 @@
   
     <!-- The XMLizers converts different mime-types to XML -->
     <xmlizer id="xmlizer" logger="core.xmlizer">
  -      <parser role="org.apache.excalibur.xml.sax.SAXParser" mime-type="text/xml" />
  +    <parser role="org.apache.excalibur.xml.sax.SAXParser" mime-type="text/xml" />
     </xmlizer>
     
     <!--+
  @@ -217,10 +217,37 @@
         |     <parameter name="verbosity" value="2"/>
         +-->
     <entity-resolver id="entity-resolver" logger="core.entity-resolver">
  -   <parameter name="catalog" value="WEB-INF/entities/catalog"/>
  -   <parameter name="verbosity" value="1"/>
  +    <parameter name="catalog" value="WEB-INF/entities/catalog"/>
  +    <parameter name="verbosity" value="1"/>
     </entity-resolver>
   
  +<!-- =================== Sitemap Input/Output Modules ====================== -->
  +
  +  <!--+
  +      | InputModules are a replacement to reading values directly
  +      | e.g. from request parameters. By using this abstraction and
  +      | indirection, other components can be more generic and changes
  +      | to the application logic are easier.
  +      |
  +      | A number of components already use InputModules: the sitemap processor, 
  +      | flow, some matchers, the linkrewriting transformer, database actions
  +      | and more.
  +      |
  +      | For example the sitemap processor allows to obtain a value
  +      | named "foo" from an the InputModule for request parameters by
  +      | writing {request-param:foo} wherever a sitemap variable is
  +      | allowed. 
  +      |
  +      | Some InputModules need the help of other InputModules to
  +      | obtain values and only apply a function to the obtained value
  +      | or change the name of the attribute. These modules usually
  +      | carry "Meta" in their name. An example is the ChainMetaModule
  +      | which tries several other modules in turn until a non-null
  +      | value is obtained or all modules are tied.
  +	  |
  +      | For details and optional configuration parameters refer to the
  +      | accompanying javadocs.
  +      +-->
     <request-param-input 
       id="request-param" 
       logger="core.modules.input" 
  @@ -241,6 +268,16 @@
     <global-variables id="global-variables"/>
     
     <notifying-builder id="notifying" />
  +  
  +  <cache id="cache" />
  +  
  +  <mem-store id="TransientStore" />
  +  
  +  <persistent-store id="persistent-store" />
  +  
  +  <xml-serializer id="xml-serializer"/>
  +  
  +  <xml-deserializer id="xml-deserializer"/>
     
   <!-- TODO: entries below are still 2.1 configuration -->