cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor DefaultTreeBuilder.java TreeProcessor.java TreeBuilder.java
Date Mon, 28 Jul 2003 12:55:45 GMT
cziegeler    2003/07/28 05:55:45

  Modified:    src/java/org/apache/cocoon/components/treeprocessor
                        DefaultTreeBuilder.java TreeProcessor.java
                        TreeBuilder.java
  Log:
  Fixing wrong component manager usage
  
  Revision  Changes    Path
  1.2       +8 -1      cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
  
  Index: DefaultTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultTreeBuilder.java	9 Mar 2003 00:09:15 -0000	1.1
  +++ DefaultTreeBuilder.java	28 Jul 2003 12:55:45 -0000	1.2
  @@ -454,6 +454,13 @@
       }
   
       /**
  +     * Return the sitemap component manager
  +     */
  +    public ComponentManager getSitemapComponentManager() {
  +        return this.manager;
  +    }
  +    
  +    /**
        * Setup a <code>ProcessingNode</code> by setting its location, calling
all
        * the lifecycle interfaces it implements and giving it the parameter map if
        * it's a <code>ParameterizableNode</code>.
  
  
  
  1.7       +8 -3      cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
  
  Index: TreeProcessor.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TreeProcessor.java	6 Jul 2003 11:44:30 -0000	1.6
  +++ TreeProcessor.java	28 Jul 2003 12:55:45 -0000	1.7
  @@ -157,6 +157,9 @@
       /** The different sitemap component configurations */
       protected Map sitemapComponentConfigurations;
       
  +    /** The component manager for the sitemap */
  +    protected ComponentManager sitemapComponentManager;
  +    
       /**
        * Create a TreeProcessor.
        */
  @@ -320,7 +323,7 @@
           }
   
           // and now process
  -        CocoonComponentManager.enterEnvironment(environment, this.manager, this);
  +        CocoonComponentManager.enterEnvironment(environment, this.sitemapComponentManager,
this);
           try {
               return this.rootNode.invoke(environment, context);
           } finally {
  @@ -339,7 +342,7 @@
   
           context.enableLogging(getLogger());
   
  -        CocoonComponentManager.enterEnvironment(environment, this.manager, this);
  +        CocoonComponentManager.enterEnvironment(environment, this.sitemapComponentManager,
this);
           try {
               if ( process(environment, context) ) {
                   return context.getProcessingPipeline();
  @@ -438,6 +441,8 @@
               }
               root = builder.build(this.source);
   
  +            this.sitemapComponentManager = builder.getSitemapComponentManager();
  +            
               this.disposableNodes = builder.getDisposableNodes();
           } finally {
               this.builderSelector.release(builder);
  
  
  
  1.2       +7 -1      cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java
  
  Index: TreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TreeBuilder.java	9 Mar 2003 00:09:18 -0000	1.1
  +++ TreeBuilder.java	28 Jul 2003 12:55:45 -0000	1.2
  @@ -51,6 +51,7 @@
   package org.apache.cocoon.components.treeprocessor;
   
   import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.excalibur.source.Source;
  @@ -133,4 +134,9 @@
        * @throws ConfigurationException if the default type could not be found.
        */
       String getTypeForStatement(Configuration statement, String role) throws ConfigurationException;
  +
  +    /**
  +     * Return the sitemap component manager
  +     */
  +    ComponentManager getSitemapComponentManager();
   }
  
  
  

Mime
View raw message