cziegeler 2003/10/30 05:02:31
Modified: src/java/org/apache/cocoon/components/treeprocessor
TreeBuilder.java AbstractProcessingNodeBuilder.java
ProcessingNodeBuilder.java
Log:
Moving to Serviceable
Revision Changes Path
1.5 +1 -3
cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java
Index: TreeBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TreeBuilder.java 24 Oct 2003 21:05:27 -0000 1.4
+++ TreeBuilder.java 30 Oct 2003 13:02:31 -0000 1.5
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -67,7 +66,6 @@
*/
public interface TreeBuilder
- extends Component
{
/**
1.2 +11 -4
cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
Index: AbstractProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractProcessingNodeBuilder.java 9 Mar 2003 00:09:15 -0000
1.1
+++ AbstractProcessingNodeBuilder.java 30 Oct 2003 13:02:31 -0000
1.2
@@ -56,6 +56,9 @@
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;
@@ -70,16 +73,20 @@
public abstract class AbstractProcessingNodeBuilder extends
AbstractLogEnabled
- implements ProcessingNodeBuilder, Recomposable {
+ implements ProcessingNodeBuilder, Recomposable, Serviceable {
protected TreeBuilder treeBuilder;
- protected ComponentManager manager;
+ protected ServiceManager manager;
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
+ public void compose(ComponentManager manager) throws ComponentException {
+
+ }
+
public void recompose(ComponentManager manager) throws
ComponentException {
this.manager = manager;
}
1.2 +2 -3
cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java
Index: ProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessingNodeBuilder.java 9 Mar 2003 00:09:17 -0000 1.1
+++ ProcessingNodeBuilder.java 30 Oct 2003 13:02:31 -0000 1.2
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
/**
@@ -72,7 +71,7 @@
* @version CVS $Id$
*/
-public interface ProcessingNodeBuilder extends Component {
+public interface ProcessingNodeBuilder {
/**
* Set the builder for which we are building.
