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.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap PipelinesNode.java
Date Wed, 15 Oct 2003 20:57:43 GMT
cziegeler    2003/10/15 13:57:43

  Modified:    src/java/org/apache/cocoon/environment
                        ForwardRedirector.java
               src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        PipelinesNode.java
  Log:
  Cleaning up code
  
  Revision  Changes    Path
  1.8       +1 -19     cocoon-2.2/src/java/org/apache/cocoon/environment/ForwardRedirector.java
  
  Index: ForwardRedirector.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/ForwardRedirector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ForwardRedirector.java	16 Aug 2003 13:42:40 -0000	1.7
  +++ ForwardRedirector.java	15 Oct 2003 20:57:43 -0000	1.8
  @@ -52,10 +52,8 @@
   
   import java.io.IOException;
   
  -import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.Processor;
   import org.apache.cocoon.components.treeprocessor.TreeProcessor;
   import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
   
  @@ -77,25 +75,9 @@
       /** The <code>Environment to use for redirection (either internal or external)
*/
       private Environment env;
   
  -    /** The <code>Processor</code> that owns this redirector and which will
be used
  -        to handle relative "cocoon:/..." redirects */
  -    private Processor processor;
  -
  -    /** The component manager which gives access to the top-level <code>Processor</code>
  -        to handle absolute "cocoon://..." redirects */
  -    private ComponentManager manager;
  -
  -    /** Is this internal*/
  -    private boolean internal;
  -
       public ForwardRedirector(Environment env,
  -                             Processor processor,
  -                             ComponentManager manager,
                                boolean internal) {
           this.env = env;
  -        this.processor = processor;
  -        this.manager = manager;
  -        this.internal = internal;
       }
   
       /**
  
  
  
  1.5       +3 -5      cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
  
  Index: PipelinesNode.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PipelinesNode.java	10 Jul 2003 13:17:00 -0000	1.4
  +++ PipelinesNode.java	15 Oct 2003 20:57:43 -0000	1.5
  @@ -83,8 +83,6 @@
       
   	private ErrorHandlerHelper errorHandlerHelper = new ErrorHandlerHelper();
   
  -    private Processor processor;
  -
   	private ProcessingNode errorHandler;
   
       /**
  @@ -92,7 +90,7 @@
        * @param processor The processor for this sitemap
        */
       public PipelinesNode(Processor processor) {
  -        this.processor = processor;
  +        //this.processor = processor;
       }
   
       /**
  @@ -143,7 +141,7 @@
   
           // Build a redirector
           ForwardRedirector redirector = new ForwardRedirector(
  -            env, this.processor, this.manager, context.isBuildingPipelineOnly());
  +            env, context.isBuildingPipelineOnly());
           this.setupLogger(redirector);
   
           Map objectModel = env.getObjectModel();
  
  
  

Mime
View raw message