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/component/src/java/org/apache/avalon/excalibur/component ComponentHandler.java DefaultComponentFactory.java DefaultComponentHandler.java ExcaliburComponentManager.java ExcaliburComponentSelector.java LogkitLoggerManager.java PoolableComponentHandler.java ThreadSafeComponentHandler.java
Date Sat, 18 May 2002 06:08:35 GMT
donaldp     02/05/17 23:08:35

  Modified:    component/src/java/org/apache/avalon/excalibur/component
                        Tag: ECM_LOGENABLED ComponentHandler.java
                        DefaultComponentFactory.java
                        DefaultComponentHandler.java
                        ExcaliburComponentManager.java
                        ExcaliburComponentSelector.java
                        LogkitLoggerManager.java
                        PoolableComponentHandler.java
                        ThreadSafeComponentHandler.java
  Log:
  LogKitManager no longer required, can now use LoggerManager.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +2 -3      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ComponentHandler.java
  
  Index: ComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ComponentHandler.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- ComponentHandler.java	18 May 2002 05:35:49 -0000	1.2.2.2
  +++ ComponentHandler.java	18 May 2002 06:08:34 -0000	1.2.2.3
  @@ -7,7 +7,6 @@
    */
   package org.apache.avalon.excalibur.component;
   
  -import org.apache.avalon.excalibur.logger.LogKitManager;
   import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  @@ -25,7 +24,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:ryan@silveregg.co.jp">Ryan Shaw</a>
    * @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
  - * @version CVS $Revision: 1.2.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.2.2.3 $ $Date: 2002/05/18 06:08:34 $
    * @since 4.0
    */
   public abstract class ComponentHandler
  @@ -41,7 +40,7 @@
           final ComponentManager manager,
           final Context context,
           final RoleManager roles,
  -        final LogKitManager logkit )
  +        final LogkitLoggerManager logkit )
           throws Exception
       {
           int numInterfaces = 0;
  
  
  
  1.2.2.3   +7 -9      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
  
  Index: DefaultComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- DefaultComponentFactory.java	18 May 2002 05:35:49 -0000	1.2.2.2
  +++ DefaultComponentFactory.java	18 May 2002 06:08:34 -0000	1.2.2.3
  @@ -11,7 +11,6 @@
   import java.util.Collection;
   import org.apache.avalon.excalibur.collections.BucketMap;
   import org.apache.avalon.excalibur.logger.LogKitManageable;
  -import org.apache.avalon.excalibur.logger.LogKitManager;
   import org.apache.avalon.excalibur.pool.ObjectFactory;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  @@ -25,7 +24,6 @@
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.logger.LogKitLogger;
   import org.apache.avalon.framework.logger.Loggable;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -37,7 +35,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
    * @author <a href="mailto:ryan@silveregg.co.jp">Ryan Shaw</a>
  - * @version CVS $Revision: 1.2.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.2.2.3 $ $Date: 2002/05/18 06:08:34 $
    * @since 4.0
    */
   public class DefaultComponentFactory
  @@ -65,9 +63,9 @@
        */
       private RoleManager m_roles;
   
  -    /** The LogKitManager for child ComponentSelectors
  +    /** The LogkitLoggerManager for child ComponentSelectors
        */
  -    private LogKitManager m_logkit;
  +    private LogkitLoggerManager m_logkit;
   
       /** Components created by this factory, and their associated ComponentManager
        *  proxies, if they are Composables.
  @@ -88,7 +86,7 @@
                                       final ComponentManager componentManager,
                                       final Context context,
                                       final RoleManager roles,
  -                                    final LogKitManager logkit )
  +                                    final LogkitLoggerManager logkit )
       {
           m_componentClass = componentClass;
           m_configuration = configuration;
  @@ -126,7 +124,7 @@
                   else
                   {
                       getLogger().debug( "logger attribute is " + logger );
  -                    ( (LogEnabled)component ).enableLogging( new LogKitLogger( m_logkit.getLogger(
logger ) ) );
  +                    ( (LogEnabled)component ).enableLogging( m_logkit.getLoggerForCategory(
logger ) );
                   }
               }
           }
  @@ -148,7 +146,7 @@
                   else
                   {
                       getLogger().debug( "logger attribute is " + logger );
  -                    ( (Loggable)component ).setLogger( m_logkit.getLogger( logger ) );
  +                    ( (Loggable)component ).setLogger( m_logkit.getLogKitLoggerForCategory(
logger ) );
                   }
               }
           }
  @@ -179,7 +177,7 @@
   
           if( component instanceof LogKitManageable )
           {
  -            ( (LogKitManageable)component ).setLogKitManager( m_logkit );
  +            ( (LogKitManageable)component ).setLogKitManager( m_logkit.getLogKitManager()
);
           }
   
           if( component instanceof Configurable )
  
  
  
  1.1.2.3   +2 -3      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java
  
  Index: DefaultComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- DefaultComponentHandler.java	18 May 2002 05:35:49 -0000	1.1.2.2
  +++ DefaultComponentHandler.java	18 May 2002 06:08:34 -0000	1.1.2.3
  @@ -7,7 +7,6 @@
    */
   package org.apache.avalon.excalibur.component;
   
  -import org.apache.avalon.excalibur.logger.LogKitManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -21,7 +20,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:ryan@silveregg.co.jp">Ryan Shaw</a>
    * @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2002/05/18 06:08:34 $
    * @since 4.0
    */
   public class DefaultComponentHandler
  @@ -46,7 +45,7 @@
                                          final ComponentManager manager,
                                          final Context context,
                                          final RoleManager roles,
  -                                       final LogKitManager logkit )
  +                                       final LogkitLoggerManager logkit )
           throws Exception
       {
           this(
  
  
  
  1.5.2.3   +16 -4     jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java
  
  Index: ExcaliburComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- ExcaliburComponentManager.java	18 May 2002 05:35:49 -0000	1.5.2.2
  +++ ExcaliburComponentManager.java	18 May 2002 06:08:35 -0000	1.5.2.3
  @@ -13,6 +13,7 @@
   import org.apache.avalon.excalibur.collections.BucketMap;
   import org.apache.avalon.excalibur.logger.LogKitManageable;
   import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
  @@ -31,7 +32,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
    * @author <a href="mailto:ryan@silveregg.co.jp">Ryan Shaw</a>
  - * @version CVS $Revision: 1.5.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.5.2.3 $ $Date: 2002/05/18 06:08:35 $
    * @since 4.0
    */
   public class ExcaliburComponentManager
  @@ -63,7 +64,7 @@
       private RoleManager m_roles;
   
       /** LogKitManager. */
  -    private LogKitManager m_logkit;
  +    private LogkitLoggerManager m_logkit;
   
       /** Is the Manager disposed or not? */
       private boolean m_disposed;
  @@ -490,7 +491,18 @@
       {
           if( null == m_logkit )
           {
  -            m_logkit = logkit;
  +            m_logkit = new LogkitLoggerManager( null, logkit );
  +        }
  +    }
  +
  +    /**
  +     * Configure the LoggerManager.
  +     */
  +    public void setLoggerManager( final LoggerManager logkit )
  +    {
  +        if( null == m_logkit )
  +        {
  +            m_logkit = new LogkitLoggerManager( logkit, null );
           }
       }
   
  @@ -569,7 +581,7 @@
                                                       final Configuration configuration,
                                                       final Context context,
                                                       final RoleManager roleManager,
  -                                                    final LogKitManager logkitManager )
  +                                                    final LogkitLoggerManager logkitManager
)
           throws Exception
       {
           return ComponentHandler.getComponentHandler( componentClass,
  
  
  
  1.4.2.3   +17 -4     jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java
  
  Index: ExcaliburComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- ExcaliburComponentSelector.java	18 May 2002 05:35:49 -0000	1.4.2.2
  +++ ExcaliburComponentSelector.java	18 May 2002 06:08:35 -0000	1.4.2.3
  @@ -13,6 +13,7 @@
   import org.apache.avalon.excalibur.collections.BucketMap;
   import org.apache.avalon.excalibur.logger.LogKitManageable;
   import org.apache.avalon.excalibur.logger.LogKitManager;
  +import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
  @@ -32,7 +33,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.4.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.4.2.3 $ $Date: 2002/05/18 06:08:35 $
    * @since 4.0
    */
   public class ExcaliburComponentSelector
  @@ -92,7 +93,7 @@
   
       /** The RoleManager to get hint shortcuts
        */
  -    private LogKitManager m_logkit;
  +    private LogkitLoggerManager m_logkit;
   
       /** Create the ComponentSelector */
       public ExcaliburComponentSelector()
  @@ -378,6 +379,7 @@
           }
       }
   
  +
       /**
        * Configure the LogKitManager
        */
  @@ -385,7 +387,18 @@
       {
           if( null == m_logkit )
           {
  -            m_logkit = logkit;
  +            m_logkit = new LogkitLoggerManager( null, logkit );
  +        }
  +    }
  +
  +    /**
  +     * Configure the LoggerManager.
  +     */
  +    public void setLoggerManager( final LoggerManager logkit )
  +    {
  +        if( null == m_logkit )
  +        {
  +            m_logkit = new LogkitLoggerManager( logkit, null );
           }
       }
   
  @@ -457,7 +470,7 @@
                                                       final ComponentManager componentManager,
                                                       final Context context,
                                                       final RoleManager roleManager,
  -                                                    final LogKitManager logkitManager )
  +                                                    final LogkitLoggerManager logkitManager
)
           throws Exception
       {
           return ComponentHandler.getComponentHandler( componentClass,
  
  
  
  1.1.2.2   +3 -3      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/Attic/LogkitLoggerManager.java
  
  Index: LogkitLoggerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/Attic/LogkitLoggerManager.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LogkitLoggerManager.java	18 May 2002 05:55:04 -0000	1.1.2.1
  +++ LogkitLoggerManager.java	18 May 2002 06:08:35 -0000	1.1.2.2
  @@ -13,12 +13,12 @@
   import org.apache.avalon.framework.logger.Logger;
   
   /**
  - *
  + * An adaptor class to help with backwards comaptability.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.1.2.1 $ $Date: 2002/05/18 05:55:04 $
  + * @version $Revision: 1.1.2.2 $ $Date: 2002/05/18 06:08:35 $
    */
  -public class LogkitLoggerManager
  +class LogkitLoggerManager
       implements LoggerManager
   {
       private LoggerManager m_loggerManager;
  
  
  
  1.3.2.3   +2 -3      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java
  
  Index: PoolableComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java,v
  retrieving revision 1.3.2.2
  retrieving revision 1.3.2.3
  diff -u -r1.3.2.2 -r1.3.2.3
  --- PoolableComponentHandler.java	18 May 2002 05:35:49 -0000	1.3.2.2
  +++ PoolableComponentHandler.java	18 May 2002 06:08:35 -0000	1.3.2.3
  @@ -7,7 +7,6 @@
    */
   package org.apache.avalon.excalibur.component;
   
  -import org.apache.avalon.excalibur.logger.LogKitManager;
   import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.excalibur.pool.ResourceLimitingPool;
   import org.apache.avalon.framework.activity.Disposable;
  @@ -80,7 +79,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
    * @author <a href="mailto:ryan@silveregg.co.jp">Ryan Shaw</a>
  - * @version CVS $Revision: 1.3.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.3.2.3 $ $Date: 2002/05/18 06:08:35 $
    * @since 4.0
    */
   public class PoolableComponentHandler
  @@ -111,7 +110,7 @@
                                           final ComponentManager manager,
                                           final Context context,
                                           final RoleManager roles,
  -                                        final LogKitManager logkit )
  +                                        final LogkitLoggerManager logkit )
           throws Exception
       {
           this(
  
  
  
  1.2.2.3   +2 -3      jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java
  
  Index: ThreadSafeComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- ThreadSafeComponentHandler.java	18 May 2002 05:35:49 -0000	1.2.2.2
  +++ ThreadSafeComponentHandler.java	18 May 2002 06:08:35 -0000	1.2.2.3
  @@ -7,7 +7,6 @@
    */
   package org.apache.avalon.excalibur.component;
   
  -import org.apache.avalon.excalibur.logger.LogKitManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.component.Component;
  @@ -22,7 +21,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:ryan@silveregg.co.jp">Ryan Shaw</a>
    * @author <a href="mailto:leif@tanukisoftware.com">Leif Mortenson</a>
  - * @version CVS $Revision: 1.2.2.2 $ $Date: 2002/05/18 05:35:49 $
  + * @version CVS $Revision: 1.2.2.3 $ $Date: 2002/05/18 06:08:35 $
    * @since 4.0
    */
   public class ThreadSafeComponentHandler
  @@ -43,7 +42,7 @@
                                             final ComponentManager manager,
                                             final Context context,
                                             final RoleManager roles,
  -                                          final LogKitManager logkit )
  +                                          final LogkitLoggerManager logkit )
           throws Exception
       {
           this(
  
  
  

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