cvs commit: jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks DefaultHypersonicSQL.java

[hammant]

hammant     02/05/12 03:38:11

  Modified:    hsql/src/java/org/apache/avalon/hsql/blocks
                        DefaultHypersonicSQL.java
  Added:       hsql/lib avalon-framework.jar
  Removed:     hsql/lib avalon-framework-4.1.2.jar
  Log:
  compose(..) becomes service(..)
  
  Revision  Changes    Path
  1.1                  jakarta-avalon-apps/hsql/lib/avalon-framework.jar
  
        <<Binary file>>
  
  
  1.5       +8 -8      
jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java
  
  Index: DefaultHypersonicSQL.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultHypersonicSQL.java 4 Mar 2002 16:20:37 -0000       1.4
  +++ DefaultHypersonicSQL.java 12 May 2002 10:38:11 -0000      1.5
  @@ -14,9 +14,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.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.hsql.services.HypersonicSQL;
  @@ -42,7 +42,7 @@
   public class DefaultHypersonicSQL
       extends AbstractLogEnabled
       implements Block, HypersonicSQL,
  -               Contextualizable, Composable, Configurable, Initializable, 
ConnectionHandlerFactory
  +               Contextualizable, Serviceable, Configurable, Initializable, 
ConnectionHandlerFactory
   {
       protected SocketManager       m_socketManager;
       protected ConnectionManager   m_connectionManager;
  @@ -99,13 +99,13 @@
           }
       }
   
  -    public void compose( final ComponentManager componentManager )
  -        throws ComponentException
  +    public void service( final ServiceManager serviceManager )
  +        throws ServiceException
       {
           getLogger().info("HypersonicSQL.compose()");
   
  -        m_socketManager = (SocketManager)componentManager.lookup( 
SocketManager.ROLE );
  -        m_connectionManager = (ConnectionManager)componentManager.lookup( 
ConnectionManager.ROLE );
  +        m_socketManager = (SocketManager)serviceManager.lookup( 
SocketManager.ROLE );
  +        m_connectionManager = (ConnectionManager)serviceManager.lookup( 
ConnectionManager.ROLE );
       }
   
       public void initialize()
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>