cziegeler 2003/10/15 14:02:24
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
PipelinesNodeBuilder.java PipelinesNode.java
src/java/org/apache/cocoon/environment
ForwardRedirector.java
Log:
Cleaning up code
Revision Changes Path
1.4 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java
Index: PipelinesNodeBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipelinesNodeBuilder.java 10 Jul 2003 13:17:00 -0000 1.3
+++ PipelinesNodeBuilder.java 15 Oct 2003 21:02:24 -0000 1.4
@@ -80,7 +80,7 @@
this.checkNamespace(child);
this.treeBuilder.getProcessor().setComponentConfigurations(child);
}
- PipelinesNode node = new
PipelinesNode(this.treeBuilder.getProcessor());
+ PipelinesNode node = new PipelinesNode();
this.treeBuilder.setupNode(node, config);
Configuration[] childConfigs = config.getChildren();
1.5 +3 -9
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
Index: PipelinesNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/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 21:02:24 -0000 1.5
@@ -56,7 +56,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.Processor;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.SimpleParentProcessingNode;
@@ -83,16 +82,12 @@
private ErrorHandlerHelper errorHandlerHelper = new
ErrorHandlerHelper();
- private Processor processor;
-
private ProcessingNode errorHandler;
/**
* Constructor
- * @param processor The processor for this sitemap
*/
- public PipelinesNode(Processor processor) {
- this.processor = processor;
+ public PipelinesNode() {
}
/**
@@ -142,8 +137,7 @@
context.recompose(this.manager);
// Build a redirector
- ForwardRedirector redirector = new ForwardRedirector(
- env, this.processor, this.manager,
context.isBuildingPipelineOnly());
+ ForwardRedirector redirector = new ForwardRedirector(env);
this.setupLogger(redirector);
Map objectModel = env.getObjectModel();
1.8 +2 -21
cocoon-2.1/src/java/org/apache/cocoon/environment/ForwardRedirector.java
Index: ForwardRedirector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/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 21:02:24 -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,8 @@
/** 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) {
+ public ForwardRedirector(Environment env) {
this.env = env;
- this.processor = processor;
- this.manager = manager;
- this.internal = internal;
}
/**
