You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/06/02 22:11:35 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java ProcessingPipeline.java
cziegeler 2004/06/02 13:11:35
Modified: src/java/org/apache/cocoon Processor.java
src/java/org/apache/cocoon/components/treeprocessor
InvokeContext.java
src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
ProcessingPipeline.java
Log:
Make interface free from Avalon.
Revision Changes Path
1.10 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Processor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Processor.java 26 May 2004 01:31:06 -0000 1.9
+++ Processor.java 2 Jun 2004 20:11:35 -0000 1.10
@@ -54,7 +54,7 @@
public void release() {
if (this.pipelineSelector != null) {
- this.pipelineSelector.release(this.processingPipeline);
+ this.pipelineSelector.release( (Component)this.processingPipeline);
this.pipelineManager.release(this.pipelineSelector);
}
this.lastProcessor = null;
1.8 +5 -4 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
Index: InvokeContext.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InvokeContext.java 25 May 2004 13:31:06 -0000 1.7
+++ InvokeContext.java 2 Jun 2004 20:11:35 -0000 1.8
@@ -16,6 +16,7 @@
package org.apache.cocoon.components.treeprocessor;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
@@ -125,7 +126,7 @@
this.currentManager = manager;
if (this.processingPipeline != null) {
- this.processingPipeline.recompose(manager);
+ ((Recomposable)this.processingPipeline).recompose(manager);
}
}
@@ -151,7 +152,7 @@
this.pipelineSelector = (ComponentSelector)this.pipelinesManager.lookup(ProcessingPipeline.ROLE+"Selector");
this.processingPipeline = (ProcessingPipeline)this.pipelineSelector.select(this.processingPipelineName);
- this.processingPipeline.recompose( this.pipelinesManager );
+ ((Recomposable)this.processingPipeline).recompose( this.pipelinesManager );
this.processingPipeline.setup(
VariableResolver.buildParameters(this.processingPipelineParameters,
this, this.processingPipelineObjectModel)
@@ -315,7 +316,7 @@
// Release pipelines, if any
if (this.internalPipelineDescription == null && this.pipelinesManager != null) {
if ( this.pipelineSelector != null) {
- this.pipelineSelector.release(this.processingPipeline);
+ this.pipelineSelector.release( (Component)this.processingPipeline);
this.processingPipeline = null;
this.pipelinesManager.release( this.pipelineSelector );
this.pipelineSelector = null;
1.24 +6 -3 cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractProcessingPipeline.java 25 May 2004 07:28:25 -0000 1.23
+++ AbstractProcessingPipeline.java 2 Jun 2004 20:11:35 -0000 1.24
@@ -20,6 +20,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -52,14 +53,16 @@
/**
* This is the base for all implementations of a <code>ProcessingPipeline</code>.
- *
+ * It is advisable to inherit from this base class instead of doing a complete
+ * own implementation!
+ *
* @since 2.1
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* @version CVS $Id$
*/
public abstract class AbstractProcessingPipeline
extends AbstractLogEnabled
- implements ProcessingPipeline, Parameterizable, Recyclable {
+ implements ProcessingPipeline, Parameterizable, Recyclable, Recomposable, Component {
// Generator stuff
protected Generator generator;
1.6 +3 -6 cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
Index: ProcessingPipeline.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessingPipeline.java 25 May 2004 07:28:25 -0000 1.5
+++ ProcessingPipeline.java 2 Jun 2004 20:11:35 -0000 1.6
@@ -15,8 +15,6 @@
*/
package org.apache.cocoon.components.pipeline;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
@@ -38,7 +36,7 @@
*
* <p>
* A <code>ProcessingPipeline</code> is <code>Recomposable</code> since the
- * <code>ComponentManager</code> used to get the generato, transformers etc.
+ * <code>ComponentManager</code> used to get the generator, transformers etc.
* depends on the pipeline assembly engine where they are defined (i.e. a given
* sitemap file).
*
@@ -46,8 +44,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @version CVS $Id$
*/
-public interface ProcessingPipeline
- extends Component, Recomposable {
+public interface ProcessingPipeline {
String ROLE = ProcessingPipeline.class.getName();