Return-Path: 
 <cocoon-cvs-return-3968-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 9964 invoked by uid 500); 9 Nov 2001 07:31:02 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 9955 invoked by uid 500); 9 Nov 2001 07:31:02 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 9 Nov 2001 07:19:09 -0000
Message-ID: <20011109071909.24151.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/webapp cocoon.xconf
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

cziegeler    01/11/08 23:19:09

  Modified:    .        Tag: cocoon_20_branch changes.xml
               src/org/apache/cocoon/components/xslt Tag: cocoon_20_branch
                        XSLTProcessorImpl.java
               webapp   Tag: cocoon_20_branch cocoon.xconf
  Log:
  Appled patch for incremental xslt processor from 2.1 cvs
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.45  +6 -4      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.2.2.44
  retrieving revision 1.2.2.45
  diff -u -r1.2.2.44 -r1.2.2.45
  --- changes.xml	2001/11/07 13:04:31	1.2.2.44
  +++ changes.xml	2001/11/09 07:19:09	1.2.2.45
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.2.2.44 2001/11/07 13:04:31 cziegeler Exp $
  +  $Id: changes.xml,v 1.2.2.45 2001/11/09 07:19:09 cziegeler Exp $
   -->
   
   <changes title="History of Changes">
  @@ -18,6 +18,7 @@
     <person name="Berin Loritsch" email="bloritsch@apache.org" id="BL"/>
     <person name="Stefano Mazzocchi" email="stefano@apache.org" id="SM"/>
     <person name="Giacomo Pati" email="Giacomo.Pati@pwr.ch" id="GP"/>
  +  <person name="Ovidiu Predescu" email="ovidiu@cup.hp.com" id="OP"/>
     <person name="Ricardo Rocha" email="ricardo@apache.org" id="RR"/>
     <person name="Paul Russell" email="prussell@apache.org" id="PR"/>
     <person name="Davanum Srinivas" email="dims@yahoo.com" id="DM"/>
  @@ -26,10 +27,11 @@
    </devs>
   
    <release version="@version@" date="@date@">
  -  <action dev="CZ" type="add">
  -   ADD CHANGES HERE
  +  <action dev="OP" type="update">
  +    Applied patch for incremental XSLT processing from J&ouml;rn Heid
  +    [heid@fh-heilbronn.de].
     </action>
  - </release>
  +  </release>
    <release version="2.0rc2" date="November 7 2001">
     <action dev="SW" type="add">
       Deprecation of CodeFactory in preparation of the tree traversal implementation of the sitemap.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.7   +12 -2     xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
  
  Index: XSLTProcessorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
  retrieving revision 1.4.2.6
  retrieving revision 1.4.2.7
  diff -u -r1.4.2.6 -r1.4.2.7
  --- XSLTProcessorImpl.java	2001/10/15 10:21:07	1.4.2.6
  +++ XSLTProcessorImpl.java	2001/11/09 07:19:09	1.4.2.7
  @@ -86,6 +86,8 @@
   
     /** Is the store turned on? (default is on) */
     boolean useStore = true;
  +  /** Is incremental processing turned on? (default for Xalan: no) */
  +  boolean incrementalProcessing = false;
   
     SourceResolver resolver;
   
  @@ -109,6 +111,7 @@
     {
       Parameters params = Parameters.fromConfiguration(conf);
       useStore = params.getParameterAsBoolean("use-store", true);
  +    incrementalProcessing = params.getParameterAsBoolean("incremental-processing", false);
       
       String factoryName = params.getParameter("transformer-factory", null);
       
  @@ -259,6 +262,13 @@
         }
         tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
         tfactory.setURIResolver(this);
  +      // TODO: If we will support this feature with a different
  +      // transformer than Xalan we'll have to set that corresponding
  +      // feature
  +      if (tfactory.getClass().getName().equals("org.apache.xalan.processor.TransformerFactoryImpl")) {
  +         tfactory.setAttribute("http://xml.apache.org/xalan/features/incremental",
  +                               new Boolean (incrementalProcessing));
  +      }
       }
       return tfactory;
     }
  @@ -360,8 +370,8 @@
               return null; // we can't resolve this
             }
             else {
  -            xslSource = resolver.resolve(base.substring(0, lastPathElementPos)
  -                                         + "/" + href);
  +            xslSource = resolver.resolve(new StringBuffer(base.substring(0, lastPathElementPos))
  +                                         .append("/").append(href).toString());
             }
           }
           else {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.28  +1 -0      xml-cocoon2/webapp/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
  retrieving revision 1.7.2.27
  retrieving revision 1.7.2.28
  diff -u -r1.7.2.27 -r1.7.2.28
  --- cocoon.xconf	2001/11/06 09:55:38	1.7.2.27
  +++ cocoon.xconf	2001/11/09 07:19:09	1.7.2.28
  @@ -124,6 +124,7 @@
     -->
     <xslt-processor class="org.apache.cocoon.components.xslt.XSLTProcessorImpl" logger="root.xslt">
        <parameter name="use-store" value="true"/>
  +     <parameter name="incremental-processing" value="true"/>
     </xslt-processor>
   
     <!-- URL Factory:
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org