joerg 2004/07/17 03:51:15
Modified: src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
src/java/org/apache/cocoon/components
ExtendedComponentSelector.java
src/java/org/apache/cocoon/components/treeprocessor
AbstractProcessingNodeBuilder.java
InvokeContext.java DefaultTreeBuilder.java
src/java/org/apache/cocoon/components/container
ComponentLocatorImpl.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
SelectNode.java SwitchSelectNode.java FlowNode.java
src/java/org/apache/cocoon Processor.java
src/java/org/apache/cocoon/components/pipeline/impl
CachingPointProcessingPipeline.java
Log:
clean up after the tree processor refactoring
Revision Changes Path
1.27 +2 -2
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AbstractProcessingPipeline.java 15 Jul 2004 12:49:49 -0000 1.26
+++ AbstractProcessingPipeline.java 17 Jul 2004 10:51:14 -0000 1.27
@@ -650,7 +650,7 @@
for (int i = 0; i < size; i++) {
final ServiceSelector selector =
(ServiceSelector)this.transformerSelectors.get(i);
- selector.release( (Component)this.transformers.get(i) );
+ selector.release(this.transformers.get(i));
this.newManager.release( selector );
}
this.transformerSelectors.clear();
1.12 +1 -5
cocoon-2.1/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java
Index: ExtendedComponentSelector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtendedComponentSelector.java 15 Jul 2004 12:49:49 -0000 1.11
+++ ExtendedComponentSelector.java 17 Jul 2004 10:51:15 -0000 1.12
@@ -16,20 +16,16 @@
package org.apache.cocoon.components;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.component.WrapperComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.WrapperServiceSelector;
import org.apache.cocoon.components.container.ComponentLocatorImpl;
1.8 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
Index: AbstractProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractProcessingNodeBuilder.java 16 Jul 2004 12:36:45 -0000
1.7
+++ AbstractProcessingNodeBuilder.java 17 Jul 2004 10:51:15 -0000
1.8
@@ -20,9 +20,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.cocoon.sitemap.SitemapParameters;
1.12 +2 -3
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InvokeContext.java 15 Jul 2004 12:49:50 -0000 1.11
+++ InvokeContext.java 17 Jul 2004 10:51:15 -0000 1.12
@@ -22,7 +22,6 @@
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -315,7 +314,7 @@
// Release pipelines, if any
if (this.internalPipelineDescription == null &&
this.pipelinesManager != null) {
if ( this.pipelineSelector != null) {
- this.pipelineSelector.release(
(Component)this.processingPipeline);
+ this.pipelineSelector.release(this.processingPipeline);
this.processingPipeline = null;
this.pipelinesManager.release( this.pipelineSelector );
this.pipelineSelector = null;
1.15 +2 -3
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultTreeBuilder.java 16 Jul 2004 12:36:45 -0000 1.14
+++ DefaultTreeBuilder.java 17 Jul 2004 10:51:15 -0000 1.15
@@ -89,7 +89,7 @@
protected ServiceManager parentProcessorManager;
/**
- * Component manager created by [EMAIL PROTECTED]
#createComponentManager(Configuration)}.
+ * Component manager created by [EMAIL PROTECTED]
#createServiceManager(Configuration)}.
*/
protected ServiceManager processorManager;
@@ -473,7 +473,6 @@
);
}
- boolean selectable = selector.isSelectable(type);
this.processorManager.release(selector);
if (!selector.isSelectable(type)) {
1.4 +3 -2
cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentLocatorImpl.java
Index: ComponentLocatorImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentLocatorImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentLocatorImpl.java 14 Jul 2004 19:39:10 -0000 1.3
+++ ComponentLocatorImpl.java 17 Jul 2004 10:51:15 -0000 1.4
@@ -20,7 +20,8 @@
import org.apache.avalon.framework.component.ComponentManager;
/**
- * This object is set to a [EMAIL PROTECTED] ParentAware} component and
allows
+ * FIXME: Javadoc is no longer correct.
+ * This object is set to a ParentAware component and allows
* access to the parent component.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
1.7 +1 -4
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java
Index: SelectNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SelectNode.java 16 Jul 2004 12:36:45 -0000 1.6
+++ SelectNode.java 17 Jul 2004 10:51:15 -0000 1.7
@@ -17,7 +17,6 @@
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
@@ -44,8 +43,6 @@
private VariableResolver[] whenTests;
private ProcessingNode[] otherwhiseNodes;
-
- private ComponentManager manager;
public SelectNode(String name) throws PatternException {
super(Selector.ROLE + "Selector", name);
1.9 +1 -4
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SwitchSelectNode.java
Index: SwitchSelectNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SwitchSelectNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SwitchSelectNode.java 16 Jul 2004 12:36:45 -0000 1.8
+++ SwitchSelectNode.java 17 Jul 2004 10:51:15 -0000 1.9
@@ -17,7 +17,6 @@
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
@@ -45,8 +44,6 @@
private VariableResolver[] whenTests;
private ProcessingNode[] otherwhiseNodes;
-
- private ComponentManager manager;
public SwitchSelectNode(String name) throws PatternException {
super(Selector.ROLE + "Selector", name);
1.7 +3 -4
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNode.java
Index: FlowNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FlowNode.java 15 Jul 2004 12:49:50 -0000 1.6
+++ FlowNode.java 17 Jul 2004 10:51:15 -0000 1.7
@@ -16,7 +16,6 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.service.ServiceException;
@@ -75,8 +74,8 @@
* instance to hold the scripts defined within the
<code><map:flow></code>
* in the sitemap.
*
- * @param manager a <code>ComponentManager</code> value
- * @exception ComponentException if no flow interpreter could be obtained
+ * @param manager a <code>ServiceManager</code> value
+ * @exception ServiceException if no flow interpreter could be obtained
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Processor.java 15 Jul 2004 12:49:49 -0000 1.11
+++ Processor.java 17 Jul 2004 10:51:15 -0000 1.12
@@ -54,7 +54,7 @@
public void release() {
if (this.pipelineSelector != null) {
- this.pipelineSelector.release(
(Component)this.processingPipeline);
+ this.pipelineSelector.release(this.processingPipeline);
this.pipelineManager.release(this.pipelineSelector);
}
this.lastProcessor = null;
1.8 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
Index: CachingPointProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CachingPointProcessingPipeline.java 15 Jul 2004 12:49:50 -0000
1.7
+++ CachingPointProcessingPipeline.java 17 Jul 2004 10:51:15 -0000
1.8
@@ -402,7 +402,7 @@
Iterator itt = this.xmlSerializerArray.iterator();
while (itt.hasNext()) {
- this.manager.release((XMLSerializer) itt.next());
+ this.manager.release(itt.next());
}
this.isCachePoint.clear();
this.xmlSerializerArray.clear();
