leif        2002/08/04 04:04:24

  Modified:    
instrument/example/managerICM/src/java/org/apache/excalibur/instrument/example_icm
                        Main.java
  Log:
  Update so that we don't use any deprecated code.
  
  Revision  Changes    Path
  1.3       +15 -13    
jakarta-avalon-excalibur/instrument/example/managerICM/src/java/org/apache/excalibur/instrument/example_icm/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/instrument/example/managerICM/src/java/org/apache/excalibur/instrument/example_icm/Main.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Main.java 4 Aug 2002 10:33:33 -0000       1.2
  +++ Main.java 4 Aug 2002 11:04:24 -0000       1.3
  @@ -14,7 +14,7 @@
   import org.apache.avalon.excalibur.component.DefaultRoleManager;
   import org.apache.excalibur.instrument.component.InstrumentComponentManager;
   import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
  -import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
  +import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
   import org.apache.avalon.excalibur.concurrent.ThreadBarrier;
   
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -72,36 +72,38 @@
           Configuration rolesConfig      = builder.build( "../conf/roles.xml" );
           Configuration componentsConfig = builder.build( "../conf/components.xml" );
   
  -        // Setup the LogKitManager
  -        DefaultLogKitManager logManager = new DefaultLogKitManager();
  +        // Create the default logger for the Logger Manager.
           Logger lmLogger = Hierarchy.getDefaultHierarchy().
               getLoggerFor( logKitConfig.getAttribute( "logger", "lm" ) );
           lmLogger.setPriority(
               Priority.getPriorityForName( logKitConfig.getAttribute( "log-level", 
"INFO" ) ) );
  -        logManager.setLogger( lmLogger );
  +        
  +        // Setup the LogKitLoggerManager
  +        LogKitLoggerManager logManager = new LogKitLoggerManager(
  +            null, Hierarchy.getDefaultHierarchy(), new LogKitLogger( lmLogger ) );
           logManager.contextualize( context );
           logManager.configure( logKitConfig );
   
           // Set up the Instrument Manager
           m_instrumentManager = new DefaultInstrumentManager();
  -        m_instrumentManager.enableLogging( new LogKitLogger(
  -            logManager.getLogger( instrumentConfig.getAttribute( "logger", "im" ) ) 
) );
  +        m_instrumentManager.enableLogging(
  +            logManager.getLoggerForCategory( instrumentConfig.getAttribute( 
"logger", "im" ) ) );
           m_instrumentManager.configure( instrumentConfig );
           m_instrumentManager.initialize();
   
           // Setup the RoleManager
           DefaultRoleManager roleManager = new DefaultRoleManager();
  -        roleManager.setLogger(
  -            logManager.getLogger( rolesConfig.getAttribute( "logger", "rm" ) ) );
  +        roleManager.enableLogging(
  +            logManager.getLoggerForCategory( rolesConfig.getAttribute( "logger", 
"rm" ) ) );
           roleManager.configure( rolesConfig );
   
           // Set up the ComponentManager
           m_componentManager = new InstrumentComponentManager();
  -        m_componentManager.setLogger(
  -            logManager.getLogger( componentsConfig.getAttribute( "logger", "cm" ) ) 
);
  -        m_componentManager.setLogKitManager( logManager );
  +        m_componentManager.enableLogging(
  +            logManager.getLoggerForCategory( componentsConfig.getAttribute( 
"logger", "cm" ) ) );
  +        m_componentManager.setLoggerManager( logManager );
           m_componentManager.contextualize( context );
  -        m_componentManager.setInstrumentManager( m_instrumentManager ); // <-- Set 
the instrument manager.
  +        m_componentManager.setInstrumentManager( m_instrumentManager );
           m_componentManager.setRoleManager( roleManager );
           m_componentManager.configure( componentsConfig );
           m_componentManager.initialize();
  
  
  

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

Reply via email to