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/02/06 23:56:46 UTC
cvs commit: cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/transformation TagTransformer.java
joerg 2004/02/06 14:56:46
Modified: src/blocks/taglib/java/org/apache/cocoon/taglib
VarTagSupport.java
src/blocks/taglib/java/org/apache/cocoon/transformation
TagTransformer.java
Log:
Composable => Serviceable
Revision Changes Path
1.5 +13 -13 cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/VarTagSupport.java
Index: VarTagSupport.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/VarTagSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VarTagSupport.java 5 Feb 2004 10:47:24 -0000 1.4
+++ VarTagSupport.java 6 Feb 2004 22:56:46 -0000 1.5
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.taglib;
-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.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.jxpath.JXPathCocoonContexts;
@@ -66,9 +66,9 @@
* @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
* @version CVS $Id$
*/
-public abstract class VarTagSupport extends TagSupport implements Composable {
+public abstract class VarTagSupport extends TagSupport implements Serviceable {
protected String var;
- protected ComponentManager componentManager;
+ protected ServiceManager manager;
private JXPathCocoonContexts jxpathContexts;
private Request request;
@@ -128,8 +128,8 @@
private final JXPathContext getVariableContext() {
if (jxpathContexts == null) {
try {
- jxpathContexts = (JXPathCocoonContexts) componentManager.lookup(JXPathCocoonContexts.ROLE);
- } catch (ComponentException e) {
+ jxpathContexts = (JXPathCocoonContexts) manager.lookup(JXPathCocoonContexts.ROLE);
+ } catch (ServiceException e) {
//XXX
}
}
@@ -138,16 +138,16 @@
}
/*
- * @see Composable#compose(ComponentManager)
+ * @see Serviceable#service(ServiceManager)
*/
- public void compose(ComponentManager componentManager) throws ComponentException {
- this.componentManager = componentManager;
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
}
public void recycle() {
this.var = null;
- if ( this.componentManager != null ) {
- this.componentManager.release(this.jxpathContexts);
+ if ( this.manager != null ) {
+ this.manager.release(this.jxpathContexts);
}
this.jxpathContexts = null;
this.request = null;
1.5 +22 -22 cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java
Index: TagTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TagTransformer.java 5 Feb 2004 10:47:24 -0000 1.4
+++ TagTransformer.java 6 Feb 2004 22:56:46 -0000 1.5
@@ -63,14 +63,14 @@
import org.apache.commons.collections.map.StaticBucketMap;
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.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
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.ServiceSelector;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.sax.XMLDeserializer;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.environment.SourceResolver;
@@ -91,7 +91,7 @@
*/
public class TagTransformer
extends AbstractXMLProducer
- implements Transformer, Composable, Configurable, Disposable, Recyclable {
+ implements Transformer, Serviceable, Configurable, Disposable, Recyclable {
private int recordingLevel = 0;
private int skipLevel = 0;
@@ -100,8 +100,8 @@
private ArrayStack tagStack = new ArrayStack();
private ArrayStack tagSelectorStack = new ArrayStack();
private ArrayStack tagTransformerStack = new ArrayStack();
- private ComponentSelector tagNamespaceSelector;
- private ComponentSelector transformerSelector;
+ private ServiceSelector tagNamespaceSelector;
+ private ServiceSelector transformerSelector;
private Tag currentTag;
/** current SAX Event Consumer */
private XMLConsumer currentConsumer;
@@ -116,8 +116,8 @@
private Map objectModel;
/** The parameters specified in the sitemap */
private Parameters parameters;
- /** The Avalon ComponentManager */
- private ComponentManager manager;
+ /** The Avalon ServiceManager */
+ private ServiceManager manager;
/** Array for dynamic calling of Tag set property methods */
private String[] paramArray = new String[1];
@@ -147,12 +147,12 @@
}
/**
- * Avalon Composable Interface
- * @param manager The Avalon Component Manager
+ * Avalon Serviceable Interface
+ * @param manager The Avalon Service Manager
*/
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
- tagNamespaceSelector = (ComponentSelector) manager.lookup(Tag.ROLE + "Selector");
+ tagNamespaceSelector = (ServiceSelector) manager.lookup(Tag.ROLE + "Selector");
}
/**
@@ -162,8 +162,8 @@
transformerHint = conf.getChild("transformer-hint").getValue(null);
if (transformerHint != null) {
try {
- transformerSelector = (ComponentSelector) manager.lookup(Transformer.ROLE + "Selector");
- } catch (ComponentException e) {
+ transformerSelector = (ServiceSelector) manager.lookup(Transformer.ROLE + "Selector");
+ } catch (ServiceException e) {
String message = "can't lookup transformer";
getLogger().error(message, e);
throw new ConfigurationException(message, e);
@@ -229,7 +229,7 @@
Tag tag = (Tag) tagStack.pop();
if (tag != null) {
- ComponentSelector tagSelector = (ComponentSelector) tagSelectorStack.pop();
+ ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
try {
if (saxFragment != null) {
//start Iteration
@@ -242,7 +242,7 @@
xmlDeserializer.deserialize(saxFragment);
} while (iterTag.doAfterBody() != Tag.SKIP_BODY);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new SAXException("lookup XMLDeserializer failed", e);
}
finally {
@@ -350,7 +350,7 @@
Tag tag = (Tag) tagStack.pop();
if (tag == null)
continue;
- ComponentSelector tagSelector = (ComponentSelector) tagSelectorStack.pop();
+ ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
tagSelector.release(tag);
tagNamespaceSelector.release(tagSelector);
@@ -459,10 +459,10 @@
Tag tag = null;
if (namespaceURI != null && namespaceURI.length() > 0) {
- ComponentSelector tagSelector = null;
+ ServiceSelector tagSelector = null;
Transformer tagTransformer = null;
try {
- tagSelector = (ComponentSelector) tagNamespaceSelector.select(namespaceURI);
+ tagSelector = (ServiceSelector) tagNamespaceSelector.select(namespaceURI);
tagSelectorStack.push(tagSelector);
// namespace matches tag library, lookup tag now.
@@ -521,7 +521,7 @@
currentConsumerBackup = currentConsumer;
currentConsumer = xmlSerializer;
recordingLevel = 1;
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new SAXException("lookup XMLSerializer failed", e);
}
}