cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/sitemap sitemap.roles
Date Thu, 19 Jul 2001 14:54:03 GMT
vgritsenko    01/07/19 07:54:03

  Modified:    src/org/apache/cocoon/components/pipeline
                        AbstractEventPipeline.java
               src/org/apache/cocoon/sitemap sitemap.roles
  Log:
  Remove NullSAXConnector
  
  Revision  Changes    Path
  1.13      +3 -8      xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
  
  Index: AbstractEventPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AbstractEventPipeline.java	2001/07/09 13:19:51	1.12
  +++ AbstractEventPipeline.java	2001/07/19 14:54:03	1.13
  @@ -19,7 +19,6 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.saxconnector.SAXConnector;
  -import org.apache.cocoon.components.saxconnector.NullSAXConnector;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.generation.Generator;
   import org.apache.cocoon.sitemap.ErrorNotifier;
  @@ -32,7 +31,7 @@
   /**
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.12 $ $Date: 2001/07/09 13:19:51 $
  + * @version CVS $Revision: 1.13 $ $Date: 2001/07/19 14:54:03 $
    */
   public abstract class AbstractEventPipeline
   extends AbstractXMLProducer
  @@ -59,14 +58,10 @@
           this.manager = manager;
           generatorSelector = (ComponentSelector) this.manager.lookup(Generator.ROLE + "Selector");
           transformerSelector = (ComponentSelector) this.manager.lookup(Transformer.ROLE
+ "Selector");
  -        Component saxConnector = null;
           this.configuredSAXConnector = false;
           try {
  -            saxConnector = this.manager.lookup(SAXConnector.ROLE);
  -            // FIXME (CZ) remove the NullSAXConnector test when it is an optional
  -            //            configuration
  -            this.configuredSAXConnector = !(saxConnector instanceof NullSAXConnector);
  -            this.manager.release(saxConnector);
  +            this.manager.release(this.manager.lookup(SAXConnector.ROLE));
  +            this.configuredSAXConnector = true;
           } catch (ComponentException ignore) {}
       }
   
  
  
  
  1.4       +1 -2      xml-cocoon2/src/org/apache/cocoon/sitemap/sitemap.roles
  
  Index: sitemap.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/sitemap.roles,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.roles	2001/06/14 10:47:40	1.3
  +++ sitemap.roles	2001/07/19 14:54:03	1.4
  @@ -10,8 +10,7 @@
          default-class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
   
    <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
  -       shorthand="sax-connector"
  -       default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
  +       shorthand="sax-connector"/>
   
    <role name="org.apache.cocoon.acting.ActionSelector"
          shorthand="action"
  
  
  

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


Mime
View raw message