avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel DefaultKernel.java
Date Mon, 17 Mar 2003 03:45:58 GMT
proyal      2003/03/16 19:45:58

  Modified:    src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultKernel.java
  Log:
  * s/componentManager/serviceManager/
  * put InstrumentManager in the ServiceManager we pass out
  
  Revision  Changes    Path
  1.87      +13 -7     avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- DefaultKernel.java	1 Mar 2003 08:39:14 -0000	1.86
  +++ DefaultKernel.java	17 Mar 2003 03:45:58 -0000	1.87
  @@ -35,6 +35,7 @@
   import org.apache.avalon.phoenix.interfaces.Kernel;
   import org.apache.avalon.phoenix.interfaces.KernelMBean;
   import org.apache.avalon.phoenix.interfaces.SystemManager;
  +import org.apache.excalibur.instrument.InstrumentManager;
   
   /**
    * The ServerKernel is the core of the Phoenix system.
  @@ -77,6 +78,9 @@
       //Configuration Validator
       private ConfigurationValidator m_validator;
   
  +    //Instrument Manager
  +    private InstrumentManager m_instrumentManager;
  +
       private final HashMap m_entries = new HashMap();
   
       private boolean m_addInvalidApplications;
  @@ -88,6 +92,7 @@
           m_repository = (ConfigurationRepository)serviceManager.
               lookup( ConfigurationRepository.ROLE );
           m_validator = (ConfigurationValidator)serviceManager.lookup( ConfigurationValidator.ROLE
);
  +        m_instrumentManager = (InstrumentManager)serviceManager.lookup( InstrumentManager.ROLE
);
       }
   
       public void configure( final Configuration configuration )
  @@ -312,13 +317,14 @@
   
       private ServiceManager createServiceManager()
       {
  -        final DefaultServiceManager componentManager = new DefaultServiceManager();
  -        componentManager.put( SystemManager.ROLE, m_systemManager );
  -        componentManager.put( ConfigurationRepository.ROLE, m_repository );
  -        componentManager.put( ConfigurationValidator.ROLE, m_validator );
  -        componentManager.put( Kernel.ROLE, this );
  -        componentManager.makeReadOnly();
  -        return componentManager;
  +        final DefaultServiceManager serviceManager = new DefaultServiceManager();
  +        serviceManager.put( SystemManager.ROLE, m_systemManager );
  +        serviceManager.put( ConfigurationRepository.ROLE, m_repository );
  +        serviceManager.put( ConfigurationValidator.ROLE, m_validator );
  +        serviceManager.put( InstrumentManager.ROLE, m_instrumentManager );
  +        serviceManager.put( Kernel.ROLE, this );
  +        serviceManager.makeReadOnly();
  +        return serviceManager;
       }
   
       public void removeApplication( final String name )
  
  
  

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


Mime
View raw message