? james-avalon-update.diff
? lib/avalon-excalibur-20011110.jar
? lib/avalon-framework-20011110.jar
? lib/avalon-jmx-20011113.jar
? lib/avalon-scratchpad-20011110.jar
? lib/cornerstone-20011113.jar
? lib/logkit-1.0.jar
? lib/phoenix-client-20011113.jar
? lib/phoenix-engine-20011113.jar
? lib/phoenix-loader-20011113.jar
? src/conf/james-environment.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.86
diff -u -r1.86 build.xml
--- build.xml	2001/10/30 14:07:50	1.86
+++ build.xml	2001/11/14 02:35:00
@@ -106,15 +106,15 @@
        ===================================================================
   -->
   <property name="xerces.jar" value="${lib.dir}/xerces-1.4.3.jar"/>
-  <property name="framework.jar" value="${lib.dir}/avalon-framework-20010912.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="logkit.jar" value="${lib.dir}/logkit-20010912.jar"/>
-  <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20010925.bar"/>
-  <property name="phoenix.client.jar" value="${lib.dir}/phoenix-client-20010925.jar"/>
-  <property name="phoenix-loader.jar" value="${lib.dir}/phoenix-loader-20010925.jar"/>
-  <property name="phoenix-engine.jar" value="${lib.dir}/phoenix-engine-20010925.jar"/>
-  <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20010919.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="logkit.jar" value="${lib.dir}/logkit-1.0.jar"/>
+  <property name="cornerstone.jar" value="${lib.dir}/cornerstone-20011113.jar"/>
+  <property name="phoenix.client.jar" value="${lib.dir}/phoenix-client-20011113.jar"/>
+  <property name="phoenix-loader.jar" value="${lib.dir}/phoenix-loader-20011113.jar"/>
+  <property name="phoenix-engine.jar" value="${lib.dir}/phoenix-engine-20011113.jar"/>
+  <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20011113.jar"/>
 
   <!--
     <property name="activation.jar" value="${lib.dir}/activation.jar"/>
@@ -126,7 +126,7 @@
     <pathelement location="${scratchpad.jar}"/>
     <pathelement location="${logkit.jar}"/>
     <pathelement location="${phoenix.client.jar}"/>
-    <pathelement location="${cornerstone.bar}"/>
+    <pathelement location="${cornerstone.jar}"/>
     <pathelement path="${java.class.path}" />
     <fileset dir="${lib.dir}">
       <include name="*.jar" />
@@ -140,6 +140,10 @@
     <pathelement path="${build.classes}" />
   </path>
 
+  <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
+    <classpath refid="project.class.path" />
+  </taskdef>
+
   <!--
        ===================================================================
                                   Main target
@@ -158,7 +162,7 @@
     <echo message=""/>
     <echo message=" available targets are:"/>
     <echo message=""/>
-    <echo message="   block-archive  --> generates the James.bar file (default)"/>
+    <echo message="   block-archive  --> generates the James.jar file (default)"/>
     <echo message="   auxiliary-jars --> generates the mailet.jar"/>
     <echo message="   compile        --> compiles the source code"/>
     <echo message="   dist-lite      --> generates the JAMES distribution, unpacked"/>
@@ -281,13 +285,13 @@
   </target>
 
   <!-- =================================================================== -->
-  <!-- Creates the JAMES.bar archive                                       -->
+  <!-- Creates the JAMES.jar archive                                       -->
   <!-- =================================================================== -->
   <target name="block-archive" depends="compile">
 
     <mkdir dir="${build.lib}"/>
 
-    <jar jarfile="${build.lib}/${name}.bar"
+    <jar jarfile="${build.lib}/${name}.jar"
          basedir="${build.classes}"
          manifest="${src.dir}/Manifest.mf">
        <include name="org/apache/james/**"/>
@@ -310,46 +314,29 @@
        ===================================================================
   -->
   <target name="sar" depends="block-archive,auxiliary-jars">
-
-    <jar jarfile="${build.lib}/${name}.sar">
-
-      <zipfileset dir="${lib.dir}/" prefix="blocks/">
-        <include name="*.bar"/>
-      </zipfileset>
 
