cvs commit: jakarta-avalon-excalibur/util/src/test/org/apache/excalibur/util/test FullLifecycleComponent.java

[donaldp]

donaldp     2002/11/06 20:54:51

  Modified:    util/src/test/org/apache/excalibur/util/test
                        FullLifecycleComponent.java
  Log:
  Composable --> Serviceable.
  
  Revision  Changes    Path
  1.4       +11 -10    
jakarta-avalon-excalibur/util/src/test/org/apache/excalibur/util/test/FullLifecycleComponent.java
  
  Index: FullLifecycleComponent.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/util/src/test/org/apache/excalibur/util/test/FullLifecycleComponent.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FullLifecycleComponent.java       2 Oct 2002 01:52:24 -0000       1.3
  +++ FullLifecycleComponent.java       7 Nov 2002 04:54:51 -0000       1.4
  @@ -11,9 +11,6 @@
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.activity.Suspendable;
  -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;
  @@ -25,6 +22,9 @@
   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.avalon.framework.thread.ThreadSafe;
   import org.apache.excalibur.util.ComponentStateValidator;
   
  @@ -36,7 +36,7 @@
    */
   public final class FullLifecycleComponent
       implements LogEnabled, Contextualizable, Parameterizable, Configurable,
  -    Composable, Initializable, Startable, Suspendable, Disposable,
  +    Serviceable, Initializable, Startable, Suspendable, Disposable,
       ThreadSafe
   {
       private ComponentStateValidator m_validator = new ComponentStateValidator( this 
);
  @@ -44,7 +44,7 @@
       private Context m_context;
       private Parameters m_parameters;
       private Configuration m_configuration;
  -    private ComponentManager m_componentManager;
  +    private ServiceManager m_manager;
   
       public void enableLogging( Logger logger )
       {
  @@ -81,11 +81,12 @@
           m_configuration = config;
       }
   
  -    public void compose( ComponentManager manager )
  -        throws ComponentException
  +    public void service( ServiceManager manager )
  +        throws ServiceException
       {
  -        m_validator.checkNotAssigned( m_componentManager );
  +        m_validator.checkNotAssigned( m_manager );
           m_validator.checkComposed();
  +        m_manager = manager;
       }
   
       public void initialize()
  @@ -124,6 +125,6 @@
           m_context = null;
           m_parameters = null;
           m_configuration = null;
  -        m_componentManager = null;
  +        m_manager = null;
       }
   }
  
  
  

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