Return-Path: 
 <cocoon-cvs-return-1827-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 99536 invoked by uid 500); 5 Apr 2001 15:18:45 -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 99462 invoked by uid 1152); 5 Apr 2001 15:18:44 -0000
Date: 5 Apr 2001 15:18:44 -0000
Message-ID: <20010405151844.99458.qmail@apache.org>
From: bloritsch@apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit: xml-cocoon/webapp cocoon.xconf

bloritsch    01/04/05 08:18:44

  Modified:    src/org/apache/cocoon Tag: xml-cocoon2 Roles.java
               src/org/apache/cocoon/util Tag: xml-cocoon2 RoleUtils.java
               webapp   Tag: xml-cocoon2 cocoon.xconf
  Log:
  Added convenience Role system and default implemenation.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.10  +4 -1      xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
  
  Index: Roles.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Roles.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- Roles.java	2001/03/03 15:58:47	1.1.2.9
  +++ Roles.java	2001/04/05 15:18:42	1.1.2.10
  @@ -12,7 +12,7 @@
    * Created this interface to specify the Avalon role names.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/03/03 15:58:47 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/05 15:18:42 $
    */
   
   public interface Roles {
  @@ -40,4 +40,7 @@
       String TRANSFORMERS         = "org.apache.cocoon.transformation.TransformerSelector";
       String SERIALIZERS          = "org.apache.cocoon.serialization.SerializerSelector";
       String READERS              = "org.apache.cocoon.reading.ReaderSelector";
  +
  +    String EVENT_PIPELINE       = "org.apache.cocoon.components.pipeline.EventPipeline";
  +    String STREAM_PIPELINE      = "org.apache.cocoon.components.pipeline.StreamPipeline";
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +5 -1      xml-cocoon/src/org/apache/cocoon/util/Attic/RoleUtils.java
  
  Index: RoleUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/RoleUtils.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- RoleUtils.java	2001/03/12 05:18:09	1.1.2.13
  +++ RoleUtils.java	2001/04/05 15:18:43	1.1.2.14
  @@ -19,7 +19,7 @@
    * role aliases and the real Avalon role names.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/12 05:18:09 $
  + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/05 15:18:43 $
    */
   
   public class RoleUtils {
  @@ -43,6 +43,8 @@
           setup.put("image-encoder", Roles.IMAGE_ENCODER);
           setup.put("datasources", Roles.DB_CONNECTION);
           setup.put("url-factory", Roles.URL_FACTORY);
  +        setup.put("event-pipeline", Roles.EVENT_PIPELINE);
  +        setup.put("stream-pipeline", Roles.STREAM_PIPELINE);
   
           shorthand = Collections.unmodifiableMap(setup);
   
  @@ -67,6 +69,8 @@
           setup.put(Roles.TRANSFORMERS, "org.apache.cocoon.components.CocoonComponentSelector");
           setup.put(Roles.SERIALIZERS, "org.apache.cocoon.sitemap.SitemapComponentSelector");
           setup.put(Roles.READERS, "org.apache.cocoon.sitemap.SitemapComponentSelector");
  +        setup.put(Roles.EVENT_PIPELINE, "org.apache.cocoon.components.pipeline.NonCachingEventPipeline");
  +        setup.put(Roles.STREAM_PIPELINE, "org.apache.cocoon.components.pipeline.NonCachingStreamPipeline");
   
           classname = Collections.unmodifiableMap(setup);
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.28  +2 -4      xml-cocoon/webapp/Attic/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
  retrieving revision 1.1.2.27
  retrieving revision 1.1.2.28
  diff -u -r1.1.2.27 -r1.1.2.28
  --- cocoon.xconf	2001/04/04 15:42:48	1.1.2.27
  +++ cocoon.xconf	2001/04/05 15:18:43	1.1.2.28
  @@ -90,11 +90,9 @@
   
     <sax-connector class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
   
  -  <component role="org.apache.cocoon.components.pipeline.StreamPipeline"
  -            class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
  +  <stream-pipeline class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
   
  -  <component role="org.apache.cocoon.components.pipeline.EventPipeline"
  -            class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
  +  <event-pipeline class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
   
     <sitemap file="sitemap.xmap"/>
   </cocoon>
  
  
  

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