-      <zipfileset dir="${build.lib}/" prefix="blocks/">
-        <include name="*.bar"/>
-      </zipfileset>
-
-      <zipfileset dir="${build.lib}" prefix="lib">
-        <include name="*.jar"/>
-      </zipfileset>
+    <sar sarfile="${build.lib}/${name}.sar"
+         config="${conf.dir}/james-config.xml"
+         environment="${conf.dir}/james-environment.xml"
+         assembly="${conf.dir}/james-assembly.xml" >
 
-      <zipfileset dir="${lib.dir}/" prefix="lib">
+      <lib dir="${lib.dir}">
         <include name="dnsjava-1.2.3.jar"/>
         <include name="town.jar"/>
         <include name="activation.jar"/>
         <include name="mail_1_2.jar"/>
         <include name="jakarta-oro-2.0.1.jar"/>
-      </zipfileset>
+        <include name="cornerstone-20011113.jar"/>
+      </lib>
+      <lib dir="${build.lib}/">
+        <include name="mailet.jar"/>
+        <include name="james.jar"/>
+      </lib>
 
-      <zipfileset dir="${build.conf}" fullpath="conf/config.xml">
-        <include name="james-config.xml"/>
-      </zipfileset>
-
-      <zipfileset dir="${build.conf}" fullpath="conf/assembly.xml">
-        <include name="james-assembly.xml"/>
-      </zipfileset>
-
-      <zipfileset dir="${build.conf}" fullpath="conf/server.xml">
-        <include name="james-server.xml"/>
-      </zipfileset>
-
       <zipfileset dir="${build.conf}" fullpath="conf/sqlResources.xml">
         <include name="sqlResources.xml"/>
       </zipfileset>
-
-    </jar>
+    </sar>
 
   </target>
 
Index: src/java/org/apache/james/BaseConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/BaseConnectionHandler.java,v
retrieving revision 1.3
diff -u -r1.3 BaseConnectionHandler.java
--- src/java/org/apache/james/BaseConnectionHandler.java	2001/11/10 22:59:24	1.3
+++ src/java/org/apache/james/BaseConnectionHandler.java	2001/11/14 02:35:00
@@ -12,7 +12,7 @@
 import java.text.*;
 import java.util.*;
 import javax.mail.internet.*;
-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.Disposable;
 import org.apache.avalon.framework.component.ComponentException;
@@ -24,6 +24,7 @@
 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.Logger;
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
 import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
 import org.apache.avalon.cornerstone.services.scheduler.Target;
@@ -34,7 +35,6 @@
 import org.apache.james.Constants;
 import org.apache.james.services.*;
 import org.apache.james.util.InternetPrintWriter;
-import org.apache.log.Logger;
 
 /**
  * Different connection handlers extend this class
@@ -43,7 +43,7 @@
  *
  * @author Harmeet Bedi <harmeet@kodemuse.com>
  */
