avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util AbstractRoleManager.java ContextManager.java ExcaliburRoleManager.java
Date Wed, 07 Aug 2002 13:16:54 GMT
bloritsch    2002/08/07 06:16:54

  Modified:    fortress/src/java/org/apache/excalibur/fortress/util
                        AbstractRoleManager.java ContextManager.java
                        ExcaliburRoleManager.java
  Log:
  Resolve conflicts with CVS
  
  Revision  Changes    Path
  1.12      +6 -5      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java
  
  Index: AbstractRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractRoleManager.java	7 Aug 2002 04:55:55 -0000	1.11
  +++ AbstractRoleManager.java	7 Aug 2002 13:16:54 -0000	1.12
  @@ -127,7 +127,7 @@
       {
           final Class klass;
           Class handlerKlass;
  -        
  +
           if ( getLogger().isDebugEnabled() )
           {
               getLogger().debug( "setup role: name='" + shortName + "', role='" + role +
"', "
  @@ -193,7 +193,7 @@
           {
               component = m_parent.getClassForName( shorthandName );
           }
  -        
  +
           if ( getLogger().isDebugEnabled() )
           {
               if ( component == null )
  @@ -277,7 +277,7 @@
                       + "' returning '" + handler.getName() + "'" );
               }
           }
  -        
  +
           return handler;
       }
   
  @@ -338,7 +338,7 @@
                       + "' returning [" + sb + "]" );
               }
           }
  -        
  +
           return classAry;
       }
   
  @@ -378,3 +378,4 @@
           return role;
       }
   }
  +
  
  
  
  1.35      +10 -9     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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ContextManager.java	7 Aug 2002 09:56:33 -0000	1.34
  +++ ContextManager.java	7 Aug 2002 13:16:54 -0000	1.35
  @@ -164,7 +164,7 @@
       private Logger logger;
       private final Logger primordialLogger;
       private ComponentManager manager;
  -    
  +
       /**
        * The components that are "owned" by this context and should
        * be disposed by it. Any manager that is created as a result
  @@ -455,7 +455,7 @@
   
           // Get the logger for the thread manager
           Logger tmLogger = loggerManager.getLoggerForCategory( "system.threadmgr" );
  -        
  +
           ContainerUtil.enableLogging( tm, tmLogger );
           ContainerUtil.parameterize( tm, buildCommandQueueConfig() );
           ContainerUtil.initialize( tm );
  @@ -565,12 +565,12 @@
           // Create a logger for the role manager
           Logger rmLogger = loggerManager.getLoggerForCategory(
               roleConfig.getAttribute( "logger", "system.roles" ) );
  -            
  +
           // Create a parent role manager with all the default roles
           ExcaliburRoleManager erm = new ExcaliburRoleManager();
           erm.enableLogging( rmLogger.getChildLogger( "defaults" ) );
           erm.initialize();
  -        
  +
           // Create a role manager with the configured roles
           ConfigurableRoleManager rm = new ConfigurableRoleManager( erm );
           rm.enableLogging( rmLogger );
  @@ -730,7 +730,7 @@
               if( loggerManagerConfig == null )
               {
                   // No config specified.
  -                
  +
                   // Does the parent supply a logger manager?
                   try
                   {
  @@ -746,7 +746,7 @@
                       loggerManagerConfig = EMPTY_CONFIG;
                   }
               }
  -            
  +
               // Resolve the prefix to use for this Logger Manager
               String logPrefix = (String)get( rootContext, LOG_CATEGORY,
                   get( childContext, LOG_CATEGORY, null ) );
  @@ -843,14 +843,14 @@
   
                   instrumentConfig = EMPTY_CONFIG;
               }
  -            
  +
               // Get the context Logger Manager
               LoggerManager loggerManager = (LoggerManager)childContext.get( LOGGER_MANAGER
);
   
               // Get the logger for the instrument manager
               Logger imLogger = loggerManager.getLoggerForCategory(
                   instrumentConfig.getAttribute( "logger", "system.instrument" ) );
  -            
  +
               // Set up the Instrument Manager
               DefaultInstrumentManager instrumentManager = new DefaultInstrumentManager();
               instrumentManager.enableLogging( imLogger );
  @@ -863,3 +863,4 @@
           }
       }
   }
  +
  
  
  
  1.15      +3 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
  
  Index: ExcaliburRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ExcaliburRoleManager.java	7 Aug 2002 04:55:55 -0000	1.14
  +++ ExcaliburRoleManager.java	7 Aug 2002 13:16:54 -0000	1.15
  @@ -96,7 +96,7 @@
       {
           super( parent, loader );
       }
  -    
  +
       /**
        * Initialize the role manager.
        */
  @@ -177,3 +177,4 @@
           m_handlerNames = Collections.unmodifiableMap( handlers );
       }
   }
  +
  
  
  

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