You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/20 15:37:10 UTC
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl XSLTAspect.java AbstractCompositeAspect.java RendererAspectChain.java DefaultCopletAspect.java AbstractAspect.java
cziegeler 2003/10/20 06:37:10
Modified: src/blocks/portal/java/org/apache/cocoon/portal/layout/impl
DefaultLayoutFactory.java
src/blocks/portal/java/org/apache/cocoon/portal/reading
ProxyReader.java
src/blocks/portal/java/org/apache/cocoon/portal/source
CopletSourceFactory.java CopletSource.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl
AspectRenderer.java AbstractRenderer.java
src/blocks/portal/java/org/apache/cocoon/portal/transformation
LinkTransformer.java ProxyTransformer.java
src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
MapProfileLS.java AuthenticationProfileManager.java
AbstractProfileManager.java
StaticProfileManager.java
AbstractUserProfileManager.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
XSLTAspect.java AbstractCompositeAspect.java
RendererAspectChain.java DefaultCopletAspect.java
AbstractAspect.java
Log:
Changing to Serviceable
Revision Changes Path
1.14 +19 -19 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
Index: DefaultLayoutFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultLayoutFactory.java 18 Jul 2003 14:41:44 -0000 1.13
+++ DefaultLayoutFactory.java 20 Oct 2003 13:37:10 -0000 1.14
@@ -60,14 +60,14 @@
import org.apache.avalon.framework.activity.Disposable;
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.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.PortalComponentManager;
@@ -105,7 +105,7 @@
LayoutFactory,
Configurable,
Disposable,
- Composable,
+ Serviceable,
Initializable,
Subscriber {
@@ -113,12 +113,20 @@
protected List descriptions = new ArrayList();
- protected ComponentSelector storeSelector;
+ protected ServiceSelector storeSelector;
- protected ComponentManager manager;
+ protected ServiceManager manager;
protected Configuration[] layoutsConf;
+ /* (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;
+ this.storeSelector = (ServiceSelector)this.manager.lookup( AspectDataStore.ROLE+"Selector" );
+ }
+
/**
* Configure a layout
*/
@@ -181,7 +189,7 @@
desc.addAspectDescription( adesc );
}
}
- } catch (ComponentException ce ) {
+ } catch (ServiceException ce ) {
throw new ConfigurationException("Unable to lookup renderer selector.", ce);
} finally {
this.manager.release( service );
@@ -284,7 +292,7 @@
try {
service = (PortalService)this.manager.lookup(PortalService.ROLE);
service.getComponentManager().getProfileManager().register(layout);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup profile manager.", ce);
} finally {
this.manager.release( service );
@@ -319,14 +327,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;
- this.storeSelector = (ComponentSelector)this.manager.lookup( AspectDataStore.ROLE+"Selector" );
- }
-
- /* (non-Javadoc)
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
@@ -392,7 +392,7 @@
factory.remove( ((CopletLayout)layout).getCopletInstanceData());
}
service.getComponentManager().getProfileManager().unregister(layout);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup portal service.", ce);
} finally {
this.manager.release( service );
1.4 +5 -19 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
Index: ProxyReader.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProxyReader.java 9 Sep 2003 18:52:33 -0000 1.3
+++ ProxyReader.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -58,9 +58,6 @@
import java.util.Enumeration;
import java.util.Map;
-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.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -69,7 +66,7 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.portal.coplet.CopletInstanceData;
import org.apache.cocoon.portal.transformation.ProxyTransformer;
-import org.apache.cocoon.reading.AbstractReader;
+import org.apache.cocoon.reading.ServiceableReader;
import org.xml.sax.SAXException;
/**
@@ -85,11 +82,7 @@
*
* @version CVS $Id$
*/
-public class ProxyReader extends AbstractReader implements Composable {
- /**
- * The Avalon component manager
- */
- protected ComponentManager componentManager;
+public class ProxyReader extends ServiceableReader {
/**
* The coplet instance data
@@ -125,7 +118,7 @@
copletInstanceData =
ProxyTransformer.getInstanceData(
- this.componentManager,
+ this.manager,
objectModel,
copletID,
portalName);
@@ -133,19 +126,12 @@
}
/**
- * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
- */
- public void compose(ComponentManager componentManager)
- throws ComponentException {
- this.componentManager = componentManager;
- }
-
- /**
* @see org.apache.avalon.excalibur.pool.Recyclable#recycle()
*/
public void recycle() {
this.response = null;
this.request = null;
+ super.recycle();
}
/**
1.5 +12 -13 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java
Index: CopletSourceFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopletSourceFactory.java 18 Jul 2003 14:41:44 -0000 1.4
+++ CopletSourceFactory.java 20 Oct 2003 13:37:10 -0000 1.5
@@ -54,10 +54,10 @@
import java.net.MalformedURLException;
import java.util.Map;
-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.coplet.CopletInstanceData;
@@ -75,16 +75,15 @@
*/
public class CopletSourceFactory
extends AbstractLogEnabled
- implements SourceFactory, Composable, ThreadSafe {
+ implements SourceFactory, Serviceable, ThreadSafe {
- protected ComponentManager 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 serviceManager) throws ServiceException {
+ this.manager = serviceManager;
}
/**
@@ -110,9 +109,9 @@
CopletSource copletSource =
new CopletSource(uri, protocol,
coplet);
- copletSource.compose(this.manager);
+ copletSource.service(this.manager);
return copletSource;
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SourceException("Unable to lookup profile manager.", ce);
} finally {
this.manager.release(service);
1.4 +17 -18 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java
Index: CopletSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CopletSource.java 3 Jul 2003 08:00:00 -0000 1.3
+++ CopletSource.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -53,10 +53,10 @@
import java.io.IOException;
import java.io.InputStream;
-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.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.portal.coplet.CopletInstanceData;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
import org.apache.excalibur.source.Source;
@@ -75,9 +75,9 @@
* @version CVS $Id$
*/
public class CopletSource
- implements Source, XMLizable, Composable {
+ implements Source, XMLizable, Serviceable {
- protected ComponentManager manager;
+ protected ServiceManager manager;
protected String uri;
protected String copletControllerName;
@@ -86,6 +86,13 @@
/** The used protocol */
protected String scheme;
+ /* (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 CopletSource(String location, String protocol,
CopletInstanceData coplet) {
this.uri = location;
@@ -147,14 +154,14 @@
*/
public void toSAX(ContentHandler handler)
throws SAXException {
- ComponentSelector copletAdapterSelector = null;
+ ServiceSelector copletAdapterSelector = null;
CopletAdapter copletAdapter = null;
try {
- copletAdapterSelector = (ComponentSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
+ copletAdapterSelector = (ServiceSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
copletAdapter = (CopletAdapter)copletAdapterSelector.select(this.copletControllerName);
copletAdapter.toSAX(this.copletInstanceData, handler);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup coplet adaptor or adaptor selector.", ce);
} finally {
if ( null != copletAdapter ) {
@@ -163,14 +170,6 @@
this.manager.release(copletAdapterSelector);
}
- }
-
- /**
- * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
- */
- public void compose(ComponentManager componentManager)
- throws ComponentException {
- this.manager = componentManager;
}
/**
1.3 +16 -16 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
Index: AspectRenderer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AspectRenderer.java 14 Jun 2003 17:55:43 -0000 1.2
+++ AspectRenderer.java 20 Oct 2003 13:37:10 -0000 1.3
@@ -53,14 +53,14 @@
import java.util.Iterator;
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.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.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
@@ -81,14 +81,22 @@
*/
public class AspectRenderer
extends AbstractLogEnabled
- implements Renderer, Composable, Configurable, Disposable, ThreadSafe {
+ implements Renderer, Serviceable, Configurable, Disposable, ThreadSafe {
- protected ComponentManager manager;
+ protected ServiceManager manager;
protected RendererAspectChain chain;
- protected ComponentSelector aspectSelector;
+ protected ServiceSelector aspectSelector;
+ /* (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;
+ this.aspectSelector = (ServiceSelector) this.manager.lookup( RendererAspect.ROLE+"Selector");
+ }
+
/**
* Stream out raw layout
*/
@@ -103,14 +111,6 @@
public void configure(Configuration conf) throws ConfigurationException {
this.chain = new RendererAspectChain();
this.chain.configure(this.aspectSelector, conf.getChild("aspects"));
- }
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void compose(ComponentManager manager) throws ComponentException {
- this.manager = manager;
- this.aspectSelector = (ComponentSelector) this.manager.lookup( RendererAspect.ROLE+"Selector");
}
/* (non-Javadoc)
1.6 +22 -22 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractRenderer.java 24 Sep 2003 21:22:33 -0000 1.5
+++ AbstractRenderer.java 20 Oct 2003 13:37:10 -0000 1.6
@@ -57,11 +57,11 @@
import javax.xml.transform.sax.TransformerHandler;
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.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.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
@@ -83,10 +83,17 @@
*/
public abstract class AbstractRenderer
extends AbstractLogEnabled
- implements Renderer, Composable, Disposable, ThreadSafe {
+ implements Renderer, Serviceable, Disposable, ThreadSafe {
- protected ComponentSelector rendererSelector;
- protected ComponentManager componentManager;
+ protected ServiceSelector rendererSelector;
+ 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 getStylesheetURI(Layout layout) {
return null;
@@ -97,19 +104,12 @@
}
/**
- * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
- */
- public void compose(ComponentManager componentManager) throws ComponentException {
- this.componentManager = componentManager;
- }
-
- /**
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
- if (null != this.componentManager) {
- this.componentManager.release(this.rendererSelector);
- this.componentManager = null;
+ if (null != this.manager) {
+ this.manager.release(this.rendererSelector);
+ this.manager = null;
this.rendererSelector = null;
}
}
@@ -123,9 +123,9 @@
Source stylesheet = null;
SourceResolver resolver = null;
try {
- resolver = (SourceResolver) this.componentManager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
stylesheet = resolver.resolveURI(this.getStylesheetURI(layout));
- processor = (XSLTProcessor) this.componentManager.lookup(XSLTProcessor.ROLE);
+ processor = (XSLTProcessor) this.manager.lookup(XSLTProcessor.ROLE);
TransformerHandler transformer = processor.getTransformerHandler(stylesheet);
SAXResult result = new SAXResult(new IncludeXMLConsumer((handler)));
if (handler instanceof LexicalHandler) {
@@ -140,9 +140,9 @@
} finally {
if (null != resolver) {
resolver.release(stylesheet);
- this.componentManager.release(resolver);
+ this.manager.release(resolver);
}
- this.componentManager.release(processor);
+ this.manager.release(processor);
}
} else {
this.process(layout, service, handler);
1.4 +12 -13 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/LinkTransformer.java
Index: LinkTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/LinkTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LinkTransformer.java 25 Sep 2003 17:28:38 -0000 1.3
+++ LinkTransformer.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -55,10 +55,10 @@
import java.util.Map;
import java.util.Stack;
-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.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.environment.ObjectModelHelper;
import org.apache.cocoon.environment.SourceResolver;
@@ -93,7 +93,7 @@
*/
public class LinkTransformer
extends AbstractTransformer
- implements Composable {
+ implements Serviceable {
/**
* Namespace prefix usef vor NewEventLinkTransformer-Namespace
@@ -126,16 +126,15 @@
protected Stack elementStack = new Stack();
/**
- * The avalon component manager
+ * The avalon service manager
*/
- protected ComponentManager componentManager;
+ 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.componentManager = componentManager;
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
}
/**
@@ -149,7 +148,7 @@
throws ProcessingException, SAXException, IOException {
copletInstanceData =
ProxyTransformer.getInstanceData(
- componentManager,
+ this.manager,
objectModel,
par);
copletIdParamString =
1.4 +15 -23 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Index: ProxyTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProxyTransformer.java 24 Sep 2003 21:22:33 -0000 1.3
+++ ProxyTransformer.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -62,12 +62,12 @@
import java.util.Enumeration;
import java.util.Map;
-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.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.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -101,7 +101,7 @@
*/
public class ProxyTransformer
extends AbstractTransformer
- implements Composable, Parameterizable {
+ implements Serviceable, Parameterizable {
/**
* Parameter for specifying the envelope tag
@@ -146,7 +146,7 @@
/**
* The Avalon component manager
*/
- protected ComponentManager componentManager;
+ protected ServiceManager manager;
/**
* The coplet instance data
@@ -168,20 +168,12 @@
*/
protected String userAgent = null;
- /**
- * @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.componentManager = componentManager;
- }
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
- /**
- * Recycle this component.
- * All instance variables are set to <code>null</code>.
- */
- public void recycle() {
- super.recycle();
}
/**
@@ -216,7 +208,7 @@
request = ObjectModelHelper.getRequest(objectModel);
copletInstanceData =
- getInstanceData(this.componentManager, objectModel, parameters);
+ getInstanceData(this.manager, objectModel, parameters);
PortalApplicationConfig pac =
(PortalApplicationConfig) copletInstanceData.getAttribute(CONFIG);
@@ -641,7 +633,7 @@
}
public static CopletInstanceData getInstanceData(
- ComponentManager manager,
+ ServiceManager manager,
Map objectModel,
String copletID,
String portalName)
@@ -666,7 +658,7 @@
profileManager.getCopletInstanceData(copletID);
return data;
}
- catch (ComponentException e) {
+ catch (ServiceException e) {
throw new ProcessingException("Error getting profile manager.", e);
}
finally {
@@ -685,7 +677,7 @@
* @throws SAXException
*/
public static CopletInstanceData getInstanceData(
- ComponentManager manager,
+ ServiceManager manager,
Map objectModel,
Parameters parameters)
throws ProcessingException, IOException, SAXException {
@@ -726,7 +718,7 @@
}
return profileManager.getCopletInstanceData(copletId);
}
- catch (ComponentException e) {
+ catch (ServiceException e) {
throw new ProcessingException("Error getting profile manager.", e);
}
finally {
1.4 +14 -15 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
Index: MapProfileLS.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MapProfileLS.java 21 Aug 2003 06:41:19 -0000 1.3
+++ MapProfileLS.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -58,10 +58,10 @@
import java.util.Map.Entry;
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.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.persistence.CastorSourceConverter;
import org.apache.cocoon.portal.profile.ProfileLS;
@@ -81,12 +81,19 @@
*/
public class MapProfileLS
extends AbstractLogEnabled
- implements Component, Composable, ProfileLS, ThreadSafe {
+ implements Component, Serviceable, ProfileLS, ThreadSafe {
/** The component manager */
- 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 String getURI(Map keyMap, Map parameters)
throws Exception {
final StringBuffer buffer = new StringBuffer();
@@ -223,7 +230,7 @@
if ( resolver != null ) {
resolver.release(source);
}
- manager.release((Component)parser);
+ manager.release(parser);
manager.release(converter);
manager.release(resolver);
}
@@ -252,14 +259,6 @@
}
manager.release(resolver);
}
- }
-
- /* (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.11 +10 -11 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
Index: AuthenticationProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AuthenticationProfileManager.java 4 Aug 2003 03:06:30 -0000 1.10
+++ AuthenticationProfileManager.java 20 Oct 2003 13:37:10 -0000 1.11
@@ -56,11 +56,10 @@
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.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletFactory;
@@ -102,11 +101,11 @@
try {
authManager = (AuthenticationManager)this.manager.lookup(AuthenticationManager.ROLE);
return authManager.getState();
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
// ignore this here
return null;
} finally {
- this.manager.release( (Component)authManager );
+ this.manager.release( authManager );
}
}
@@ -117,7 +116,7 @@
PortalService service,
CopletFactory copletFactory,
LayoutFactory layoutFactory,
- ComponentSelector adapterSelector)
+ ServiceSelector adapterSelector)
throws Exception {
final RequestState state = this.getRequestState();
final UserHandler handler = state.getHandler();
@@ -206,7 +205,7 @@
// TODO
throw new CascadingRuntimeException("Exception during save profile", e);
} finally {
- this.manager.release((Component)adapter);
+ this.manager.release(adapter);
this.manager.release(service);
}
}
@@ -303,7 +302,7 @@
//adapter.saveProfile(keyMap, parameters, result);
} finally {
- this.manager.release((Component)adapter);
+ this.manager.release(adapter);
}
}
@@ -354,7 +353,7 @@
return new Object[]{object, Boolean.TRUE};
} finally {
- this.manager.release((Component) adapter);
+ this.manager.release(adapter);
}
}
@@ -400,7 +399,7 @@
return object;
} finally {
- this.manager.release((Component) adapter);
+ this.manager.release(adapter);
}
}
1.4 +82 -14 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java
Index: AbstractProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractProfileManager.java 29 Jul 2003 06:30:07 -0000 1.3
+++ AbstractProfileManager.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -50,16 +50,20 @@
*/
package org.apache.cocoon.portal.profile.impl;
+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.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.portal.PortalService;
+import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletInstanceData;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.profile.ProfileManager;
@@ -72,17 +76,81 @@
*/
public abstract class AbstractProfileManager
extends AbstractLogEnabled
- implements Composable, Configurable, ProfileManager, ThreadSafe {
+ implements Serviceable, Configurable, ProfileManager, ThreadSafe {
protected String defaultLayoutKey;
- protected ComponentManager 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 service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstanceData(org.apache.cocoon.portal.coplet.CopletData)
+ */
+ public List getCopletInstanceData(CopletData data) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstanceData(java.lang.String)
*/
- public void compose(ComponentManager componentManager) throws ComponentException {
- this.manager = componentManager;
+ public CopletInstanceData getCopletInstanceData(String copletID) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#getPortalLayout(java.lang.String, java.lang.String)
+ */
+ public Layout getPortalLayout(String layoutKey, String layoutID) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#register(org.apache.cocoon.portal.coplet.CopletInstanceData)
+ */
+ public void register(CopletInstanceData coplet) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#register(org.apache.cocoon.portal.layout.Layout)
+ */
+ public void register(Layout layout) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#saveUserProfiles()
+ */
+ public void saveUserProfiles() {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#unregister(org.apache.cocoon.portal.coplet.CopletInstanceData)
+ */
+ public void unregister(CopletInstanceData coplet) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.profile.ProfileManager#unregister(org.apache.cocoon.portal.layout.Layout)
+ */
+ public void unregister(Layout layout) {
+ // TODO Auto-generated method stub
+
}
/**
@@ -97,7 +165,7 @@
} else {
service.setAttribute("default-layout-key", layoutKey);
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
// this should never happen
throw new CascadingRuntimeException("Unable to lookup portal service.", ce);
} finally {
@@ -117,7 +185,7 @@
return this.defaultLayoutKey;
}
return defaultLayoutKey;
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
// this should never happen
throw new CascadingRuntimeException("Unable to lookup portal service.", ce);
} finally {
@@ -138,7 +206,7 @@
try {
service = (PortalService) this.manager.lookup(PortalService.ROLE);
service.setTemporaryAttribute("DEFAULT_LAYOUT:" + layoutKey, object);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup service manager.", e);
} finally {
this.manager.release(service);
@@ -151,7 +219,7 @@
try {
service = (PortalService) this.manager.lookup(PortalService.ROLE);
return (Layout)service.getTemporaryAttribute("DEFAULT_LAYOUT:" + layoutKey);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup service manager.", e);
} finally {
this.manager.release(service);
1.8 +3 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
Index: StaticProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StaticProfileManager.java 29 Jul 2003 06:30:07 -0000 1.7
+++ StaticProfileManager.java 20 Oct 2003 13:37:10 -0000 1.8
@@ -57,7 +57,6 @@
import java.util.Map;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -176,7 +175,7 @@
finally
{
this.manager.release(service);
- this.manager.release((Component) adapter);
+ this.manager.release(adapter);
}
}
@@ -276,7 +275,7 @@
finally
{
this.manager.release(service);
- this.manager.release((Component) adapter);
+ this.manager.release(adapter);
}
}
1.4 +15 -15 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AbstractUserProfileManager.java
Index: AbstractUserProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AbstractUserProfileManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractUserProfileManager.java 4 Aug 2003 03:06:30 -0000 1.3
+++ AbstractUserProfileManager.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -57,8 +57,8 @@
import java.util.Map;
import org.apache.avalon.framework.CascadingRuntimeException;
-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.ProcessingException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletData;
@@ -91,9 +91,9 @@
public void logout() {
final String layoutKey = this.getDefaultLayoutKey();
PortalService service = null;
- ComponentSelector adapterSelector = null;
+ ServiceSelector adapterSelector = null;
try {
- adapterSelector = (ComponentSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
+ adapterSelector = (ServiceSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
service = (PortalService)this.manager.lookup(PortalService.ROLE);
CopletInstanceDataManager copletInstanceDataManager = (CopletInstanceDataManager)service.getAttribute("CopletInstanceData:"+layoutKey);
@@ -112,7 +112,7 @@
service.removeAttribute("CopletData:"+layoutKey);
service.removeAttribute("CopletInstanceData:"+layoutKey);
service.removeAttribute("Layout:"+layoutKey);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -179,7 +179,7 @@
CopletInstanceDataManager copletInstanceDataManager = (CopletInstanceDataManager)service.getAttribute(attribute);
return copletInstanceDataManager.getCopletInstanceData(copletID);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -205,7 +205,7 @@
}
}
return coplets;
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -224,7 +224,7 @@
copletInstanceDataManager.putCopletInstanceData( coplet );
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -243,7 +243,7 @@
copletInstanceDataManager.getCopletInstanceData().remove(coplet.getId());
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -270,7 +270,7 @@
layoutMap.put(layout.getId(), layout);
}
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -289,7 +289,7 @@
layoutMap.remove(layout.getId());
}
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup portal service.", e);
} finally {
this.manager.release(service);
@@ -301,14 +301,14 @@
*/
public Layout getPortalLayout(String layoutKey, String layoutID) {
PortalService service = null;
- ComponentSelector adapterSelector = null;
+ ServiceSelector adapterSelector = null;
try {
service = (PortalService) this.manager.lookup(PortalService.ROLE);
LayoutFactory factory = service.getComponentManager().getLayoutFactory();
CopletFactory copletFactory = service.getComponentManager().getCopletFactory();
- adapterSelector = (ComponentSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
+ adapterSelector = (ServiceSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
if ( null == layoutKey ) {
layoutKey = this.getDefaultLayoutKey();
@@ -356,7 +356,7 @@
PortalService service,
CopletFactory copletFactory,
LayoutFactory layoutFactory,
- ComponentSelector adapterSelector)
+ ServiceSelector adapterSelector)
throws Exception;
}
1.8 +13 -15 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
Index: XSLTAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLTAspect.java 24 Sep 2003 21:22:33 -0000 1.7
+++ XSLTAspect.java 20 Oct 2003 13:37:10 -0000 1.8
@@ -59,11 +59,10 @@
import javax.xml.transform.sax.TransformerHandler;
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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.variables.VariableResolver;
import org.apache.cocoon.components.variables.VariableResolverFactory;
import org.apache.cocoon.portal.PortalService;
@@ -95,6 +94,14 @@
protected VariableResolverFactory variableFactory;
/* (non-Javadoc)
+ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
+ this.variableFactory = (VariableResolverFactory) this.manager.lookup(VariableResolverFactory.ROLE);
+ }
+
+ /* (non-Javadoc)
* @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
*/
public void toSAX(RendererAspectContext context,
@@ -125,7 +132,7 @@
throw new SAXException("XSLT Exception.", xpe);
} catch (IOException io) {
throw new SAXException("Error in resolving.", io);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup component.", ce);
} finally {
if (null != resolver) {
@@ -184,19 +191,10 @@
this.variableFactory.release( (VariableResolver) vars.next() );
}
this.variables.clear();
- this.manager.release((Component) this.variableFactory);
+ this.manager.release( this.variableFactory);
this.manager = null;
this.variableFactory = null;
}
- }
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager componentManager)
- throws ComponentException {
- super.compose(componentManager);
- this.variableFactory = (VariableResolverFactory) this.manager.lookup(VariableResolverFactory.ROLE);
}
}
1.5 +1 -15 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
Index: AbstractCompositeAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractCompositeAspect.java 2 Sep 2003 08:34:17 -0000 1.4
+++ AbstractCompositeAspect.java 20 Oct 2003 13:37:10 -0000 1.5
@@ -52,7 +52,6 @@
import java.util.Iterator;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.CompositeLayout;
import org.apache.cocoon.portal.layout.Item;
@@ -72,8 +71,6 @@
public abstract class AbstractCompositeAspect
extends AbstractAspect {
- private ComponentSelector rendererSelector;
-
/* (non-Javadoc)
* @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
*/
@@ -104,17 +101,6 @@
final String rendererName = layout.getRendererName();
final Renderer renderer = service.getComponentManager().getRenderer(rendererName);
renderer.toSAX(layout, service, handler);
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- if (null != this.manager) {
- this.manager.release(this.rendererSelector);
- this.manager = null;
- this.rendererSelector = null;
- }
}
}
1.4 +7 -8 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java
Index: RendererAspectChain.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RendererAspectChain.java 15 Jun 2003 16:56:09 -0000 1.3
+++ RendererAspectChain.java 20 Oct 2003 13:37:10 -0000 1.4
@@ -54,13 +54,12 @@
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.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
/**
@@ -79,7 +78,7 @@
protected List aspectDescriptions = new ArrayList(2);
- public void configure(ComponentSelector selector, Configuration conf)
+ public void configure(ServiceSelector selector, Configuration conf)
throws ConfigurationException {
if ( conf != null ) {
Configuration[] aspects = conf.getChildren("aspect");
@@ -102,7 +101,7 @@
}
} catch (ParameterException pe) {
throw new ConfigurationException("Unable to configure renderer aspect " + role, pe);
- } catch (ComponentException se) {
+ } catch (ServiceException se) {
throw new ConfigurationException("Unable to lookup aspect " + role, se);
}
}
@@ -124,10 +123,10 @@
return this.aspectDescriptions.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.3 +6 -6 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java
Index: DefaultCopletAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultCopletAspect.java 19 Aug 2003 14:09:34 -0000 1.2
+++ DefaultCopletAspect.java 20 Oct 2003 13:37:10 -0000 1.3
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect.impl;
-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.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstanceData;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
@@ -87,12 +87,12 @@
final String adapterName = cid.getCopletData().getCopletBaseData().getCopletAdapterName();
CopletAdapter copletAdapter = null;
- ComponentSelector adapterSelector = null;
+ ServiceSelector adapterSelector = null;
try {
- adapterSelector = (ComponentSelector) this.manager.lookup(CopletAdapter.ROLE + "Selector");
+ adapterSelector = (ServiceSelector) this.manager.lookup(CopletAdapter.ROLE + "Selector");
copletAdapter = (CopletAdapter) adapterSelector.select(adapterName);
copletAdapter.toSAX(cid, new IncludeXMLConsumer(handler));
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup component.", ce);
} finally {
if (null != copletAdapter) {
1.5 +28 -10 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
Index: AbstractAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractAspect.java 15 Jun 2003 16:56:09 -0000 1.4
+++ AbstractAspect.java 20 Oct 2003 13:37:10 -0000 1.5
@@ -52,14 +52,19 @@
import java.util.Iterator;
-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.parameters.ParameterException;
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.portal.PortalService;
+import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
+import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
/**
*
@@ -70,15 +75,28 @@
*/
public abstract class AbstractAspect
extends AbstractLogEnabled
- implements Composable, ThreadSafe, RendererAspect {
+ implements Serviceable, ThreadSafe, RendererAspect {
- protected ComponentManager 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;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+ */
+ public void toSAX(
+ RendererAspectContext context,
+ Layout layout,
+ PortalService service,
+ ContentHandler handler)
+ throws SAXException {
+ // TODO Auto-generated method stub
+
}
/**