-public class BaseConnectionHandler extends AbstractLoggable implements Configurable {
+public class BaseConnectionHandler extends AbstractLogEnabled implements Configurable {
     protected int timeout;
     protected String helloName;
 
Index: src/java/org/apache/james/James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.14
diff -u -r1.14 James.java
--- src/java/org/apache/james/James.java	2001/11/01 17:44:26	1.14
+++ src/java/org/apache/james/James.java	2001/11/14 02:35:02
@@ -28,14 +28,14 @@
 import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.context.DefaultContext;
-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.excalibur.thread.ThreadPool;
 import org.apache.james.core.*;
 import org.apache.james.services.*;
 import org.apache.james.transport.*;
 import org.apache.james.userrepository.DefaultJamesUser;
 import org.apache.james.util.RFC822DateFormat;
-import org.apache.log.Logger;
 import org.apache.log.Priority;
 import org.apache.mailet.*;
 import org.apache.avalon.phoenix.Block;
@@ -56,7 +56,7 @@
  * Committed on $Date: 2001/11/01 17:44:26 $ by: $Author: serge $
  */
 public class James
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Block, Contextualizable, Composable, Configurable,
                Initializable, MailServer, MailetContext {
 
@@ -465,7 +465,7 @@
     public void log(String message, Throwable t) {
         //System.err.println(message);
         //t.printStackTrace(); //DEBUG
-        getMailetLogger().log(Priority.INFO,message,t);
+        getMailetLogger().info(message,t);
     }
 
     /**
Index: src/java/org/apache/james/core/AvalonMailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.8
diff -u -r1.8 AvalonMailStore.java
--- src/java/org/apache/james/core/AvalonMailStore.java	2001/11/01 17:44:48	1.8
+++ src/java/org/apache/james/core/AvalonMailStore.java	2001/11/14 02:35:03
@@ -23,12 +23,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.Loggable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailStore;
 import org.apache.james.services.SpoolRepository;
-import org.apache.log.Logger;
 import org.apache.avalon.phoenix.Block;
 
 /**
@@ -40,7 +40,7 @@
  * @author Darrell DeBoer <dd@bigdaz.com>
  */
 public class AvalonMailStore
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Block, Contextualizable, Composable, Configurable, Initializable, MailStore {
 
     private static final String REPOSITORY_NAME = "Repository";
@@ -194,7 +194,7 @@
 
                 try {
                     reply = (MailRepository) Class.forName(repClass).newInstance();
-                    if (reply instanceof Loggable) {
+                    if (reply instanceof LogEnabled) {
                        setupLogger(reply);
                     }
                     if (reply instanceof Contextualizable) {
Index: src/java/org/apache/james/core/AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.3
diff -u -r1.3 AvalonUsersStore.java
--- src/java/org/apache/james/core/AvalonUsersStore.java	2001/09/27 21:12:17	1.3
+++ src/java/org/apache/james/core/AvalonUsersStore.java	2001/11/14 02:35:03
@@ -22,7 +22,7 @@
 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.AbstractLogEnabled;
 import org.apache.james.services.UsersRepository;
 import org.apache.james.services.UsersStore;
 import org.apache.avalon.phoenix.Block;
@@ -32,7 +32,7 @@
  * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
  */
 public class AvalonUsersStore
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Block, Contextualizable, Composable, Configurable, Initializable, UsersStore {
 
     private HashMap repositories;
Index: src/java/org/apache/james/dnsserver/DNSServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.3
diff -u -r1.3 DNSServer.java
--- src/java/org/apache/james/dnsserver/DNSServer.java	2001/09/25 04:06:15	1.3
+++ src/java/org/apache/james/dnsserver/DNSServer.java	2001/11/14 02:35:07
@@ -20,7 +20,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;
 import org.apache.james.transport.Resources;
 import org.xbill.DNS.Cache;
@@ -43,7 +43,7 @@
  * @author  Serge Knystautas <sergek@lokitech.com>
  */
 public class DNSServer
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Block, Configurable, Initializable, 
     org.apache.james.services.DNSServer {
 
Index: src/java/org/apache/james/mailrepository/AvalonMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.10
diff -u -r1.10 AvalonMailRepository.java
--- src/java/org/apache/james/mailrepository/AvalonMailRepository.java	2001/10/26 04:47:35	1.10
+++ src/java/org/apache/james/mailrepository/AvalonMailRepository.java	2001/11/14 02:35:11
@@ -26,7 +26,7 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.cornerstone.services.store.ObjectRepository;
 import org.apache.avalon.cornerstone.services.store.Store;
 import org.apache.avalon.cornerstone.services.store.StreamRepository;
@@ -50,7 +50,7 @@
  * @author Charles Benett <charles@benett1.demon.co.uk>
  */
 public class AvalonMailRepository
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements MailRepository, Component, Configurable, Composable, Initializable {
 
     private Lock lock;
Index: src/java/org/apache/james/mailrepository/JDBCMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java,v
retrieving revision 1.11
diff -u -r1.11 JDBCMailRepository.java
--- src/java/org/apache/james/mailrepository/JDBCMailRepository.java	2001/11/05 12:18:25	1.11
+++ src/java/org/apache/james/mailrepository/JDBCMailRepository.java	2001/11/14 02:35:15
@@ -48,7 +48,7 @@
 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.AbstractLogEnabled;
 import org.apache.avalon.phoenix.BlockContext;
 import org.apache.james.core.MimeMessageWrapper;
 import org.apache.james.core.MailImpl;
@@ -78,7 +78,7 @@
  * @version 1.0.0, 24/04/1999
  */
 public class JDBCMailRepository
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements MailRepository, Component, Contextualizable, Composable, Configurable, Initializable {
     protected Context context;
 
Index: src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java,v
retrieving revision 1.6
diff -u -r1.6 JDBCSpoolRepository.java
--- src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java	2001/11/05 12:19:07	1.6
+++ src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java	2001/11/14 02:35:16
@@ -27,7 +27,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.james.core.MimeMessageWrapper;
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.SpoolRepository;
Index: src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java,v
retrieving revision 1.3
diff -u -r1.3 ArticleIDRepository.java
--- src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java	2001/11/10 23:10:59	1.3
+++ src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java	2001/11/14 02:35:21
@@ -15,7 +15,6 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
-import org.apache.james.nntpserver.repository.ArticleIDRepository;
 import org.apache.james.nntpserver.repository.NNTPGroup;
 import org.apache.james.nntpserver.repository.NNTPRepository;
 import org.apache.james.util.Base64;
Index: src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
retrieving revision 1.3
diff -u -r1.3 NNTPRepositoryImpl.java
--- src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java	2001/11/10 23:10:59	1.3
+++ src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java	2001/11/14 02:35:23
@@ -24,7 +24,7 @@
 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.AbstractLogEnabled;
 import org.apache.avalon.phoenix.Block;
 import org.apache.james.nntpserver.DateSinceFileFilter;
 import org.apache.james.nntpserver.NNTPException;
@@ -35,7 +35,7 @@
  *
  * @author Harmeet Bedi <harmeet@kodemuse.com>
  */
-public class NNTPRepositoryImpl extends AbstractLoggable 
+public class NNTPRepositoryImpl extends AbstractLogEnabled 
     implements NNTPRepository, Contextualizable, Configurable, Initializable, Block
 {
     private Context context;
Index: src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java,v
retrieving revision 1.3
diff -u -r1.3 NNTPSpooler.java
--- src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java	2001/11/10 23:10:59	1.3
+++ src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java	2001/11/14 02:35:24
@@ -17,8 +17,8 @@
 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.excalibur.io.IOUtil;
 import org.apache.james.util.Lock;
 
@@ -28,7 +28,7 @@
  *
  * @author Harmeet Bedi <harmeet@kodemuse.com>
  */
-class NNTPSpooler extends AbstractLoggable 
+class NNTPSpooler extends AbstractLogEnabled 
         implements Contextualizable, Configurable, Initializable {
 
     private Context context;
@@ -50,8 +50,8 @@
         worker = new Worker[threadCount];
         for ( int i = 0 ; i < worker.length ; i++ ) {
             worker[i] = new Worker(threadIdleTime,spoolPath);
-            if ( worker[i] instanceof Loggable )
-                ((Loggable)worker[i]).setLogger(getLogger());
+            if ( worker[i] instanceof LogEnabled )
+                ((LogEnabled)worker[i]).enableLogging(getLogger());
         }
     }
     void setRepository(NNTPRepository repo) {
@@ -72,7 +72,7 @@
         for ( int i = 0 ; i < worker.length ; i++ )
             new Thread(worker[i],"NNTPSpool-"+i).start();
     }
-    static class Worker extends AbstractLoggable implements Runnable {
+    static class Worker extends AbstractLogEnabled implements Runnable {
         private static final Lock lock = new Lock();
         private final File spoolPath;
         private final int threadIdleTime;
Index: src/java/org/apache/james/nntpserver/repository/NNTPUtil.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPUtil.java,v
retrieving revision 1.3
diff -u -r1.3 NNTPUtil.java
--- src/java/org/apache/james/nntpserver/repository/NNTPUtil.java	2001/11/10 23:10:59	1.3
+++ src/java/org/apache/james/nntpserver/repository/NNTPUtil.java	2001/11/14 02:35:25
@@ -14,10 +14,10 @@
 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.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.phoenix.BlockContext;
 import org.apache.james.nntpserver.NNTPException;
-import org.apache.log.Logger;
 
 /**
  * Helper fuctions. 
@@ -55,8 +55,8 @@
         } catch(ConfigurationException ce) { }
         try {
             Object obj = Class.forName(clsName).newInstance();
-            if ( obj instanceof Loggable )
-                ((Loggable)obj).setLogger( logger );
+            if ( obj instanceof LogEnabled )
+                ((LogEnabled)obj).enableLogging( logger );
             if (obj instanceof Contextualizable) 
                 ((Contextualizable)obj).contextualize(context);
             if ( obj instanceof Configurable )
Index: src/java/org/apache/james/pop3server/POP3Handler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.1
diff -u -r1.1 POP3Handler.java
--- src/java/org/apache/james/pop3server/POP3Handler.java	2001/05/11 09:26:00	1.1
+++ src/java/org/apache/james/pop3server/POP3Handler.java	2001/11/14 02:35:26
@@ -29,7 +29,7 @@
 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.AbstractLogEnabled;
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
 import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
 import org.apache.avalon.cornerstone.services.scheduler.Target;
Index: src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java,v
retrieving revision 1.5
diff -u -r1.5 RemoteManagerHandler.java
--- src/java/org/apache/james/remotemanager/RemoteManagerHandler.java	2001/11/05 13:27:21	1.5
+++ src/java/org/apache/james/remotemanager/RemoteManagerHandler.java	2001/11/14 02:35:29
@@ -18,7 +18,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.cornerstone.services.connection.ConnectionHandler;
 import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
 import org.apache.avalon.cornerstone.services.scheduler.Target;
Index: src/java/org/apache/james/services/MailServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailServer.java,v
retrieving revision 1.4
diff -u -r1.4 MailServer.java
--- src/java/org/apache/james/services/MailServer.java	2001/10/31 14:31:25	1.4
+++ src/java/org/apache/james/services/MailServer.java	2001/11/14 02:35:31
@@ -13,7 +13,6 @@
 import javax.mail.internet.*;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.avalon.phoenix.Service;
 
 /**
  * The interface for Phoenix blocks to the James MailServer
@@ -24,8 +23,7 @@
  * This is $Revision: 1.4 $
  * Committed on $Date: 2001/10/31 14:31:25 $ by: $Author: serge $
  */
-public interface MailServer
-    extends Service {
+public interface MailServer {
 
     String ROLE = "org.apache.james.services.MailServer";
 
Index: src/java/org/apache/james/services/UsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/UsersStore.java,v
retrieving revision 1.2
diff -u -r1.2 UsersStore.java
--- src/java/org/apache/james/services/UsersStore.java	2001/09/06 13:19:32	1.2
+++ src/java/org/apache/james/services/UsersStore.java	2001/11/14 02:35:31
@@ -7,8 +7,6 @@
  */
 package org.apache.james.services;
 
-import org.apache.avalon.phoenix.Service;
-
 /**
  * Interface for Phoenix blocks to access a store of Users. A UserStore
  * contains one or more UserRepositories. Multiple UserRepositories may or may
@@ -18,8 +16,7 @@
  * @author  Federico Barbieri <scoobie@pop.systemy.it>
  * @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
  */
-public interface UsersStore 
-    extends Service {
+public interface UsersStore {
 
     String ROLE = "org.apache.james.services.UsersStore";
 
Index: src/java/org/apache/james/smtpserver/SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.8
diff -u -r1.8 SMTPHandler.java
--- src/java/org/apache/james/smtpserver/SMTPHandler.java	2001/08/11 21:25:15	1.8
+++ src/java/org/apache/james/smtpserver/SMTPHandler.java	2001/11/14 02:35:34
@@ -22,7 +22,7 @@
 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.AbstractLogEnabled;
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
 import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
 import org.apache.avalon.cornerstone.services.scheduler.Target;
Index: src/java/org/apache/james/transport/JamesSpoolManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.6
diff -u -r1.6 JamesSpoolManager.java
--- src/java/org/apache/james/transport/JamesSpoolManager.java	2001/10/25 12:36:16	1.6
+++ src/java/org/apache/james/transport/JamesSpoolManager.java	2001/11/14 02:35:36
@@ -25,7 +25,7 @@
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.phoenix.Block;
 import org.apache.james.*;
 import org.apache.james.core.*;
@@ -40,7 +40,7 @@
  * Committed on $Date: 2001/10/25 12:36:16 $ by: $Author: serge $
  */
 public class JamesSpoolManager
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Contextualizable, Composable, Configurable, Initializable,
                Runnable, Disposable,  Block {
 
Index: src/java/org/apache/james/transport/LinearProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java,v
retrieving revision 1.2
diff -u -r1.2 LinearProcessor.java
--- src/java/org/apache/james/transport/LinearProcessor.java	2001/06/24 12:23:46	1.2
+++ src/java/org/apache/james/transport/LinearProcessor.java	2001/11/14 02:35:36
@@ -10,12 +10,12 @@
 import java.io.*;
 import java.util.*;
 import javax.mail.*;
-import org.apache.avalon.framework.logger.AbstractLoggable;
 import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.*;
 import org.apache.james.core.*;
 import org.apache.james.services.SpoolRepository;
-import org.apache.log.Logger;
 import org.apache.mailet.*;
 
 /**
@@ -35,7 +35,7 @@
  * Note that the 'onerror' attribute is not yet supported.
  */
 public class LinearProcessor 
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Initializable {
 
     private final static boolean DEEP_DEBUG = false;
Index: src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.2
diff -u -r1.2 AbstractJdbcUsersRepository.java
--- src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java	2001/09/27 21:12:47	1.2
+++ src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java	2001/11/14 02:35:52
@@ -48,7 +48,7 @@
  * @author Darrell DeBoer <dd@bigdaz.com>
  */
 public abstract class AbstractJdbcUsersRepository extends AbstractUsersRepository
-    implements UsersRepository, Loggable, Component, Contextualizable, Composable, Configurable, Initializable
+    implements UsersRepository, LogEnabled, Component, Contextualizable, Composable, Configurable, Initializable
 {
     protected Context context;
     protected Map m_sqlParameters;
Index: src/java/org/apache/james/userrepository/AbstractUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java,v
retrieving revision 1.2
diff -u -r1.2 AbstractUsersRepository.java
--- src/java/org/apache/james/userrepository/AbstractUsersRepository.java	2001/09/11 04:34:49	1.2
+++ src/java/org/apache/james/userrepository/AbstractUsersRepository.java	2001/11/14 02:35:53
@@ -9,7 +9,7 @@
 
 import java.util.*;
 import org.apache.james.services.*;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 
 /**
  * A partial implementation of a Repository to store users.
@@ -20,7 +20,7 @@
  * @author Charles Benett <charles@benett1.demon.co.uk>
  */
 public abstract class AbstractUsersRepository
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements UsersRepository
 {
     //
Index: src/java/org/apache/james/userrepository/UsersFileRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java,v
retrieving revision 1.3
diff -u -r1.3 UsersFileRepository.java
--- src/java/org/apache/james/userrepository/UsersFileRepository.java	2001/06/11 09:29:35	1.3
+++ src/java/org/apache/james/userrepository/UsersFileRepository.java	2001/11/14 02:35:55
@@ -18,7 +18,7 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.cornerstone.services.store.ObjectRepository;
 import org.apache.avalon.cornerstone.services.store.Store;
 import org.apache.avalon.excalibur.concurrent.Lock;
@@ -42,7 +42,7 @@
  * $Revision: 1.3 $
  */
 public class UsersFileRepository
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements UsersRepository, Component, Configurable, Composable, Initializable {
  
     protected static boolean DEEP_DEBUG = true;
Index: src/java/org/apache/james/userrepository/UsersLDAPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.2
diff -u -r1.2 UsersLDAPRepository.java
--- src/java/org/apache/james/userrepository/UsersLDAPRepository.java	2001/06/11 09:29:36	1.2
+++ src/java/org/apache/james/userrepository/UsersLDAPRepository.java	2001/11/14 02:35:57
@@ -20,11 +20,11 @@
 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.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.Constants;
 import org.apache.james.services.User;
 import org.apache.james.services.UsersRepository;
-import org.apache.log.Logger;
 
 /**
  * Implementation of a Repository to store users.
@@ -35,7 +35,7 @@
  * @author  Charles Bennett
  */
 public class UsersLDAPRepository
-    implements UsersRepository, Loggable, Configurable, Contextualizable, Initializable{
+    implements UsersRepository, LogEnabled, Configurable, Contextualizable, Initializable{
 
     private ComponentManager comp;
 
@@ -66,7 +66,7 @@
     private String passwordAttr;
 
 
-    public void setLogger(final Logger a_Logger) {
+    public void enableLogging(final Logger a_Logger) {
         logger = a_Logger;
     }