Return-Path: 
 <cocoon-cvs-return-7696-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 50336 invoked by uid 500); 1 Jul 2002 08:21:10 -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 50326 invoked by uid 500); 1 Jul 2002 08:21:10 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 1 Jul 2002 08:21:09 -0000
Message-ID: <20020701082109.13627.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/src/webapp/WEB-INF cocoon.xconf
X-Spam-Rating: 209.66.108.5 1.6.2 0/1000/N

cziegeler    2002/07/01 01:21:09

  Modified:    src/documentation/xdocs/installing updating.xml
               src/java/org/apache/cocoon cocoon.roles
               src/java/org/apache/cocoon/components/pipeline
                        AbstractProcessingPipeline.java
               src/webapp/WEB-INF cocoon.xconf
  Removed:     src/java/org/apache/cocoon/components/saxconnector
                        LoggingSAXConnector.java SAXConnector.java
  Log:
  Removed SAXConnectors
  
  Revision  Changes    Path
  1.7       +6 -2      xml-cocoon2/src/documentation/xdocs/installing/updating.xml
  
  Index: updating.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/updating.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- updating.xml	25 Jun 2002 14:04:58 -0000	1.6
  +++ updating.xml	1 Jul 2002 08:21:09 -0000	1.7
  @@ -72,14 +72,16 @@
          PERSISTENT_STORE and TRANSIENT_STORE. The hold() method has been removed
          from the Store interface.</p>
     </s2>
  -  <s2 title="Stream and Event Pipeline">
  +  <s2 title="SAXConnectors, Stream and Event Pipeline">
       <p>This is the only real incompatible change (But don't panic, this will
          not affect you, well at least only a little bit :). The internal architecture of Cocoon
          has changed. In the older version, the processing pipeline - constructed by
          a generator, the transformers and a serializer - was represented by two components,
          called stream and event pipeline.</p>
       <p>For a simpler architecture, enhanced functionality and improved performance,
  -       these components have been combined into one: the processing pipeline.</p>
  +       these components have been combined into one: the processing pipeline.
  +       The very rarely used feature of SAXConnectors has been removed,
  +       to avoid overcomponentization.</p>
       <p>In addition the map:pipeline element of the sitemap has gained more meaning
         as it is now possible to configure each map:pipeline section in the sitemap
         differently. So there can be one section using caching, another one not 
  @@ -128,6 +130,8 @@
          component. If you omit the type attribute the default configuration from the components
          section is used.
        </p>
  +     <p>The SAXConnectors have been removed, so if you manually upgrade you have to remove
  +        the <em>sax-connectors</em> configuration from the <em>cocoon.xconf</em>.</p>
        <p>So you see, although this is an incompatible change in the Java code, you have only
          little to do to update your Cocoon installation.</p>
       </s3>
  
  
  
  1.32      +0 -3      xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- cocoon.roles	25 Jun 2002 14:04:58 -0000	1.31
  +++ cocoon.roles	1 Jul 2002 08:21:09 -0000	1.32
  @@ -139,9 +139,6 @@
           shorthand="cache"
           default-class="org.apache.cocoon.caching.impl.CacheImpl"/>
   
  -  <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
  -        shorthand="sax-connector"/>
  -
     <!-- Lucene Components -->
     <role name="org.apache.cocoon.components.search.LuceneCocoonIndexer"
       shorthand="cocoon-indexer"
  
  
  
  1.16      +4 -37     xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
  
  Index: AbstractProcessingPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractProcessingPipeline.java	29 May 2002 09:12:04 -0000	1.15
  +++ AbstractProcessingPipeline.java	1 Jul 2002 08:21:09 -0000	1.16
  @@ -63,7 +63,6 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.CocoonComponentManager;
   import org.apache.cocoon.components.pipeline.OutputComponentSelector;
  -import org.apache.cocoon.components.saxconnector.SAXConnector;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Response;
  @@ -124,15 +123,9 @@
        */
       protected XMLConsumer lastConsumer;
   
  -    // The SAX Connectors
  -    protected ArrayList connectors = new ArrayList();
  -
       /** the component manager set with compose() */
       protected ComponentManager manager;
   
  -    /** is a SAXConnector configured? */
  -    protected boolean configuredSAXConnector;
  -
       /** the component manager set with compose() and recompose() */
       protected ComponentManager newManager;
   
  @@ -154,8 +147,6 @@
       public void compose (ComponentManager manager)
       throws ComponentException {
           this.manager = manager;
  -        // cache this test for a little bit performance
  -        this.configuredSAXConnector = this.manager.hasComponent(SAXConnector.ROLE);
           this.newManager = manager;
       }
   
  @@ -424,25 +415,9 @@
                              XMLProducer producer,
                              XMLConsumer consumer)
       throws ProcessingException {
  -        try {
  -            XMLProducer next = producer;
  -            if (this.configuredSAXConnector) {
  -                // connect SAXConnector
  -                SAXConnector connect = (SAXConnector) this.manager.lookup(SAXConnector.ROLE);
  -                this.connectors.add(connect);
  -                connect.setup(environment, environment.getObjectModel(), null, null);
  -                next.setConsumer( connect );
  -                next = connect;
  -            }
  -            // Connect next component.
  -            next.setConsumer(consumer);
  -        } catch ( IOException e ) {
  -            throw new ProcessingException("Could not connect pipeline.", e);
  -        } catch ( SAXException e ) {
  -            throw new ProcessingException("Could not connect pipeline.", e);
  -        } catch ( ComponentException e ) {
  -            throw new ProcessingException("Could not connect pipeline.", e);
  -        }
  +        XMLProducer next = producer;
  +        // Connect next component.
  +        next.setConsumer(consumer);
       }
   
       /**
  @@ -638,14 +613,6 @@
               this.serializerParam = null;
           }
           this.serializer = null;
  -
  -        // Release connectors
  -        Iterator itc = this.connectors.iterator();
  -        while ( itc.hasNext() ) {
  -            this.manager.release((Component) itc.next());
  -        }
  -        this.connectors.clear();
  -
           this.parameters = null;
       }
   
  
  
  
  1.27      +0 -8      xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- cocoon.xconf	30 Jun 2002 17:00:44 -0000	1.26
  +++ cocoon.xconf	1 Jul 2002 08:21:09 -0000	1.27
  @@ -454,14 +454,6 @@
   
     <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter" logger="core.xml-deserializer" pool-grow="4" pool-max="32" pool-min="8"/>
   
  -  <!-- SAXConnector:
  -    Connects the various pipeline components.
  -    LoggingSAXConnector logs SAX events between pipeline components
  -    into cocoon's log file.
  -    Uncomment one of the following lines for using the SAXConnector.
  -  <sax-connector class="org.apache.cocoon.components.saxconnector.LoggingSAXConnector"/>
  -  -->
  -
     <!-- Profiler:
       The profiler facilitates the gathering of statistics about timings of
       different steps of pipelines. Profiler consists of several components:
  
  
  

----------------------------------------------------------------------
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