cziegeler 2003/10/20 06:36:43
Modified: src/blocks/portal/java/org/apache/cocoon/components/persistence
CastorSourceConverter.java
src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl
DefaultAspectDataHandler.java
RequestAspectDataStore.java
src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl
ApplicationCopletAdapter.java URICopletAdapter.java
AbstractCopletAdapter.java
src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input
CopletModule.java
src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl
FullScreenCopletEventAspect.java
AbstractContentEventAspect.java
src/blocks/portal/java/org/apache/cocoon/components/variables
DefaultVariableResolverFactory.java
PreparedVariableResolver.java
src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl
DefaultCopletFactory.java
src/blocks/portal/java/org/apache/cocoon/portal/event/impl
DefaultEventConverter.java EventAspectChain.java
DefaultEventManager.java
src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl
DefaultChangeAspectDataEventSubscriber.java
Log:
Changing to Serviceable
Revision Changes Path
1.2 +8 -8
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
Index: CastorSourceConverter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CastorSourceConverter.java 21 Aug 2003 06:41:19 -0000 1.1
+++ CastorSourceConverter.java 20 Oct 2003 13:36:41 -0000 1.2
@@ -61,13 +61,13 @@
import org.apache.avalon.framework.activity.Initializable;
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.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.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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.portal.util.ReferenceFieldHandler;
@@ -96,12 +96,12 @@
*/
public class CastorSourceConverter
extends AbstractLogEnabled
- implements Component, Composable, Configurable, Initializable,
ThreadSafe {
+ implements Component, Serviceable, Configurable, Initializable,
ThreadSafe {
public static final String ROLE = CastorSourceConverter.class.getName();
private Map mappingSources = new HashMap();
- private ComponentManager manager;
+ private ServiceManager manager;
private Map mappings = new HashMap();
public Object getObject(InputStream stream, Map parameters) throws
ConverterException {
@@ -133,9 +133,9 @@
}
/* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
1.3 +11 -12
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/DefaultAspectDataHandler.java
Index: DefaultAspectDataHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/DefaultAspectDataHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultAspectDataHandler.java 21 May 2003 13:06:02 -0000 1.2
+++ DefaultAspectDataHandler.java 20 Oct 2003 13:36:41 -0000 1.3
@@ -55,9 +55,8 @@
import java.util.Map;
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.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.portal.aspect.AspectDataHandler;
import org.apache.cocoon.portal.aspect.AspectDataStore;
import org.apache.cocoon.portal.aspect.AspectDescription;
@@ -75,13 +74,13 @@
protected AspectalizableDescription description;
- protected ComponentSelector storeSelector;
+ protected ServiceSelector storeSelector;
/**
* Constructor
*/
public DefaultAspectDataHandler(AspectalizableDescription desc,
- ComponentSelector storeSelector) {
+ ServiceSelector storeSelector) {
this.description = desc;
this.storeSelector = storeSelector;
}
@@ -106,10 +105,10 @@
store.setAspectData( owner, aspectName, data );
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup aspect
data store " + aspectDesc.getStoreName(), ce);
} finally {
- this.storeSelector.release( (Component)store );
+ this.storeSelector.release( store );
}
return data;
@@ -158,10 +157,10 @@
}
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup aspect
data store " + current.getStoreName(), ce);
} finally {
- this.storeSelector.release( (Component)store );
+ this.storeSelector.release( store );
}
}
@@ -183,10 +182,10 @@
try {
store =
(AspectDataStore)this.storeSelector.select(aspectDesc.getStoreName());
store.setAspectData(owner, aspectName, data);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup aspect
data store " + aspectDesc.getStoreName(), ce);
} finally {
- this.storeSelector.release( (Component)store );
+ this.storeSelector.release( store );
}
}
1.5 +14 -14
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/RequestAspectDataStore.java
Index: RequestAspectDataStore.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/RequestAspectDataStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestAspectDataStore.java 28 May 2003 13:47:29 -0000 1.4
+++ RequestAspectDataStore.java 20 Oct 2003 13:36:41 -0000 1.5
@@ -55,9 +55,6 @@
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.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -65,6 +62,9 @@
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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.Request;
@@ -84,14 +84,21 @@
*/
public class RequestAspectDataStore
extends AbstractLogEnabled
- implements Component, Composable, ThreadSafe, AspectDataStore,
Contextualizable, Parameterizable {
+ implements Component, Serviceable, ThreadSafe, AspectDataStore,
Contextualizable, Parameterizable {
protected Context context;
protected String requestParameterName;
- protected ComponentManager manager;
+ protected ServiceManager manager;
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
protected Map getMap(Aspectalizable owner) {
final Request request = ContextHelper.getRequest(this.context);
Map componentMap =
(Map)request.getAttribute(this.getClass().getName());
@@ -127,7 +134,7 @@
try {
service = (LinkService)this.manager.lookup(LinkService.ROLE);
service.addEventToLink( e );
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup link
service.", ce);
} finally {
this.manager.release( service );
@@ -152,13 +159,6 @@
*/
public void parameterize(Parameters pars) throws ParameterException {
requestParameterName = pars.getParameter("parameter-name", null);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager) throws ComponentException {
- this.manager = manager;
}
}
1.2 +3 -4
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java
Index: ApplicationCopletAdapter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationCopletAdapter.java 25 Aug 2003 07:41:18 -0000 1.1
+++ ApplicationCopletAdapter.java 20 Oct 2003 13:36:41 -0000 1.2
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.portal.coplet.adapter.impl;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.portal.application.PortalApplicationConfigFactory;
import org.apache.cocoon.portal.coplet.CopletData;
@@ -171,8 +171,7 @@
newItem.setName(getNewInstanceTabName(tabLayout));
tabLayout.addItem(newItem);
- }
- catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException(
"Unable to lookup profile manager.",
ce);
1.11 +9 -11
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
Index: URICopletAdapter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- URICopletAdapter.java 27 May 2003 14:07:16 -0000 1.10
+++ URICopletAdapter.java 20 Oct 2003 13:36:41 -0000 1.11
@@ -57,8 +57,8 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.portal.Constants;
@@ -89,15 +89,13 @@
/** The source resolver */
protected SourceResolver resolver;
- /**
- * @see
org.apache.avalon.framework.component.Composable#compose(ComponentManager)
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void compose(ComponentManager componentManager)
- throws ComponentException {
- super.compose( componentManager );
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service( manager );
this.resolver =
(SourceResolver)this.manager.lookup(SourceResolver.ROLE);
}
-
public void streamContent(CopletInstanceData coplet, ContentHandler
contentHandler)
throws SAXException {
@@ -147,7 +145,7 @@
throw new SAXException("IOException", ioe);
} catch (ProcessingException pe) {
throw new SAXException("ProcessingException", pe);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("ComponentException", ce);
} finally {
this.resolver.release(copletSource);
@@ -203,7 +201,7 @@
}
list.add(event.getTarget());
service.setTemporaryAttribute(URICopletAdapter.class.getName(),
list);
- } catch (ComponentException ignore ) {
+ } catch (ServiceException ignore ) {
} finally {
this.manager.release(service);
}
1.6 +13 -14
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
Index: AbstractCopletAdapter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractCopletAdapter.java 28 May 2003 13:47:30 -0000 1.5
+++ AbstractCopletAdapter.java 20 Oct 2003 13:36:41 -0000 1.6
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.portal.coplet.adapter.impl;
-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.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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.sax.XMLDeserializer;
import org.apache.cocoon.components.sax.XMLSerializer;
@@ -77,17 +77,16 @@
*/
public abstract class AbstractCopletAdapter
extends AbstractLogEnabled
- implements CopletAdapter, ThreadSafe, Composable {
+ implements CopletAdapter, ThreadSafe, Serviceable {
- /** The component manager */
- protected ComponentManager manager;
+ /** The service manager */
+ protected ServiceManager manager;
- /**
- * @see
org.apache.avalon.framework.component.Composable#compose(ComponentManager)
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void compose(ComponentManager componentManager)
- throws ComponentException {
- this.manager = componentManager;
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
}
/**
@@ -145,7 +144,7 @@
data = serializer.getSAXFragment();
read = true;
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup xml serializer.",
ce);
} catch (Exception exception ) {
this.getLogger().warn("Unable to get content of coplet: " +
coplet.getId(), exception);
@@ -164,7 +163,7 @@
deserializer.setConsumer( new
ContentHandlerWrapper(contentHandler, lh));
}
deserializer.deserialize( data );
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup xml
deserializer.", ce);
} finally {
this.manager.release( deserializer );
1.5 +10 -10
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
Index: CopletModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopletModule.java 18 Jul 2003 14:41:46 -0000 1.4
+++ CopletModule.java 20 Oct 2003 13:36:42 -0000 1.5
@@ -54,11 +54,11 @@
import java.util.Map;
import java.util.Vector;
-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.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -96,17 +96,17 @@
* @version CVS $Id$
*/
public class CopletModule
-implements InputModule, Composable, ThreadSafe {
+implements InputModule, Serviceable, ThreadSafe {
/**
* The component manager.
*/
- private ComponentManager manager;
+ private ServiceManager manager;
- /**
- * Obtains the component manager.
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void compose(ComponentManager manager) {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
@@ -145,7 +145,7 @@
return value.toString();
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new ConfigurationException("ComponentException ", e);
} finally {
this.manager.release(portalService);
1.4 +14 -14
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java
Index: FullScreenCopletEventAspect.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FullScreenCopletEventAspect.java 18 Jul 2003 14:41:45 -0000 1.3
+++ FullScreenCopletEventAspect.java 20 Oct 2003 13:36:42 -0000 1.4
@@ -52,10 +52,10 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-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.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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -81,13 +81,20 @@
extends AbstractLogEnabled
implements EventAspect,
ThreadSafe,
- Composable,
+ Serviceable,
Disposable,
Subscriber,
Initializable {
- protected ComponentManager manager;
+ protected ServiceManager manager;
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
/* (non-Javadoc)
* @see
org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext,
org.apache.cocoon.portal.PortalService)
*/
@@ -138,19 +145,12 @@
try {
portalService = (PortalService)
this.manager.lookup(PortalService.ROLE);
portalService.getComponentManager().getProfileManager().setEntryLayout(
startingLayout );
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
// ignore
} finally {
this.manager.release(portalService);
}
}
- }
-
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager) throws ComponentException {
- this.manager = manager;
}
/* (non-Javadoc)
1.3 +13 -13
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
Index: AbstractContentEventAspect.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractContentEventAspect.java 18 Jul 2003 14:41:45 -0000 1.2
+++ AbstractContentEventAspect.java 20 Oct 2003 13:36:42 -0000 1.3
@@ -52,10 +52,10 @@
import java.util.StringTokenizer;
-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.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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -75,9 +75,16 @@
*/
public abstract class AbstractContentEventAspect
extends AbstractLogEnabled
- implements EventAspect, ThreadSafe, Composable {
+ implements EventAspect, ThreadSafe, Serviceable {
- protected ComponentManager manager;
+ protected ServiceManager manager;
+
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
protected abstract String getRequestParameterName();
@@ -156,13 +163,6 @@
}
// and invoke next one
context.invokeNext(service);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager) throws ComponentException {
- this.manager = manager;
}
}
1.2 +14 -14
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
Index: DefaultVariableResolverFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultVariableResolverFactory.java 10 Jun 2003 19:38:54 -0000
1.1
+++ DefaultVariableResolverFactory.java 20 Oct 2003 13:36:42 -0000
1.2
@@ -52,13 +52,13 @@
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.Composable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.sitemap.PatternException;
@@ -74,11 +74,18 @@
*/
public class DefaultVariableResolverFactory
extends AbstractLogEnabled
- implements ThreadSafe, VariableResolverFactory, Component, Composable,
Contextualizable {
+ implements ThreadSafe, VariableResolverFactory, Component, Serviceable,
Contextualizable {
- protected ComponentManager manager;
- protected Context context;
+ protected ServiceManager manager;
+ protected Context context;
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
/**
* Get a resolver for a given expression. Chooses the most efficient
implementation
* depending on <code>expression</code>.
@@ -128,13 +135,6 @@
}
// Nothing found...
return false;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager) throws ComponentException {
- this.manager = manager;
}
/* (non-Javadoc)
1.3 +12 -12
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreparedVariableResolver.java 4 Aug 2003 03:06:30 -0000 1.2
+++ PreparedVariableResolver.java 20 Oct 2003 13:36:42 -0000 1.3
@@ -53,11 +53,11 @@
import java.util.ArrayList;
import java.util.List;
-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.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
+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.thread.ThreadSafe;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.modules.input.InputModule;
@@ -74,8 +74,8 @@
public class PreparedVariableResolver
extends NOPVariableResolver {
- protected ComponentManager manager;
- protected ComponentSelector selector;
+ protected ServiceManager manager;
+ protected ServiceSelector selector;
protected Context context;
protected List items = new ArrayList();
@@ -89,7 +89,7 @@
private static final Integer THREADSAFE_MODULE_OBJ = new
Integer(THREADSAFE_MODULE);
private static final Integer STATEFUL_MODULE_OBJ = new
Integer(STATEFUL_MODULE);
- public PreparedVariableResolver(String expr, ComponentManager manager,
Context context)
+ public PreparedVariableResolver(String expr, ServiceManager manager,
Context context)
throws PatternException {
super(null);
@@ -156,8 +156,8 @@
if (this.selector == null) {
try {
// First access to a module : lookup selector
- this.selector =
(ComponentSelector)this.manager.lookup(InputModule.ROLE + "Selector");
- } catch(ComponentException ce) {
+ this.selector =
(ServiceSelector)this.manager.lookup(InputModule.ROLE + "Selector");
+ } catch(ServiceException ce) {
throw new PatternException("Cannot access input modules
selector", ce);
}
}
@@ -166,7 +166,7 @@
InputModule module;
try {
module = (InputModule)this.selector.select(moduleName);
- } catch(ComponentException ce) {
+ } catch(ServiceException ce) {
throw new PatternException("Cannot get InputModule named '" +
moduleName +
"' in expression '" + this.expression + "'", ce);
}
@@ -231,7 +231,7 @@
result.append(value);
}
- } catch(ComponentException compEx) {
+ } catch(ServiceException compEx) {
throw new PatternException("Cannot get module '" +
moduleName +
"' in expression '" + this.expression + "'",
compEx);
@@ -264,7 +264,7 @@
case THREADSAFE_MODULE:
i++; // module
- this.selector.release((InputModule)
this.items.get(i));
+ this.selector.release(this.items.get(i));
i++; // variable
break;
1.8 +19 -20
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
Index: DefaultCopletFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultCopletFactory.java 18 Jul 2003 14:41:46 -0000 1.7
+++ DefaultCopletFactory.java 20 Oct 2003 13:36:42 -0000 1.8
@@ -57,14 +57,14 @@
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;
-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.logger.AbstractLogEnabled;
+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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.portal.PortalService;
@@ -87,15 +87,15 @@
*/
public class DefaultCopletFactory
extends AbstractLogEnabled
- implements Component, ThreadSafe, CopletFactory, Composable, Disposable,
Configurable {
+ implements Component, ThreadSafe, CopletFactory, Serviceable,
Disposable, Configurable {
- protected ComponentManager manager;
+ protected ServiceManager manager;
protected Map coplets = new HashMap();
protected List descriptions = new ArrayList();
- protected ComponentSelector storeSelector;
+ protected ServiceSelector storeSelector;
public void prepare(CopletData copletData)
throws ProcessingException {
@@ -166,13 +166,13 @@
// now lookup the adapter
final String adapterName =
copletData.getCopletBaseData().getCopletAdapterName();
CopletAdapter adapter = null;
- ComponentSelector adapterSelector = null;
+ ServiceSelector adapterSelector = null;
try {
- adapterSelector = (ComponentSelector) this.manager.lookup(
CopletAdapter.ROLE + "Selector");
+ adapterSelector = (ServiceSelector) this.manager.lookup(
CopletAdapter.ROLE + "Selector");
adapter = (CopletAdapter)adapterSelector.select( adapterName );
adapter.init( instance );
adapter.login( instance );
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup coplet adapter
selector or adaptor.", ce);
} finally {
if ( adapterSelector != null) {
@@ -185,7 +185,7 @@
try {
service = (PortalService)this.manager.lookup(PortalService.ROLE);
service.getComponentManager().getProfileManager().register(instance);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup profile
manager.", ce);
} finally {
this.manager.release( service );
@@ -194,12 +194,11 @@
}
/* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void compose(ComponentManager manager)
- throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
- this.storeSelector = (ComponentSelector)this.manager.lookup(
AspectDataStore.ROLE+"Selector" );
+ this.storeSelector = (ServiceSelector)this.manager.lookup(
AspectDataStore.ROLE+"Selector" );
}
/* (non-Javadoc)
@@ -268,13 +267,13 @@
// now lookup the adapter
final String adapterName =
copletInstanceData.getCopletData().getCopletBaseData().getCopletAdapterName();
CopletAdapter adapter = null;
- ComponentSelector adapterSelector = null;
+ ServiceSelector adapterSelector = null;
try {
- adapterSelector = (ComponentSelector) this.manager.lookup(
CopletAdapter.ROLE + "Selector");
+ adapterSelector = (ServiceSelector) this.manager.lookup(
CopletAdapter.ROLE + "Selector");
adapter = (CopletAdapter)adapterSelector.select( adapterName
);
adapter.logout( copletInstanceData );
adapter.destroy( copletInstanceData );
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup coplet
adapter selector or adaptor.", ce);
} finally {
if ( adapterSelector != null) {
@@ -287,7 +286,7 @@
try {
service =
(PortalService)this.manager.lookup(PortalService.ROLE);
service.getComponentManager().getProfileManager().unregister(copletInstanceData);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup portal
service.", ce);
} finally {
this.manager.release( service );
1.2 +17 -19
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java
Index: DefaultEventConverter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultEventConverter.java 7 May 2003 06:22:23 -0000 1.1
+++ DefaultEventConverter.java 20 Oct 2003 13:36:42 -0000 1.2
@@ -54,10 +54,10 @@
import java.util.List;
import org.apache.avalon.framework.CascadingRuntimeException;
-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.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.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.Event;
@@ -72,13 +72,20 @@
*/
public class DefaultEventConverter
extends AbstractLogEnabled
- implements EventConverter, Composable, ThreadSafe {
+ implements EventConverter, Serviceable, ThreadSafe {
protected static final String DECODE_LIST =
DefaultEventConverter.class.getName() + "D";
protected static final String ENCODE_LIST =
DefaultEventConverter.class.getName() + "E";
- protected ComponentManager manager;
+ protected ServiceManager manager;
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
public String encode(Event event) {
PortalService service = null;
try {
@@ -90,7 +97,7 @@
}
list.add(event);
return String.valueOf(list.size()-1);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup
component.", ce);
} finally {
this.manager.release(service);
@@ -110,7 +117,7 @@
return (Event)list.get(index);
}
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup
component.", ce);
} finally {
this.manager.release(service);
@@ -128,7 +135,7 @@
service.setAttribute(DECODE_LIST, list);
service.removeAttribute(ENCODE_LIST);
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup
component.", ce);
} finally {
this.manager.release(service);
@@ -140,19 +147,10 @@
try {
service = (PortalService)this.manager.lookup(PortalService.ROLE);
service.removeAttribute(DECODE_LIST);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new CascadingRuntimeException("Unable to lookup
component.", ce);
} finally {
this.manager.release(service);
}
}
-
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager)
- throws ComponentException {
- this.manager = manager;
- }
-
}
1.2 +7 -8
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
Index: EventAspectChain.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventAspectChain.java 22 May 2003 15:19:43 -0000 1.1
+++ EventAspectChain.java 20 Oct 2003 13:36:42 -0000 1.2
@@ -54,12 +54,11 @@
import java.util.Iterator;
import java.util.List;
-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.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.ServiceSelector;
/**
*
@@ -74,7 +73,7 @@
private List configs = new ArrayList();
- public void configure(ComponentSelector selector, Configuration conf)
+ public void configure(ServiceSelector selector, Configuration conf)
throws ConfigurationException {
if ( conf != null ) {
Configuration[] aspects = conf.getChildren("aspect");
@@ -85,7 +84,7 @@
try {
this.aspects.add(selector.select(role));
this.configs.add(Parameters.fromConfiguration(current));
- } catch (ComponentException se) {
+ } catch (ServiceException se) {
throw new ConfigurationException("Unable to lookup
aspect " + role, se);
}
}
@@ -103,10 +102,10 @@
return this.configs.iterator();
}
- public void dispose(ComponentSelector selector) {
+ public void dispose(ServiceSelector selector) {
Iterator i = this.aspects.iterator();
while (i.hasNext()) {
- selector.release((Component)i.next());
+ selector.release(i.next());
}
this.aspects.clear();
}
1.10 +18 -19
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
Index: DefaultEventManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultEventManager.java 26 May 2003 13:18:19 -0000 1.9
+++ DefaultEventManager.java 20 Oct 2003 13:36:42 -0000 1.10
@@ -57,10 +57,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-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;
@@ -68,6 +64,10 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
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.ServiceSelector;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.ContextHelper;
@@ -91,7 +91,7 @@
public class DefaultEventManager
extends AbstractLogEnabled
implements EventManager,
- Composable,
+ Serviceable,
Initializable,
ThreadSafe,
Configurable,
@@ -102,15 +102,22 @@
private final String rootEventType = Event.class.getName();
private Class eventClass;
private List subscribers = new ArrayList();
- private ComponentManager manager;
+ private ServiceManager manager;
private Configuration configuration;
protected EventAspectChain chain;
- protected ComponentSelector aspectSelector;
+ protected ServiceSelector aspectSelector;
protected Context context;
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
public Publisher getPublisher() {
return this;
}
@@ -210,14 +217,6 @@
}
}
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager)
- throws ComponentException {
- this.manager = manager;
- }
-
/**
* Process the events
*/
@@ -225,12 +224,12 @@
throws ProcessingException {
if ( this.configuration != null ) {
try {
- this.aspectSelector = (ComponentSelector)
this.manager.lookup( EventAspect.ROLE+"Selector");
+ this.aspectSelector = (ServiceSelector) this.manager.lookup(
EventAspect.ROLE+"Selector");
this.chain = new EventAspectChain();
this.chain.configure(this.aspectSelector,
this.configuration.getChild("event-aspects"));
} catch (ConfigurationException ce) {
throw new ProcessingException("Unable configure component.",
ce);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup component.",
ce);
}
this.configuration = null;
@@ -253,7 +252,7 @@
converter.finish();
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup component.", ce);
} finally {
this.manager.release(converter);
1.4 +3 -3
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java
Index: DefaultChangeAspectDataEventSubscriber.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultChangeAspectDataEventSubscriber.java 24 Sep 2003 21:22:33
-0000 1.3
+++ DefaultChangeAspectDataEventSubscriber.java 20 Oct 2003 13:36:42
-0000 1.4
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.portal.event.subscriber.impl;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.portal.aspect.Aspectalizable;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.Filter;
@@ -66,7 +66,7 @@
public final class DefaultChangeAspectDataEventSubscriber
implements Subscriber {
- public DefaultChangeAspectDataEventSubscriber(ComponentManager manager) {
+ public DefaultChangeAspectDataEventSubscriber(ServiceManager manager) {
}
/* (non-Javadoc)
