Index: proposal/sasl/src/org/apache/james/smtpserver/SMTPHandler.java =================================================================== RCS file: /home/cvs/jakarta-james/proposal/sasl/src/org/apache/james/smtpserver/SMTPHandler.java,v retrieving revision 1.1 diff -u -r1.1 SMTPHandler.java --- proposal/sasl/src/org/apache/james/smtpserver/SMTPHandler.java 23 Nov 2001 18:55:01 -0000 1.1 +++ proposal/sasl/src/org/apache/james/smtpserver/SMTPHandler.java 15 Jan 2002 18:19:04 -0000 @@ -22,7 +22,6 @@ 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.cornerstone.services.connection.ConnectionHandler; import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger; import org.apache.avalon.cornerstone.services.scheduler.Target; Index: proposal/sasl/src/org/apache/james/smtpserver/SaslProfile.java =================================================================== RCS file: /home/cvs/jakarta-james/proposal/sasl/src/org/apache/james/smtpserver/SaslProfile.java,v retrieving revision 1.1 diff -u -r1.1 SaslProfile.java --- proposal/sasl/src/org/apache/james/smtpserver/SaslProfile.java 23 Nov 2001 18:55:02 -0000 1.1 +++ proposal/sasl/src/org/apache/james/smtpserver/SaslProfile.java 15 Jan 2002 18:19:04 -0000 @@ -13,10 +13,10 @@ import java.io.IOException; import java.io.PrintWriter; import javax.security.sasl.*; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.log4j.BasicConfigurator; -class SaslProfile extends AbstractLoggable { +class SaslProfile extends AbstractLogEnabled { private SaslServer server = null; private DataInputStream in = null; Index: proposals/imap/java/org/apache/james/James.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/James.java,v retrieving revision 1.2 diff -u -r1.2 James.java --- proposals/imap/java/org/apache/james/James.java 15 Jan 2002 08:38:25 -0000 1.2 +++ proposals/imap/java/org/apache/james/James.java 15 Jan 2002 18:19:04 -0000 @@ -28,7 +28,7 @@ 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.excalibur.thread.ThreadPool; import org.apache.james.core.*; import org.apache.james.imapserver.*; @@ -57,7 +57,7 @@ * Committed on $Date: 2002/01/15 08:38:25 $ by: $Author: darrell $ */ public class James - extends AbstractLoggable + extends AbstractLogEnabled implements Block, Contextualizable, Composable, Configurable, Initializable, MailServer, MailetContext { Index: proposals/imap/java/org/apache/james/imapserver/BaseCommand.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/BaseCommand.java,v retrieving revision 1.1 diff -u -r1.1 BaseCommand.java --- proposals/imap/java/org/apache/james/imapserver/BaseCommand.java 31 Oct 2001 14:06:57 -0000 1.1 +++ proposals/imap/java/org/apache/james/imapserver/BaseCommand.java 15 Jan 2002 18:19:04 -0000 @@ -13,7 +13,6 @@ import java.util.*; import javax.mail.MessagingException; import javax.mail.internet.InternetHeaders; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.james.AccessControlException; import org.apache.james.AuthorizationException; import org.apache.james.BaseConnectionHandler; Index: proposals/imap/java/org/apache/james/imapserver/DefaultRecordRepository.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/DefaultRecordRepository.java,v retrieving revision 1.3 diff -u -r1.3 DefaultRecordRepository.java --- proposals/imap/java/org/apache/james/imapserver/DefaultRecordRepository.java 15 Jan 2002 12:13:59 -0000 1.3 +++ proposals/imap/java/org/apache/james/imapserver/DefaultRecordRepository.java 15 Jan 2002 18:19:04 -0000 @@ -9,7 +9,7 @@ import java.io.*; import java.util.*; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.james.util.Assert; @@ -21,7 +21,7 @@ * @see RecordRepository */ public class DefaultRecordRepository - extends AbstractLoggable + extends AbstractLogEnabled implements RecordRepository { private String path; Index: proposals/imap/java/org/apache/james/imapserver/FileMailbox.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/FileMailbox.java,v retrieving revision 1.3 diff -u -r1.3 FileMailbox.java --- proposals/imap/java/org/apache/james/imapserver/FileMailbox.java 15 Jan 2002 12:13:59 -0000 1.3 +++ proposals/imap/java/org/apache/james/imapserver/FileMailbox.java 15 Jan 2002 18:19:05 -0000 @@ -16,7 +16,7 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.context.Context; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.phoenix.BlockContext; import org.apache.james.AccessControlException; import org.apache.james.AuthorizationException; @@ -89,7 +89,7 @@ * @version 0.1 on 14 Dec 2000 */ public class FileMailbox - extends AbstractLoggable + extends AbstractLogEnabled implements ACLMailbox, Serializable { public static final String MAILBOX_FILE_NAME = "mailbox.mbr"; Index: proposals/imap/java/org/apache/james/imapserver/JamesHost.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/JamesHost.java,v retrieving revision 1.3 diff -u -r1.3 JamesHost.java --- proposals/imap/java/org/apache/james/imapserver/JamesHost.java 15 Jan 2002 12:13:59 -0000 1.3 +++ proposals/imap/java/org/apache/james/imapserver/JamesHost.java 15 Jan 2002 18:19:06 -0000 @@ -15,7 +15,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.james.AccessControlException; import org.apache.james.AuthorizationException; @@ -47,7 +47,7 @@ * @see RecordRepository */ public class JamesHost - extends AbstractLoggable + extends AbstractLogEnabled implements Host, Block, Configurable, Composable, Contextualizable, Initializable { Index: proposals/imap/java/org/apache/james/imapserver/SimpleMessageAttributes.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleMessageAttributes.java,v retrieving revision 1.1 diff -u -r1.1 SimpleMessageAttributes.java --- proposals/imap/java/org/apache/james/imapserver/SimpleMessageAttributes.java 31 Oct 2001 14:06:57 -0000 1.1 +++ proposals/imap/java/org/apache/james/imapserver/SimpleMessageAttributes.java 15 Jan 2002 18:19:06 -0000 @@ -14,7 +14,7 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.*; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.james.core.MimeMessageWrapper; import org.apache.james.util.RFC822DateFormat; import org.apache.log.Logger; @@ -32,7 +32,7 @@ * @version 0.1 on 14 Dec 2000 */ public class SimpleMessageAttributes - extends AbstractLoggable + extends AbstractLogEnabled implements MessageAttributes, Serializable { private final static String SP = " "; Index: proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java,v retrieving revision 1.1 diff -u -r1.1 AvalonUsersStore.java --- proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java 26 Oct 2001 05:06:54 -0000 1.1 +++ proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java 15 Jan 2002 18:19:06 -0000 @@ -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 Federico Barbieri */ public class AvalonUsersStore - extends AbstractLoggable + extends AbstractLogEnabled implements Block, Contextualizable, Composable, Configurable, Initializable, UsersStore { private HashMap repositories; Index: proposals/rmi-remotemanager/java/org/apache/james/remotemanager/RMIRemoteManager.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/RMIRemoteManager.java,v retrieving revision 1.1 diff -u -r1.1 RMIRemoteManager.java --- proposals/rmi-remotemanager/java/org/apache/james/remotemanager/RMIRemoteManager.java 26 Oct 2001 05:06:54 -0000 1.1 +++ proposals/rmi-remotemanager/java/org/apache/james/remotemanager/RMIRemoteManager.java 15 Jan 2002 18:19:06 -0000 @@ -13,9 +13,9 @@ import java.rmi.server.UnicastRemoteObject; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.phoenix.Block; -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.context.Contextualizable; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; @@ -34,7 +34,7 @@ * * @author Gabriel Bucher */ -public class RMIRemoteManager extends AbstractLoggable +public class RMIRemoteManager extends AbstractLogEnabled implements Block, Contextualizable, Composable, Configurable, Initializable { // keywords for configuration @@ -123,8 +123,8 @@ Class classObject = Class.forName(rmiClass); Remote remote = (Remote)classObject.newInstance(); // first of all, set logger - if (remote instanceof AbstractLoggable) { - ((AbstractLoggable)remote).setLogger(getLogger().getChildLogger(rmiBindname)); + if (remote instanceof LogEnabled) { + ((LogEnabled)remote).enableLogging(getLogger().getChildLogger(rmiBindname)); } // Contextualizable, Composable, Configurable, Initializable if (remote instanceof Contextualizable) { Index: proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerAdminImpl.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerAdminImpl.java,v retrieving revision 1.1 diff -u -r1.1 UserManagerAdminImpl.java --- proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerAdminImpl.java 26 Oct 2001 05:06:54 -0000 1.1 +++ proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerAdminImpl.java 15 Jan 2002 18:19:06 -0000 @@ -11,7 +11,7 @@ import java.util.Iterator; import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; @@ -30,7 +30,7 @@ * * @author Gabriel Bucher */ -public class UserManagerAdminImpl extends AbstractLoggable +public class UserManagerAdminImpl extends AbstractLogEnabled; implements UserManagerAdmin, Contextualizable, Composable, Configurable, Initializable { private static final String USER_MANAGER = "usermanager"; Index: proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerImpl.java =================================================================== RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerImpl.java,v retrieving revision 1.1 diff -u -r1.1 UserManagerImpl.java --- proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerImpl.java 26 Oct 2001 05:06:54 -0000 1.1 +++ proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerImpl.java 15 Jan 2002 18:19:06 -0000 @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.rmi.RemoteException; import javax.mail.internet.ParseException; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; @@ -35,7 +35,7 @@ * * @author Gabriel Bucher */ -public class UserManagerImpl extends AbstractLoggable +public class UserManagerImpl extends AbstractLogEnabled implements UserManager, Contextualizable, Composable, Configurable, Initializable { private MailServer mailServer; 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.4 diff -u -r1.4 BaseConnectionHandler.java --- src/java/org/apache/james/BaseConnectionHandler.java 12 Jan 2002 01:10:30 -0000 1.4 +++ src/java/org/apache/james/BaseConnectionHandler.java 15 Jan 2002 18:19:06 -0000 @@ -12,7 +12,6 @@ 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; @@ -25,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; @@ -35,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 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.15 diff -u -r1.15 James.java --- src/java/org/apache/james/James.java 7 Dec 2001 21:53:27 -0000 1.15 +++ src/java/org/apache/james/James.java 15 Jan 2002 18:19:07 -0000 @@ -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/12/07 21:53:27 $ 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 1 Nov 2001 17:44:48 -0000 1.8 +++ src/java/org/apache/james/core/AvalonMailStore.java 15 Jan 2002 18:19:07 -0000 @@ -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 */ 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.4 diff -u -r1.4 AvalonUsersStore.java --- src/java/org/apache/james/core/AvalonUsersStore.java 17 Nov 2001 15:52:12 -0000 1.4 +++ src/java/org/apache/james/core/AvalonUsersStore.java 15 Jan 2002 18:19:07 -0000 @@ -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 Federico Barbieri */ 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 25 Sep 2001 04:06:15 -0000 1.3 +++ src/java/org/apache/james/dnsserver/DNSServer.java 15 Jan 2002 18:19:07 -0000 @@ -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 */ 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 26 Oct 2001 04:47:35 -0000 1.10 +++ src/java/org/apache/james/mailrepository/AvalonMailRepository.java 15 Jan 2002 18:19:07 -0000 @@ -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 */ 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.14 diff -u -r1.14 JDBCMailRepository.java --- src/java/org/apache/james/mailrepository/JDBCMailRepository.java 7 Dec 2001 23:29:15 -0000 1.14 +++ src/java/org/apache/james/mailrepository/JDBCMailRepository.java 15 Jan 2002 18:19:07 -0000 @@ -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.9 diff -u -r1.9 JDBCSpoolRepository.java --- src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java 7 Dec 2001 23:29:57 -0000 1.9 +++ src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java 15 Jan 2002 18:19:07 -0000 @@ -28,7 +28,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/AuthServiceImpl.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/AuthServiceImpl.java,v retrieving revision 1.1 diff -u -r1.1 AuthServiceImpl.java --- src/java/org/apache/james/nntpserver/AuthServiceImpl.java 18 Nov 2001 01:00:37 -0000 1.1 +++ src/java/org/apache/james/nntpserver/AuthServiceImpl.java 15 Jan 2002 18:19:07 -0000 @@ -13,7 +13,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.services.UsersRepository; import org.apache.james.services.UsersStore; @@ -30,7 +30,7 @@ * * @author Harmeet */ -public class AuthServiceImpl extends AbstractLoggable +public class AuthServiceImpl extends AbstractLogEnabled implements AuthService, Composable, Configurable, Block { protected boolean authRequired; @@ -89,4 +89,4 @@ passwordSet = true; } } -} \ No newline at end of file +} 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 10 Nov 2001 23:10:59 -0000 1.3 +++ src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java 15 Jan 2002 18:19:08 -0000 @@ -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 10 Nov 2001 23:10:59 -0000 1.3 +++ src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java 15 Jan 2002 18:19:08 -0000 @@ -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 */ -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 10 Nov 2001 23:10:59 -0000 1.3 +++ src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java 15 Jan 2002 18:19:08 -0000 @@ -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 */ -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 10 Nov 2001 23:10:59 -0000 1.3 +++ src/java/org/apache/james/nntpserver/repository/NNTPUtil.java 15 Jan 2002 18:19:08 -0000 @@ -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.3 diff -u -r1.3 POP3Handler.java --- src/java/org/apache/james/pop3server/POP3Handler.java 5 Dec 2001 22:12:26 -0000 1.3 +++ src/java/org/apache/james/pop3server/POP3Handler.java 15 Jan 2002 18:19:08 -0000 @@ -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.7 diff -u -r1.7 RemoteManagerHandler.java --- src/java/org/apache/james/remotemanager/RemoteManagerHandler.java 9 Jan 2002 21:35:50 -0000 1.7 +++ src/java/org/apache/james/remotemanager/RemoteManagerHandler.java 15 Jan 2002 18:19:09 -0000 @@ -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.5 diff -u -r1.5 MailServer.java --- src/java/org/apache/james/services/MailServer.java 12 Jan 2002 01:10:30 -0000 1.5 +++ src/java/org/apache/james/services/MailServer.java 15 Jan 2002 18:19:09 -0000 @@ -25,7 +25,6 @@ */ 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.4 diff -u -r1.4 UsersStore.java --- src/java/org/apache/james/services/UsersStore.java 12 Jan 2002 01:10:30 -0000 1.4 +++ src/java/org/apache/james/services/UsersStore.java 15 Jan 2002 18:19:09 -0000 @@ -20,7 +20,6 @@ */ public interface UsersStore { - String ROLE = "org.apache.james.services.UsersStore"; UsersRepository getRepository( String name ); 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.13 diff -u -r1.13 SMTPHandler.java --- src/java/org/apache/james/smtpserver/SMTPHandler.java 7 Dec 2001 22:08:29 -0000 1.13 +++ src/java/org/apache/james/smtpserver/SMTPHandler.java 15 Jan 2002 18:19:09 -0000 @@ -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 25 Oct 2001 12:36:16 -0000 1.6 +++ src/java/org/apache/james/transport/JamesSpoolManager.java 15 Jan 2002 18:19:09 -0000 @@ -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.3 diff -u -r1.3 LinearProcessor.java --- src/java/org/apache/james/transport/LinearProcessor.java 7 Dec 2001 23:30:46 -0000 1.3 +++ src/java/org/apache/james/transport/LinearProcessor.java 15 Jan 2002 18:19:09 -0000 @@ -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.*; /** @@ -34,8 +34,8 @@ * * Note that the 'onerror' attribute is not yet supported. */ -public class LinearProcessor - extends AbstractLoggable +public class LinearProcessor + extends AbstractLogEnabled implements Initializable { private List mailets; 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 11 Sep 2001 04:34:49 -0000 1.2 +++ src/java/org/apache/james/userrepository/AbstractUsersRepository.java 15 Jan 2002 18:19:09 -0000 @@ -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 */ 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 11 Jun 2001 09:29:35 -0000 1.3 +++ src/java/org/apache/james/userrepository/UsersFileRepository.java 15 Jan 2002 18:19:09 -0000 @@ -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.3 diff -u -r1.3 UsersLDAPRepository.java --- src/java/org/apache/james/userrepository/UsersLDAPRepository.java 12 Jan 2002 01:10:30 -0000 1.3 +++ src/java/org/apache/james/userrepository/UsersLDAPRepository.java 15 Jan 2002 18:19:10 -0000 @@ -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,8 +35,7 @@ * @author Charles Bennett */ public class UsersLDAPRepository - implements UsersRepository, Loggable, Configurable, Contextualizable, Initializable -{ + implements UsersRepository, LogEnabled, Configurable, Contextualizable, Initializable{ private ComponentManager comp; @@ -67,7 +66,7 @@ private String passwordAttr; - public void setLogger(final Logger a_Logger) { + public void enableLogging(final Logger a_Logger) { logger = a_Logger; } Index: src/java/org/apache/james/util/mordred/JdbcDataSource.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java,v retrieving revision 1.2 diff -u -r1.2 JdbcDataSource.java --- src/java/org/apache/james/util/mordred/JdbcDataSource.java 7 Dec 2001 22:09:38 -0000 1.2 +++ src/java/org/apache/james/util/mordred/JdbcDataSource.java 15 Jan 2002 18:19:10 -0000 @@ -16,7 +16,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; //Notice how cornerstone is dependent on Excalibur import org.apache.avalon.excalibur.datasource.DataSourceComponent; @@ -46,7 +46,7 @@ * @since 4.0 */ public class JdbcDataSource - extends AbstractLoggable implements Configurable, Runnable, Disposable, DataSourceComponent + extends AbstractLogEnabled implements Configurable, Runnable, Disposable, DataSourceComponent { /** * Configure and set up DB connection. Here we set the connection