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/logger/src/java/org/apache/avalon/excalibur/logger DefaultLogTargetFactoryManager.java
Date Tue, 21 May 2002 10:05:35 GMT
donaldp     02/05/21 03:05:35

  Modified:    logger/src/java/org/apache/avalon/excalibur/logger
                        DefaultLogTargetFactoryManager.java
  Log:
  Use ContainerUtil to handle lifecycle stuff.
  
  If ClassLoader supplied using context then use that
  to load target factorys.
  
  Revision  Changes    Path
  1.2       +35 -23    jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java
  
  Index: DefaultLogTargetFactoryManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultLogTargetFactoryManager.java	4 Apr 2002 02:34:14 -0000	1.1
  +++ DefaultLogTargetFactoryManager.java	21 May 2002 10:05:35 -0000	1.2
  @@ -12,18 +12,18 @@
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.logger.LogEnabled;
   
   /**
    * Default LogTargetFactoryManager implementation.  It populates the LogTargetFactoryManager
    * from a configuration file.
    *
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2002/04/04 02:34:14 $
  + * @version CVS $Revision: 1.2 $ $Date: 2002/05/21 10:05:35 $
    * @since 4.0
    */
   public class DefaultLogTargetFactoryManager
  @@ -37,6 +37,11 @@
       private Context m_context;
   
       /**
  +     * The classloader to use to load target factorys.
  +     */
  +    private ClassLoader m_classLoader;
  +
  +    /**
        * Retrieves a LogTargetFactory from a name. Usually
        * the factory name refers to a element name. If
        * this LogTargetFactoryManager does not have the match a null
  @@ -47,8 +52,7 @@
        */
       public final LogTargetFactory getLogTargetFactory( final String factoryName )
       {
  -        final LogTargetFactory factory = (LogTargetFactory)m_factories.get( factoryName
);
  -        return factory;
  +        return (LogTargetFactory)m_factories.get( factoryName );
       }
   
       /**
  @@ -61,6 +65,13 @@
           throws ContextException
       {
           m_context = context;
  +        try
  +        {
  +            m_classLoader = (ClassLoader)m_context.get( "classloader" );
  +        }
  +        catch( ContextException ce )
  +        {
  +        }
       }
   
       /**
  @@ -85,9 +96,21 @@
               {
                   Class clazz = null;
   
  -                //First lets try the context ClassLoader
  +                //First lets try the supplied ClassLoader
  +                if( null != m_classLoader )
  +                {
  +                    try
  +                    {
  +                        clazz = m_classLoader.loadClass( factoryClass );
  +                    }
  +                    catch( final ClassNotFoundException cnfe )
  +                    {
  +                    }
  +                }
  +
  +                //Next lets try the context ClassLoader
                   final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
  -                if( null != classLoader )
  +                if( null == clazz && null != classLoader )
                   {
                       try
                       {
  @@ -119,27 +142,16 @@
                   throw new ConfigurationException( "cannot access LogTargetFactory class
" + factoryClass, iae );
               }
   
  -            if( logTargetFactory instanceof LogEnabled )
  +            ContainerUtil.enableLogging( logTargetFactory, getLogger() );
  +            try
               {
  -                ( (LogEnabled)logTargetFactory ).enableLogging( getLogger() );
  +                ContainerUtil.contextualize( logTargetFactory, m_context );
               }
  -
  -            if( logTargetFactory instanceof Contextualizable )
  -            {
  -                try
  -                {
  -                    ( (Contextualizable)logTargetFactory ).contextualize( m_context );
  -                }
  -                catch( final ContextException ce )
  -                {
  -                    throw new ConfigurationException( "cannot contextualize LogTargetFactory
" + factoryClass, ce );
  -                }
  -            }
  -
  -            if( logTargetFactory instanceof Configurable )
  +            catch( final ContextException ce )
               {
  -                ( (Configurable)logTargetFactory ).configure( confs[ i ] );
  +                throw new ConfigurationException( "cannot contextualize LogTargetFactory
" + factoryClass, ce );
               }
  +            ContainerUtil.configure( logTargetFactory, confs[ i ] );
   
               if( logTargetFactory instanceof LogTargetFactoryManageable )
               {
  
  
  

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