You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/01/30 18:16:02 UTC
cvs commit: cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation LexicalTransformer.java ParserTransformer.java ExtendedParserTransformer.java
joerg 2004/01/30 09:16:02
Modified: src/blocks/chaperon/java/org/apache/cocoon/transformation
LexicalTransformer.java ParserTransformer.java
ExtendedParserTransformer.java
Log:
Composable => Serviceable
Revision Changes Path
1.10 +15 -15 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
Index: LexicalTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LexicalTransformer.java 20 Jan 2004 15:23:57 -0000 1.9
+++ LexicalTransformer.java 30 Jan 2004 17:16:01 -0000 1.10
@@ -59,14 +59,14 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+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.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -115,16 +115,15 @@
* @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
* @version CVS $Id$
*/
-public class LexicalTransformer extends LexicalProcessor implements Transformer, LogEnabled,
- Composable, Recyclable,
- Disposable, Parameterizable,
- CacheableProcessingComponent
+public class LexicalTransformer extends LexicalProcessor
+ implements Transformer, LogEnabled, Serviceable, Recyclable, Disposable,
+ Parameterizable, CacheableProcessingComponent
{
private XMLConsumer consumer = null;
private String lexicon = null;
private Source lexiconSource = null;
private Logger logger = null;
- private ComponentManager manager = null;
+ private ServiceManager manager = null;
private SourceResolver resolver = null;
/**
@@ -141,12 +140,13 @@
}
/**
- * Pass the ComponentManager to the composer. The Composable implementation should use the
- * specified ComponentManager to acquire the components it needs for execution.
+ * Pass the ServiceManager to the object. The Serviceable implementation
+ * should use the specified ServiceManager to acquire the services it needs
+ * for execution.
*
- * @param manager The ComponentManager which this Composable uses.
+ * @param manager The ServiceManager which this Serviceable uses.
*/
- public void compose(ComponentManager manager)
+ public void service(ServiceManager manager)
{
this.manager = manager;
}
@@ -242,9 +242,9 @@
{
throw new ProcessingException("Error during resolving of '"+src+"'.", se);
}
- catch (ComponentException ce)
+ catch (ServiceException se)
{
- throw new ProcessingException("Could not lookup for component", ce);
+ throw new ProcessingException("Could not lookup for service", se);
}
finally
{
1.10 +14 -15 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
Index: ParserTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParserTransformer.java 20 Jan 2004 15:23:57 -0000 1.9
+++ ParserTransformer.java 30 Jan 2004 17:16:01 -0000 1.10
@@ -59,14 +59,14 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+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.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -115,16 +115,15 @@
* @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
* @version CVS $Id$
*/
-public class ParserTransformer extends ParserProcessor implements Transformer, LogEnabled,
- Composable, Parameterizable,
- Recyclable, Disposable,
- CacheableProcessingComponent
+public class ParserTransformer extends ParserProcessor
+ implements Transformer, LogEnabled, Serviceable, Parameterizable,
+ Recyclable, Disposable, CacheableProcessingComponent
{
private XMLConsumer consumer = null;
private String grammar = null;
private Source grammarSource = null;
private Logger logger = null;
- private ComponentManager manager = null;
+ private ServiceManager manager = null;
private SourceResolver resolver = null;
/**
@@ -142,12 +141,12 @@
}
/**
- * Pass the ComponentManager to the composer. The Composable implementation should use the
- * specified ComponentManager to acquire the components it needs for execution.
+ * Pass the ServiceManager to the object. The Serviceable implementation should use the
+ * specified ServiceManager to acquire the services it needs for execution.
*
- * @param manager The ComponentManager which this Composable uses.
+ * @param manager The ServiceManager which this Serviceable uses.
*/
- public void compose(ComponentManager manager)
+ public void service(ServiceManager manager)
{
this.manager = manager;
}
@@ -251,9 +250,9 @@
{
throw new ProcessingException("Error during resolving of '"+src+"'.", se);
}
- catch (ComponentException ce)
+ catch (ServiceException se)
{
- throw new ProcessingException("Could not lookup for component", ce);
+ throw new ProcessingException("Could not lookup for service", se);
}
finally
{
1.3 +15 -18 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java
Index: ExtendedParserTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtendedParserTransformer.java 22 Jan 2004 13:24:53 -0000 1.2
+++ ExtendedParserTransformer.java 30 Jan 2004 17:16:01 -0000 1.3
@@ -56,14 +56,14 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+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.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -93,19 +93,15 @@
* @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
* @version CVS $Id$
*/
-public class ExtendedParserTransformer extends ExtendedDirectParserProcessor implements Transformer,
- LogEnabled,
- Composable,
- Parameterizable,
- Recyclable,
- Disposable,
- CacheableProcessingComponent
+public class ExtendedParserTransformer extends ExtendedDirectParserProcessor
+ implements Transformer, LogEnabled, Serviceable, Parameterizable,
+ Recyclable, Disposable, CacheableProcessingComponent
{
private XMLConsumer consumer = null;
private String grammar = null;
private Source grammarSource = null;
private Logger logger = null;
- private ComponentManager manager = null;
+ private ServiceManager manager = null;
private SourceResolver resolver = null;
/**
@@ -122,12 +118,13 @@
}
/**
- * Pass the ComponentManager to the composer. The Composable implementation should use the
- * specified ComponentManager to acquire the components it needs for execution.
+ * Pass the ServiceManager to the object. The Serviceable implementation
+ * should use the specified ServiceManager to acquire the services it needs
+ * for execution.
*
- * @param manager The ComponentManager which this Composable uses.
+ * @param manager The ServiceManager which this Serviceable uses.
*/
- public void compose(ComponentManager manager)
+ public void service(ServiceManager manager)
{
this.manager = manager;
}
@@ -235,9 +232,9 @@
{
throw new ProcessingException("Error during resolving of '"+src+"'.", se);
}
- catch (ComponentException ce)
+ catch (ServiceException se)
{
- throw new ProcessingException("Could not lookup for component", ce);
+ throw new ProcessingException("Could not lookup for service", se);
}
finally
{