cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/webapp sitemap.xmap
Date Mon, 27 May 2002 12:43:22 GMT
cziegeler    02/05/27 05:43:22

  Modified:    src/java/org/apache/cocoon cocoon.roles
               src/java/org/apache/cocoon/components/treeprocessor
                        InvokeContext.java treeprocessor-builtins.xml
               src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        PipelineNode.java
               src/webapp sitemap.xmap
  Log:
  Added configuration of pipelines to sitemap and fixed bugs
  
  Revision  Changes    Path
  1.29      +4 -0      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- cocoon.roles	19 May 2002 19:19:38 -0000	1.28
  +++ cocoon.roles	27 May 2002 12:43:22 -0000	1.29
  @@ -196,6 +196,10 @@
           shorthand="readers"
           default-class="org.apache.cocoon.sitemap.DefaultSitemapComponentSelector"/>
   
  +  <role name="org.apache.cocoon.components.pipeline.ProcessingPipelineSelector"
  +        shorthand="pipelines"
  +        default-class="org.apache.cocoon.sitemap.DefaultSitemapComponentSelector"/>
  +
     <!-- input / output / database modules -->
   
     <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
  
  
  
  1.7       +8 -4      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
  
  Index: InvokeContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- InvokeContext.java	27 May 2002 12:24:08 -0000	1.6
  +++ InvokeContext.java	27 May 2002 12:43:22 -0000	1.7
  @@ -78,7 +78,7 @@
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: InvokeContext.java,v 1.6 2002/05/27 12:24:08 cziegeler Exp $
  + * @version CVS $Id: InvokeContext.java,v 1.7 2002/05/27 12:43:22 cziegeler Exp $
    */
   
   public class InvokeContext implements Recomposable, Disposable, Loggable {
  @@ -207,17 +207,21 @@
       public ProcessingPipeline getProcessingPipeline()
       throws Exception {
           if (this.processingPipeline == null) {
  +            // Keep current manager for proper release
  +            this.pipelinesManager = this.currentManager;
  +
               this.pipelineSelector = (ComponentSelector)this.pipelinesManager.lookup(ProcessingPipeline.ROLE+"Selector");
               this.processingPipeline = (ProcessingPipeline)this.pipelineSelector.select(this.processingPipelineName);
               this.processingPipeline.recompose( this.pipelinesManager );
  -            // FIXME - setup pipeline
  -            // this.processingPipeline.setup( this.processingPipelineParameters );
  +            this.processingPipeline.setup(
  +                  MapStackResolver.buildParameters(this.processingPipelineParameters,
  +                                                   this.getMapStack())
  +            );
           }
           return this.processingPipeline;
       }
   
       private final void setupPipelines() throws Exception {
  -
           // Keep current manager for proper release
           this.pipelinesManager = this.currentManager;
   
  
  
  
  1.4       +4 -0      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml
  
  Index: treeprocessor-builtins.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- treeprocessor-builtins.xml	19 May 2002 19:19:39 -0000	1.3
  +++ treeprocessor-builtins.xml	27 May 2002 12:43:22 -0000	1.4
  @@ -29,6 +29,10 @@
               shorthand="selectors"
               default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
         
  +      <role name="org.apache.cocoon.components.pipeline.ProcessingPipelineSelector"
  +            shorthand="pipelines"
  +            default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
  +
         <role name="org.apache.cocoon.matching.MatcherSelector"
               shorthand="matchers"
               default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector">
  
  
  
  1.6       +2 -2      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
  
  Index: PipelineNode.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PipelineNode.java	27 May 2002 10:52:09 -0000	1.5
  +++ PipelineNode.java	27 May 2002 12:43:22 -0000	1.6
  @@ -79,7 +79,7 @@
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @author <a href="mailto:gianugo@apache.org">Gianugo Rabellino</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: PipelineNode.java,v 1.5 2002/05/27 10:52:09 cziegeler Exp $
  + * @version CVS $Id: PipelineNode.java,v 1.6 2002/05/27 12:43:22 cziegeler Exp $
    */
   public class PipelineNode
       extends AbstractParentProcessingNode
  @@ -115,7 +115,7 @@
        */
       public PipelineNode(Configuration config) {
           this.expires = config.getAttribute("expires", null);
  -        this.processingPipeline = config.getAttribute("name", null);
  +        this.processingPipeline = config.getAttribute("type", null);
       }
   
       /**
  
  
  
  1.56      +9 -0      xml-cocoon2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- sitemap.xmap	24 May 2002 14:55:37 -0000	1.55
  +++ sitemap.xmap	27 May 2002 12:43:22 -0000	1.56
  @@ -311,6 +311,15 @@
      <map:action logger="sitemap.action.set-header" name="set-header" src="org.apache.cocoon.acting.HttpHeaderAction"/>
   
     </map:actions>
  +
  +  <!--
  +     The different pipeline implementations
  +  -->
  +  <map:pipelines default="caching">
  +     <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  +     <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  +  </map:pipelines>
  +
    </map:components>
   
   <!-- =========================== Views =================================== -->
  
  
  

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