avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util ContextManager.java ContextBuilder.java
Date Sun, 10 Nov 2002 03:26:43 GMT
donaldp     2002/11/09 19:26:43

  Modified:    fortress/src/java/org/apache/excalibur/fortress/util
                        ContextManager.java ContextBuilder.java
  Log:
  naming
  
  Revision  Changes    Path
  1.50      +6 -6      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- ContextManager.java	10 Nov 2002 02:39:51 -0000	1.49
  +++ ContextManager.java	10 Nov 2002 03:26:43 -0000	1.50
  @@ -73,6 +73,8 @@
   import org.apache.excalibur.event.command.CommandManager;
   import org.apache.excalibur.event.command.TPCThreadManager;
   import org.apache.excalibur.event.command.ThreadManager;
  +import org.apache.excalibur.fortress.role.ConfigurableRoleManager;
  +import org.apache.excalibur.fortress.role.ExcaliburRoleManager;
   import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
   import org.apache.excalibur.mpool.DefaultPoolManager;
   import org.apache.excalibur.mpool.PoolManager;
  @@ -80,8 +82,6 @@
   import org.apache.excalibur.source.SourceResolver;
   import org.apache.excalibur.source.impl.ResourceSourceFactory;
   import org.apache.excalibur.source.impl.SourceResolverImpl;
  -import org.apache.excalibur.fortress.role.ExcaliburRoleManager;
  -import org.apache.excalibur.fortress.role.ConfigurableRoleManager;
   import org.apache.log.Hierarchy;
   import org.apache.log.Priority;
   
  @@ -777,11 +777,11 @@
                   loggerManagerConfig.getAttribute( "log-level", "DEBUG" ) ) );
   
               // Setup the Logger Manager
  -            LogKitLoggerManager logManager = new LogKitLoggerManager(
  +            LoggerManager logManager = new LogKitLoggerManager(
                   logPrefix, Hierarchy.getDefaultHierarchy(),
                   new LogKitLogger( lmDefaultLogger ), new LogKitLogger( lmLogger ) );
  -            logManager.contextualize( m_rootContext );
  -            logManager.configure( loggerManagerConfig );
  +            ContainerUtil.contextualize( logManager, m_rootContext );
  +            ContainerUtil.configure( logManager, loggerManagerConfig );
   
               assumeOwnership( logManager );
   
  
  
  
  1.27      +5 -4      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ContextBuilder.java	10 Nov 2002 02:39:51 -0000	1.26
  +++ ContextBuilder.java	10 Nov 2002 03:26:43 -0000	1.27
  @@ -64,7 +64,8 @@
   /**
    * Helper class to create a context for the ContextManager.
    */
  -public class ContextBuilder implements ContextManagerConstants
  +public class ContextBuilder
  +    implements ContextManagerConstants
   {
       private final DefaultContext context;
   
  @@ -108,13 +109,13 @@
       /**
        * Creates a default context.
        */
  -    public static final Context createDefaultContext( ClassLoader contextClassLoader )
  +    public static final Context createDefaultContext( ClassLoader classLoader )
       {
           DefaultContext defaultContext = new DefaultContext();
   
           try
           {
  -            defaultContext.put( CONTAINER_CLASS, contextClassLoader.loadClass(
  +            defaultContext.put( CONTAINER_CLASS, classLoader.loadClass(
                   "org.apache.excalibur.fortress.container.DefaultContainer" ) );
           }
           catch( Exception e )
  @@ -127,7 +128,7 @@
           defaultContext.put( CONTEXT_DIRECTORY, new File( "../" ) );
           defaultContext.put( WORK_DIRECTORY, new File( "/tmp" ) );
           defaultContext.put( LOG_CATEGORY, "fortress" );
  -        defaultContext.put( CONTEXT_CLASSLOADER, contextClassLoader );
  +        defaultContext.put( CONTEXT_CLASSLOADER, classLoader );
           defaultContext.put( CONFIGURATION_URI, "conf/system.xconf" );
           defaultContext.put( LOGGER_MANAGER_CONFIGURATION_URI, "conf/logkit.xconf" );
           defaultContext.put( ROLE_MANAGER_CONFIGURATION_URI, "resource://ext/system.roles"
);
  
  
  

--
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