cvs commit: cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli DeliImpl.java

[joerg]

joerg       2004/02/06 14:46:53

  Modified:    src/blocks/deli/java/org/apache/cocoon/transformation
                        DeliTransformer.java
               src/blocks/deli/java/org/apache/cocoon/components/deli
                        DeliImpl.java
  Log:
  Composable => Serviceable
  
  Revision  Changes    Path
  1.3       +7 -7      
cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/transformation/DeliTransformer.java
  
  Index: DeliTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/transformation/DeliTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeliTransformer.java      28 Oct 2003 19:53:57 -0000      1.2
  +++ DeliTransformer.java      6 Feb 2004 22:46:53 -0000       1.3
  @@ -51,8 +51,8 @@
   
   package org.apache.cocoon.transformation;
   
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.components.deli.Deli;
  @@ -79,11 +79,11 @@
       private Deli deli;
   
       /**
  -     * Set the current <code>ComponentManager</code> instance used by this
  -     * <code>Composable</code>.
  +     * Set the current <code>ServiceManager</code> instance used by this
  +     * <code>Serviceable</code>.
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  -        super.compose(manager);
  +    public void service(ServiceManager manager) throws ServiceException {
  +        super.service(manager);
   
           this.deli = (Deli) this.manager.lookup(Deli.ROLE);
       }
  
  
  
  1.8       +11 -12    
cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli/DeliImpl.java
  
  Index: DeliImpl.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli/DeliImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DeliImpl.java     26 Sep 2003 14:04:51 -0000      1.7
  +++ DeliImpl.java     6 Feb 2004 22:46:53 -0000       1.8
  @@ -56,16 +56,15 @@
   
   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.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.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.Constants;
   import org.apache.cocoon.environment.Request;
  @@ -101,14 +100,14 @@
    * @version CVS $Id$
    */
   public final class DeliImpl extends AbstractLogEnabled
  -    implements Parameterizable, Deli, Composable, Disposable, Initializable,
  +    implements Parameterizable, Deli, Serviceable, Disposable, Initializable,
                  ThreadSafe, Contextualizable {
   
       /** The name of the main DELI configuration file */
       private String deliConfig = "WEB-INF/deli/config/deliConfig.xml";
   
  -    /** The component manager */
  -    protected ComponentManager manager = null;
  +    /** The service manager */
  +    protected ServiceManager manager = null;
   
       /** Parser used to construct the DOM tree to import the profile to a 
stylesheet */
       protected DOMParser parser;
  @@ -124,12 +123,12 @@
           this.servletContext = new CocoonServletContext(ctx);
       }
   
  -    /** Compose this class */
  -    public void compose(ComponentManager manager) throws ComponentException {
  +    /** Service this class */
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
           try {
               this.parser = (DOMParser)this.manager.lookup(DOMParser.ROLE);
  -        } catch (ComponentException e) {
  +        } catch (ServiceException e) {
               getLogger().error("DELI Exception while creating parser: ", e);
               throw e;
           }
  @@ -155,7 +154,7 @@
       /** Dispose of this class */
       public void dispose() {
           if (parser != null) {
  -            this.manager.release((Component)parser);
  +            this.manager.release(parser);
           }
           this.parser = null;
       }