avalon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection AbstractHandlerFactory.java AbstractService.java
Date Fri, 09 Nov 2001 21:07:54 GMT
donaldp     01/11/09 13:07:54

  Modified:    .        build.xml
               src/java/org/apache/avalon/cornerstone/blocks/connection
                        Connection.java DefaultConnectionManager.java
               src/java/org/apache/avalon/cornerstone/blocks/datasource
                        DefaultDataSourceSelector.java
               src/java/org/apache/avalon/cornerstone/blocks/dom
                        DOMBuilderFactory.java
               src/java/org/apache/avalon/cornerstone/blocks/masterstore
                        AbstractFileRepository.java RepositoryManager.java
               src/java/org/apache/avalon/cornerstone/blocks/packet
                        Acceptor.java DefaultPacketManager.java
               src/java/org/apache/avalon/cornerstone/blocks/scheduler
                        DefaultTimeScheduler.java
               src/java/org/apache/avalon/cornerstone/blocks/soapification/glue
                        Glue.java
               src/java/org/apache/avalon/cornerstone/blocks/sockets
                        DefaultSocketManager.java
                        TLSServerSocketFactory.java
               src/java/org/apache/avalon/cornerstone/blocks/threads
                        DefaultThreadManager.java
               src/java/org/apache/avalon/cornerstone/services/connection
                        AbstractHandlerFactory.java AbstractService.java
  Added:       lib      avalon-excalibur-20011110.jar
                        avalon-framework-20011110.jar
                        avalon-scratchpad-20011110.jar logkit-1.0.jar
                        phoenix-client-20011110.jar
  Removed:     lib      avalon-excalibur-20010919.jar avalon-framework.jar
                        avalon-scratchpad-20010919.jar logkit.jar
                        phoenix-client-20011022.jar
  Log:
  Update base cornerstone classes to use LogEnabled rather than Loggable.
  
  Updated all jars to latest versions.
  
  Revision  Changes    Path
  1.73      +7 -9      jakarta-avalon-cornerstone/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/build.xml,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- build.xml	2001/11/02 22:14:27	1.72
  +++ build.xml	2001/11/09 21:07:53	1.73
  @@ -50,12 +50,11 @@
     <property name="dist.base" value="distributions"/>
   
     <property name="xerces.jar" value="${tools.dir}/lib/xerces.jar"/>
  -  <property name="logkit.jar" value="${lib.dir}/logkit.jar"/>
  -  <property name="framework.jar" value="${lib.dir}/avalon-framework.jar"/>
  -  <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20010919.jar"/>
  -  <property name="scratchpad.jar" value="${lib.dir}/avalon-scratchpad-20010919.jar"/>
  -  <property name="phoenix-client.jar" value="${lib.dir}/phoenix-client.jar"/>
  -  <property name="testlet.jar" value="${tools.dir}/lib/testlet.jar"/>
  +  <property name="logkit.jar" value="${lib.dir}/logkit-1.0.jar"/>
  +  <property name="framework.jar" value="${lib.dir}/avalon-framework-20011110.jar"/>
  +  <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20011110.jar"/>
  +  <property name="scratchpad.jar" value="${lib.dir}/avalon-scratchpad-20011110.jar"/>
  +  <property name="phoenix-client.jar" value="${lib.dir}/phoenix-client-20011110.jar"/>
     <property name="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
     <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
   
  @@ -64,16 +63,15 @@
       <pathelement location="${excalibur.jar}"/>
       <pathelement location="${scratchpad.jar}"/>
       <pathelement location="${logkit.jar}"/>
  -    <pathelement location="${testlet.jar}"/>
       <pathelement location="${junit.jar}"/>
       <pathelement location="${xerces.jar}"/>
       <pathelement location="${phoenix-client.jar}"/>
       <pathelement path="${java.class.path}" />
       <fileset dir="${lib.dir}">
         <include name="*.jar" />
  -      <exclude name="phoenix-client.jar"/>
  +      <exclude name="phoenix-client*.jar"/>
         <exclude name="avalon-*"/>
  -      <exclude name="logkit.jar"/>
  +      <exclude name="logkit*.jar"/>
       </fileset>
       <pathelement path="${build.classes}" />
     </path>
  
  
  
  1.1                  jakarta-avalon-cornerstone/lib/avalon-excalibur-20011110.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-avalon-cornerstone/lib/avalon-framework-20011110.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-avalon-cornerstone/lib/avalon-scratchpad-20011110.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-avalon-cornerstone/lib/logkit-1.0.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-avalon-cornerstone/lib/phoenix-client-20011110.jar
  
  	<<Binary file>>
  
  
  1.5       +3 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java
  
  Index: Connection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Connection.java	2001/09/07 03:06:51	1.4
  +++ Connection.java	2001/11/09 21:07:54	1.5
  @@ -16,7 +16,7 @@
   import java.util.Vector;
   import java.util.Iterator;
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
   import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
   import org.apache.avalon.excalibur.thread.ThreadPool;
  @@ -28,7 +28,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   class Connection
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Component, Runnable
   {
       private final ServerSocket               m_serverSocket;
  @@ -120,7 +120,7 @@
   }
   
   class ConnectionRunner
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Runnable, Component
   {
       private Socket             m_socket;
  
  
  
  1.8       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java
  
  Index: DefaultConnectionManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultConnectionManager.java	2001/10/06 01:31:56	1.7
  +++ DefaultConnectionManager.java	2001/11/09 21:07:54	1.8
  @@ -21,7 +21,7 @@
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.Block;
   
   /**
  @@ -30,7 +30,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class DefaultConnectionManager
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, ConnectionManager, Composable, Disposable
   {
       private HashMap             m_connections        = new HashMap();
  
  
  
  1.11      +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
  
  Index: DefaultDataSourceSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultDataSourceSelector.java	2001/09/24 07:25:01	1.10
  +++ DefaultDataSourceSelector.java	2001/11/09 21:07:54	1.11
  @@ -16,7 +16,7 @@
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
   import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   import org.apache.avalon.phoenix.Block;
  @@ -44,7 +44,7 @@
    * @author <a href="mailto:colus@isoft.co.kr">Eung-ju Park</a>
    */
   public class DefaultDataSourceSelector
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements DataSourceSelector, Block, Configurable, Initializable, Disposable
   {
       private Configuration m_configuration;
  
  
  
  1.2       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/dom/DOMBuilderFactory.java
  
  Index: DOMBuilderFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/dom/DOMBuilderFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMBuilderFactory.java	2001/11/03 13:22:34	1.1
  +++ DOMBuilderFactory.java	2001/11/09 21:07:54	1.2
  @@ -8,7 +8,7 @@
   package org.apache.avalon.cornerstone.blocks.dom;
   
   import org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -25,7 +25,7 @@
    * @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
    */
   public class DOMBuilderFactory 
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, Configurable, DocumentBuilderFactory
   {
       protected javax.xml.parsers.DocumentBuilderFactory m_documentBuilderFactory;
  
  
  
  1.3       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java
  
  Index: AbstractFileRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractFileRepository.java	2001/09/20 07:20:37	1.2
  +++ AbstractFileRepository.java	2001/11/09 21:07:54	1.3
  @@ -29,7 +29,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
  @@ -40,7 +40,7 @@
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
    */
   public abstract class AbstractFileRepository
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, Repository, Contextualizable, Composable, Configurable, Initializable
   {
       protected static final boolean      DEBUG          = false;
  
  
  
  1.3       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
  
  Index: RepositoryManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RepositoryManager.java	2001/08/06 01:59:43	1.2
  +++ RepositoryManager.java	2001/11/09 21:07:54	1.3
  @@ -21,7 +21,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.store.Repository;
   import org.apache.avalon.cornerstone.services.store.Store;
   import org.apache.avalon.phoenix.Block;
  @@ -31,7 +31,7 @@
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
    */
   public class RepositoryManager
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, Store, Contextualizable, Composable, Configurable
   {
       private static final String   REPOSITORY_NAME  = "Repository";
  
  
  
  1.2       +3 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/Acceptor.java
  
  Index: Acceptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/Acceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Acceptor.java	2001/04/27 05:25:58	1.1
  +++ Acceptor.java	2001/11/09 21:07:54	1.2
  @@ -13,7 +13,7 @@
   import java.util.ArrayList;
   import java.util.Iterator;
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.packet.PacketHandler;
   import org.apache.avalon.cornerstone.services.packet.PacketHandlerFactory;
   import org.apache.avalon.excalibur.thread.ThreadPool;
  @@ -25,7 +25,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   class Acceptor
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Component, Runnable
   {
       protected final DatagramSocket          m_datagramSocket;
  @@ -107,7 +107,7 @@
   }
   
   class PacketHandlerRunner
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Runnable, Component
   {
       protected DatagramPacket  m_packet;
  
  
  
  1.5       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java
  
  Index: DefaultPacketManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/packet/DefaultPacketManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultPacketManager.java	2001/09/20 00:53:59	1.4
  +++ DefaultPacketManager.java	2001/11/09 21:07:54	1.5
  @@ -20,7 +20,7 @@
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.Block;
   
   /**
  @@ -29,7 +29,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class DefaultPacketManager
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, PacketManager, Composable, Disposable
   {
       private HashMap             m_acceptors        = new HashMap();
  
  
  
  1.6       +3 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
  
  Index: DefaultTimeScheduler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultTimeScheduler.java	2001/11/02 23:42:13	1.5
  +++ DefaultTimeScheduler.java	2001/11/09 21:07:54	1.6
  @@ -22,9 +22,9 @@
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.phoenix.Block;
  -import org.apache.log.Logger;
   
   /**
    * Default implementation of TimeScheduler service.
  @@ -33,7 +33,7 @@
    * @author <a href="mailto:ram.chidambaram@telus.com">Ram Chidambaram</a>
    */
   public class DefaultTimeScheduler
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, TimeScheduler, Composable, Initializable, Startable, Disposable,
Runnable
   {
       private final Object               m_monitor         = new Object();
  
  
  
  1.8       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java
  
  Index: Glue.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Glue.java	2001/09/25 10:18:33	1.7
  +++ Glue.java	2001/11/09 21:07:54	1.8
  @@ -11,7 +11,7 @@
   import electric.registry.RegistryException;
   import electric.server.http.HTTP;
   import electric.net.http.WebServer;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.activity.Disposable;
  @@ -45,7 +45,7 @@
    * @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</>
    */
   public class Glue
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, SOAPification, Initializable, Startable, Disposable, Configurable
{
   
       protected Configuration mConfiguration;
  
  
  
  1.2       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java
  
  Index: DefaultSocketManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultSocketManager.java	2001/04/27 05:26:00	1.1
  +++ DefaultSocketManager.java	2001/11/09 21:07:54	1.2
  @@ -17,7 +17,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
   import org.apache.avalon.cornerstone.services.sockets.SocketFactory;
   import org.apache.avalon.cornerstone.services.sockets.SocketManager;
  @@ -30,7 +30,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class DefaultSocketManager
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements SocketManager, Block, Contextualizable, Configurable, Initializable
   {
       protected final HashMap              m_serverSockets   = new HashMap();
  
  
  
  1.3       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSServerSocketFactory.java
  
  Index: TLSServerSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSServerSocketFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TLSServerSocketFactory.java	2001/04/27 13:39:51	1.2
  +++ TLSServerSocketFactory.java	2001/11/09 21:07:54	1.3
  @@ -25,7 +25,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
   import org.apache.avalon.phoenix.BlockContext;
   
  @@ -40,7 +40,7 @@
    * @author <a href="mailto:">Craig McClanahan</a>
    */
   public class TLSServerSocketFactory
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements ServerSocketFactory, Component, Contextualizable, Configurable, Initializable
   {
       protected SSLServerSocketFactory   m_factory;
  
  
  
  1.3       +3 -3      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java
  
  Index: DefaultThreadManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultThreadManager.java	2001/09/20 00:54:00	1.2
  +++ DefaultThreadManager.java	2001/11/09 21:07:54	1.3
  @@ -15,7 +15,7 @@
   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.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.Block;
   
   /**
  @@ -24,7 +24,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class DefaultThreadManager
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, ThreadManager, Configurable
   {
       ///Map of thread pools for application
  @@ -66,7 +66,7 @@
               final DefaultThreadPool threadPool =
                   new DefaultThreadPool( name, maxThreads, threadContext );
               threadPool.setDaemon( isDaemon );
  -            threadPool.setLogger( getLogger() );
  +            threadPool.enableLogging( getLogger() );
               m_threadPools.put( name, threadPool );
           }
           catch( final Exception e )
  
  
  
  1.2       +2 -2      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractHandlerFactory.java
  
  Index: AbstractHandlerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractHandlerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractHandlerFactory.java	2001/04/27 05:26:09	1.1
  +++ AbstractHandlerFactory.java	2001/11/09 21:07:54	1.2
  @@ -17,7 +17,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.logger.AbstractLoggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   
   /**
    * Helper class to extend to create handler factorys.
  @@ -25,7 +25,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public abstract class AbstractHandlerFactory
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Component, Contextualizable, Composable, Configurable, ConnectionHandlerFactory
   {
       protected Context             m_context;
  
  
  
  1.5       +7 -11     jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java
  
  Index: AbstractService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractService.java	2001/09/12 12:42:58	1.4
  +++ AbstractService.java	2001/11/09 21:07:54	1.5
  @@ -21,12 +21,12 @@
   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.AbstractLoggable;
  -import org.apache.avalon.framework.logger.Loggable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.logger.LogEnabled;
  +import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
   import org.apache.avalon.cornerstone.services.sockets.SocketManager;
   import org.apache.avalon.excalibur.thread.ThreadPool;
  -import org.apache.log.Logger;
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   
  @@ -36,7 +36,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public abstract class AbstractService
  -    extends AbstractLoggable
  +    extends AbstractLogEnabled
       implements Block, Contextualizable, Composable, Configurable, Initializable, Disposable
   {
       protected ConnectionManager        m_connectionManager;
  @@ -61,14 +61,10 @@
   
       protected abstract ConnectionHandlerFactory createFactory();
   
  -    public void setLogger( final Logger logger )
  +    public void enableLogging( final Logger logger )
       {
  -        super.setLogger( logger );
  -
  -        if( m_factory instanceof Loggable )
  -        {
  -            ((Loggable)m_factory).setLogger( logger );
  -        }
  +        super.enableLogging( logger );
  +        setupLogger( m_factory );
       }
   
       public void contextualize( final Context context )
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-dev-help@jakarta.apache.org>


Mime
View raw message