You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/02/06 23:52:16 UTC
cvs commit: cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context SessionContextProviderImpl.java
joerg 2004/02/06 14:52:16
Modified: src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context
SessionContextProviderImpl.java
Log:
Composable => Serviceable
Revision Changes Path
1.7 +13 -14 cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionContextProviderImpl.java 9 Jan 2004 11:20:23 -0000 1.6
+++ SessionContextProviderImpl.java 6 Feb 2004 22:52:16 -0000 1.7
@@ -56,13 +56,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.ProcessingException;
import org.apache.cocoon.components.ContextHelper;
@@ -83,11 +83,10 @@
* @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
* @version CVS $Id$
*/
-public final class SessionContextProviderImpl
-extends AbstractLogEnabled
-implements SessionContextProvider, ThreadSafe, Component, Composable, Contextualizable, Disposable {
+public final class SessionContextProviderImpl extends AbstractLogEnabled
+ implements SessionContextProvider, ThreadSafe, Component, Serviceable, Contextualizable, Disposable {
- private ComponentManager manager;
+ private ServiceManager manager;
private Context context;
/** The XPath Processor */
@@ -150,10 +149,10 @@
throw new ProcessingException("SAXException", se);
} catch (IOException ioe) {
throw new ProcessingException("IOException", ioe);
- } catch (ComponentException ce) {
- throw new ProcessingException("Unable to lookup portal.", ce);
+ } catch (ServiceException se) {
+ throw new ProcessingException("Unable to lookup portal.", se);
} finally {
- manager.release( (Component)portal);
+ manager.release(portal);
}
}
}
@@ -182,9 +181,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;
this.xpathProcessor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
}
@@ -201,7 +200,7 @@
*/
public void dispose() {
if ( this.manager != null ) {
- this.manager.release( (Component)this.xpathProcessor );
+ this.manager.release(this.xpathProcessor);
this.xpathProcessor = null;
this.manager = null;
}