avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server SoapDatabaseManager.java
Date Sun, 12 May 2002 10:09:24 GMT
hammant     02/05/12 03:09:24

  Modified:    db/src/java/org/apache/avalon/db/actioncache
                        DefaultActionCache.java
               db/src/java/org/apache/avalon/db/basic/parser
                        BasicDualParserManager.java
               db/src/java/org/apache/avalon/db/optimizer
                        DefaultSQLOptimizer.java
               db/src/java/org/apache/avalon/db/persistence/inmemory
                        NoPersistence.java
               db/src/java/org/apache/avalon/db/persistence/store
                        StorePersistence.java
               db/src/java/org/apache/avalon/db/server
                        AbstractDatabaseManager.java
                        AbstractParserManager.java
               db/src/java/org/apache/avalon/db/server/lxsql
                        AbstractLXSQLParser.java
               db/src/java/org/apache/avalon/db/transport/altrmi/server
                        AltrmiDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/cmdstream/server
                        PlainCMDDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/soap/server
                        SoapDatabaseManager.java
  Added:       db/lib   avalon-framework.jar
  Removed:     db/lib   avalon-framework-4.1.2.jar
  Log:
  compose(..) becomes service(..)
  
  Revision  Changes    Path
  1.1                  jakarta-avalon-apps/db/lib/avalon-framework.jar
  
  	<<Binary file>>
  
  
  1.4       +9 -9      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java
  
  Index: DefaultActionCache.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultActionCache.java	3 Dec 2001 11:18:35 -0000	1.3
  +++ DefaultActionCache.java	12 May 2002 10:09:23 -0000	1.4
  @@ -16,14 +16,14 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
   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.activity.Initializable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   
   
   /**
  @@ -31,10 +31,10 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class DefaultActionCache extends AbstractLogEnabled
  -        implements ActionCache, Block, Contextualizable, Composable, Configurable, Initializable
{
  +        implements ActionCache, Block, Contextualizable, Serviceable, Configurable, Initializable
{
   
       // intended to be a "no cache" cache.
   
  @@ -50,15 +50,15 @@
       public void contextualize(Context context) throws ContextException {}
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {}
  +    public void service(ServiceManager serviceManager) throws ServiceException {}
   
       /**
        * Method configure
  
  
  
  1.4       +10 -10    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java
  
  Index: BasicDualParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicDualParserManager.java	15 Dec 2001 18:50:13 -0000	1.3
  +++ BasicDualParserManager.java	12 May 2002 10:09:23 -0000	1.4
  @@ -12,9 +12,9 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -36,7 +36,7 @@
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
    */
   public class BasicDualParserManager extends AbstractLogEnabled
  -        implements Block, ParserManager, Contextualizable, Composable, Configurable, Initializable
 {
  +        implements Block, ParserManager, Contextualizable, Serviceable, Configurable, Initializable
 {
   
       private BasicLXSQLParserManager mBasicLXSQLParserMgr;
       private BasicSQLParserManager mBasicSQLParserMgr;
  @@ -47,17 +47,17 @@
       }
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {
  -        mBasicLXSQLParserMgr.compose(componentManager);
  -        if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.compose(componentManager);
  +    public void service(ServiceManager serviceManager) throws ServiceException {
  +        mBasicLXSQLParserMgr.service(serviceManager);
  +        if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.service(serviceManager);
       }
   
       /**
  
  
  
  1.3       +9 -9      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/optimizer/DefaultSQLOptimizer.java
  
  Index: DefaultSQLOptimizer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/optimizer/DefaultSQLOptimizer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultSQLOptimizer.java	10 Nov 2001 21:45:03 -0000	1.2
  +++ DefaultSQLOptimizer.java	12 May 2002 10:09:23 -0000	1.3
  @@ -17,9 +17,9 @@
   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.component.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  @@ -31,10 +31,10 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class DefaultSQLOptimizer extends AbstractLogEnabled
  -        implements Block, SQLOptimizer, Contextualizable, Composable, Configurable,
  +        implements Block, SQLOptimizer, Contextualizable, Serviceable, Configurable,
                      Initializable {
   
       /**
  @@ -62,15 +62,15 @@
       public void contextualize(Context context) throws ContextException {}
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {}
  +    public void service(ServiceManager serviceManager) throws ServiceException {}
   
       /**
        * Method configure
  
  
  
  1.13      +9 -9      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java
  
  Index: NoPersistence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- NoPersistence.java	23 Nov 2001 14:41:08 -0000	1.12
  +++ NoPersistence.java	12 May 2002 10:09:23 -0000	1.13
  @@ -25,9 +25,9 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -42,10 +42,10 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class NoPersistence extends AbstractLogEnabled
  -        implements DatabasePersistor, Block, Contextualizable, Composable, Configurable,
  +        implements DatabasePersistor, Block, Contextualizable, Serviceable, Configurable,
                      Initializable {
   
       private HashMap mAddressableObjects = new HashMap();
  @@ -64,15 +64,15 @@
       public void contextualize(Context context) throws ContextException {}
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {}
  +    public void service(ServiceManager serviceManager) throws ServiceException {}
   
       /**
        * Method configure
  
  
  
  1.15      +9 -9      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java
  
  Index: StorePersistence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- StorePersistence.java	19 Nov 2001 10:20:25 -0000	1.14
  +++ StorePersistence.java	12 May 2002 10:09:24 -0000	1.15
  @@ -13,8 +13,8 @@
   import org.apache.avalon.db.data.RowListener;
   import org.apache.avalon.db.data.Row;
   import org.apache.avalon.db.data.Table;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.cornerstone.services.store.Store;
  @@ -28,7 +28,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class StorePersistence extends NoPersistence implements RowListener {
   
  @@ -36,17 +36,17 @@
       protected Configuration mStoreConfig;
       protected ObjectRepository mObjectRepository;
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {
  -        mStore = (Store) componentManager.lookup(Store.class.getName());
  -        super.compose(componentManager);
  +    public void service(ServiceManager serviceManager) throws ServiceException {
  +        mStore = (Store) serviceManager.lookup(Store.class.getName());
  +        super.service(serviceManager);
       }
   
       public void configure(Configuration configuration)
  
  
  
  1.30      +11 -11    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java
  
  Index: AbstractDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AbstractDatabaseManager.java	10 Jan 2002 11:19:37 -0000	1.29
  +++ AbstractDatabaseManager.java	12 May 2002 10:09:24 -0000	1.30
  @@ -9,9 +9,9 @@
   package org.apache.avalon.db.server;
   
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.db.services.ParserManager;
   import org.apache.avalon.db.services.SQLOptimizer;
  @@ -27,30 +27,30 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.29 $
  + * @version $Revision: 1.30 $
    */
   public abstract class AbstractDatabaseManager extends AbstractLogEnabled
  -        implements Composable, Initializable {
  +        implements Serviceable, Initializable {
   
       protected ParserManager mSQLParser;
       protected SQLOptimizer mSQLOptimizer;
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(final ComponentManager componentManager) throws ComponentException
{
  +    public void service(final ServiceManager serviceManager) throws ServiceException {
   
           getLogger().info("AvalonDB.compose()");
   
  -        mSQLParser = (ParserManager) componentManager.lookup(ParserManager.class.getName());
  +        mSQLParser = (ParserManager) serviceManager.lookup(ParserManager.class.getName());
           System.out.println("mSQLParser" + mSQLParser);
  -        mSQLOptimizer = (SQLOptimizer) componentManager.lookup(SQLOptimizer.class.getName());
  +        mSQLOptimizer = (SQLOptimizer) serviceManager.lookup(SQLOptimizer.class.getName());
       }
   
       public void initialize() throws Exception {
  
  
  
  1.5       +10 -10    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java
  
  Index: AbstractParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractParserManager.java	7 Feb 2002 09:24:40 -0000	1.4
  +++ AbstractParserManager.java	12 May 2002 10:09:24 -0000	1.5
  @@ -12,9 +12,9 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -42,10 +42,10 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public abstract class AbstractParserManager extends AbstractLogEnabled
  -        implements Block, ParserManager, Contextualizable, Composable, Configurable, Initializable
 {
  +        implements Block, ParserManager, Contextualizable, Serviceable, Configurable, Initializable
 {
   
       protected DatabasePersistor mDatabasePersistor;
       protected static int mGenObjSeq;
  @@ -67,17 +67,17 @@
       }
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {
  +    public void service(ServiceManager serviceManager) throws ServiceException {
           mDatabasePersistor =
  -            (DatabasePersistor) componentManager.lookup(DatabasePersistor.class.getName());
  +            (DatabasePersistor) serviceManager.lookup(DatabasePersistor.class.getName());
       }
   
       /**
  
  
  
  1.6       +9 -9      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/lxsql/AbstractLXSQLParser.java
  
  Index: AbstractLXSQLParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/lxsql/AbstractLXSQLParser.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractLXSQLParser.java	7 Feb 2002 09:24:40 -0000	1.5
  +++ AbstractLXSQLParser.java	12 May 2002 10:09:24 -0000	1.6
  @@ -11,8 +11,8 @@
   import org.apache.avalon.db.server.AbstractParserManager;
   
   import org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory;
  -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.avalon.db.actions.ActionException;
   import org.apache.avalon.db.actions.Action;
   import org.w3c.dom.Document;
  @@ -38,26 +38,26 @@
       private final String XMLHDR = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(ComponentManager componentManager) throws ComponentException {
  +    public void service(ServiceManager serviceManager) throws ServiceException {
           mDocumentBuilderFactory =
  -            (DocumentBuilderFactory) componentManager.lookup(DocumentBuilderFactory.class.getName());
  +            (DocumentBuilderFactory) serviceManager.lookup(DocumentBuilderFactory.class.getName());
           try
           {
               mDocumentBuilder = mDocumentBuilderFactory.newDocumentBuilder();
           }
           catch (ParserConfigurationException pce)
           {
  -            throw new ComponentException("ParserConfiguration Exception in compose()",pce);
  +            throw new ServiceException("ParserConfiguration Exception in service()",pce);
           }
  -        super.compose(componentManager);
  +        super.service(serviceManager);
       }
   
   
  
  
  
  1.4       +8 -8      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java
  
  Index: AltrmiDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AltrmiDatabaseManager.java	3 Apr 2002 12:06:01 -0000	1.3
  +++ AltrmiDatabaseManager.java	12 May 2002 10:09:24 -0000	1.4
  @@ -15,8 +15,8 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   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.excalibur.altrmi.server.AltrmiPublisher;
   
   /**
  @@ -43,18 +43,18 @@
   
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(final ComponentManager componentManager) throws ComponentException
{
  +    public void service(final ServiceManager serviceManager) throws ServiceException {
   
  -        super.compose(componentManager);
  -        mAltrmiPublisher = (AltrmiPublisher) componentManager.lookup(AltrmiPublisher.class.getName());
  +        super.service(serviceManager);
  +        mAltrmiPublisher = (AltrmiPublisher) serviceManager.lookup(AltrmiPublisher.class.getName());
       }
   
   
  
  
  
  1.10      +10 -10    jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java
  
  Index: PlainCMDDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PlainCMDDatabaseManager.java	22 Dec 2001 10:52:23 -0000	1.9
  +++ PlainCMDDatabaseManager.java	12 May 2002 10:09:24 -0000	1.10
  @@ -13,9 +13,9 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -101,20 +101,20 @@
       }
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(final ComponentManager componentManager) throws ComponentException
{
  +    public void service(final ServiceManager serviceManager) throws ServiceException {
   
  -        super.compose(componentManager);
  +        super.service(serviceManager);
   
  -        mSocketManager = (SocketManager) componentManager.lookup(SocketManager.ROLE);
  -        mConnectionManager = (ConnectionManager) componentManager.lookup(ConnectionManager.ROLE);
  +        mSocketManager = (SocketManager) serviceManager.lookup(SocketManager.ROLE);
  +        mConnectionManager = (ConnectionManager) serviceManager.lookup(ConnectionManager.ROLE);
       }
   
       /**
  
  
  
  1.5       +9 -9      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java
  
  Index: SoapDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SoapDatabaseManager.java	14 Nov 2001 02:57:55 -0000	1.4
  +++ SoapDatabaseManager.java	12 May 2002 10:09:24 -0000	1.5
  @@ -13,9 +13,9 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -63,18 +63,18 @@
   
   
       /**
  -     * Method compose
  +     * Method service
        *
        *
  -     * @param componentManager
  +     * @param serviceManager
        *
  -     * @throws ComponentException
  +     * @throws ServiceException
        *
        */
  -    public void compose(final ComponentManager componentManager) throws ComponentException
{
  +    public void service(final ServiceManager serviceManager) throws ServiceException {
   
  -        super.compose(componentManager);
  -        mSOAPification = (SOAPification) componentManager.lookup(SOAPification.ROLE);
  +        super.service(serviceManager);
  +        mSOAPification = (SOAPification) serviceManager.lookup(SOAPification.ROLE);
       }
   
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message