You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by da...@apache.org on 2002/01/17 07:09:02 UTC
cvs commit: jakarta-james/src/java/org/apache/james/util/mordred JdbcDataSource.java
darrell 02/01/16 22:09:02
Modified: proposal/sasl/src/org/apache/james/smtpserver
SMTPHandler.java SaslProfile.java
proposals/imap build-imap.xml
proposals/imap/java/org/apache/james James.java
proposals/imap/java/org/apache/james/imapserver ACL.java
ACLMailbox.java BaseCommand.java CommandFetch.java
CommandStore.java DefaultRecordRepository.java
FileMailbox.java JamesHost.java
SimpleMessageAttributes.java
proposals/rmi-remotemanager/java/org/apache/james/core
AvalonUsersStore.java
proposals/rmi-remotemanager/java/org/apache/james/remotemanager
RMIRemoteManager.java UserManagerAdminImpl.java
UserManagerImpl.java
src/java/org/apache/james BaseConnectionHandler.java
James.java
src/java/org/apache/james/core AvalonMailStore.java
AvalonUsersStore.java
src/java/org/apache/james/dnsserver DNSServer.java
src/java/org/apache/james/mailrepository
AvalonMailRepository.java JDBCMailRepository.java
JDBCSpoolRepository.java
src/java/org/apache/james/nntpserver AuthServiceImpl.java
src/java/org/apache/james/nntpserver/repository
ArticleIDRepository.java NNTPRepositoryImpl.java
NNTPSpooler.java NNTPUtil.java
src/java/org/apache/james/pop3server POP3Handler.java
src/java/org/apache/james/remotemanager
RemoteManagerHandler.java
src/java/org/apache/james/services MailServer.java
UsersStore.java
src/java/org/apache/james/smtpserver SMTPHandler.java
src/java/org/apache/james/transport JamesSpoolManager.java
LinearProcessor.java
src/java/org/apache/james/userrepository
AbstractUsersRepository.java
UsersFileRepository.java UsersLDAPRepository.java
src/java/org/apache/james/util/mordred JdbcDataSource.java
Log:
Upgraded to use new avalon logger framework (o.a.a.framework.logger.*),
removing all references to deprecated o.a.log.* package.
Patch supplied by Eung-Ju Park.
Revision Changes Path
1.2 +2 -3 jakarta-james/proposal/sasl/src/org/apache/james/smtpserver/SMTPHandler.java
Index: SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposal/sasl/src/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SMTPHandler.java 23 Nov 2001 18:55:01 -0000 1.1
+++ SMTPHandler.java 17 Jan 2002 06:09:00 -0000 1.2
@@ -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;
@@ -44,8 +43,8 @@
* @author Jason Borden <jb...@javasense.com>
* @author Matthew Pangaro <ma...@lokitech.com>
*
- * This is $Revision: 1.1 $
- * Committed on $Date: 2001/11/23 18:55:01 $ by: $Author: hbedi $
+ * This is $Revision: 1.2 $
+ * Committed on $Date: 2002/01/17 06:09:00 $ by: $Author: darrell $
*/
public class SMTPHandler
extends BaseConnectionHandler
1.2 +2 -2 jakarta-james/proposal/sasl/src/org/apache/james/smtpserver/SaslProfile.java
Index: SaslProfile.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposal/sasl/src/org/apache/james/smtpserver/SaslProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaslProfile.java 23 Nov 2001 18:55:02 -0000 1.1
+++ SaslProfile.java 17 Jan 2002 06:09:00 -0000 1.2
@@ -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;
1.2 +2 -2 jakarta-james/proposals/imap/build-imap.xml
Index: build-imap.xml
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/build-imap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-imap.xml 15 Jan 2002 08:38:25 -0000 1.1
+++ build-imap.xml 17 Jan 2002 06:09:00 -0000 1.2
@@ -2,7 +2,7 @@
<!-- ==========================================================================
- James build file $Revision: 1.1 $ Committed on $Date: 2002/01/15 08:38:25 $ by: $Author: darrell $
+ James build file $Revision: 1.2 $ Committed on $Date: 2002/01/17 06:09:00 $ by: $Author: darrell $
Authors:
Federico Barbieri <sc...@systemy.it>
@@ -18,7 +18,7 @@
==============================================================================
-->
-<project default="main" basedir="../..">
+<project name="build-imap" default="main" basedir="../..">
<!--
Give user a chance to override without editing this file
1.3 +30 -27 jakarta-james/proposals/imap/java/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/James.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- James.java 15 Jan 2002 08:38:25 -0000 1.2
+++ James.java 17 Jan 2002 06:09:00 -0000 1.3
@@ -7,40 +7,43 @@
*/
package org.apache.james;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.Address;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.*;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
-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.component.DefaultComponentManager;
+import org.apache.avalon.framework.component.*;
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.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
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.excalibur.thread.ThreadPool;
-import org.apache.james.core.*;
-import org.apache.james.imapserver.*;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.phoenix.Block;
+import org.apache.avalon.phoenix.BlockContext;
+import org.apache.james.core.MailHeaders;
+import org.apache.james.core.MailImpl;
+import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.Host;
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;
-import org.apache.avalon.phoenix.BlockContext;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetContext;
+
+import javax.mail.Address;
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
/**
* Core class for JAMES. Provides three primary services:
@@ -53,11 +56,11 @@
* @author Serge
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.2 $
- * Committed on $Date: 2002/01/15 08:38:25 $ by: $Author: darrell $
+ * This is $Revision: 1.3 $
+ * Committed on $Date: 2002/01/17 06:09:00 $ by: $Author: darrell $
*/
public class James
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Block, Contextualizable, Composable, Configurable,
Initializable, MailServer, MailetContext {
@@ -517,7 +520,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);
}
/**
1.2 +3 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/ACL.java
Index: ACL.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/ACL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACL.java 31 Oct 2001 14:06:57 -0000 1.1
+++ ACL.java 17 Jan 2002 06:09:00 -0000 1.2
@@ -7,10 +7,11 @@
*/
package org.apache.james.imapserver;
-import java.io.Serializable;
-import java.util.Set;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
+
+import java.io.Serializable;
+import java.util.Set;
/**
* Interface for objects representing for an IMAP4rev1 Access Control List.
1.3 +1 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/ACLMailbox.java
Index: ACLMailbox.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/ACLMailbox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ACLMailbox.java 15 Jan 2002 08:38:25 -0000 1.2
+++ ACLMailbox.java 17 Jan 2002 06:09:00 -0000 1.3
@@ -9,8 +9,8 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.context.Contextualizable;
/**
* Interface for objects representing an IMAP4rev1 mailbox (folder) with
1.2 +2 -9 jakarta-james/proposals/imap/java/org/apache/james/imapserver/BaseCommand.java
Index: BaseCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/BaseCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseCommand.java 31 Oct 2001 14:06:57 -0000 1.1
+++ BaseCommand.java 17 Jan 2002 06:09:00 -0000 1.2
@@ -7,16 +7,9 @@
*/
package org.apache.james.imapserver;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-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;
+
+import java.util.*;
//import org.apache.james.core.EnhancedMimeMessage;
1.4 +7 -6 jakarta-james/proposals/imap/java/org/apache/james/imapserver/CommandFetch.java
Index: CommandFetch.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/CommandFetch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandFetch.java 15 Jan 2002 12:13:59 -0000 1.3
+++ CommandFetch.java 17 Jan 2002 06:09:00 -0000 1.4
@@ -7,16 +7,17 @@
*/
package org.apache.james.imapserver;
+import org.apache.james.AccessControlException;
+import org.apache.james.AuthorizationException;
+import org.apache.james.core.MimeMessageWrapper;
+import org.apache.james.imapserver.commands.ImapCommand;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.*;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetHeaders;
-import org.apache.james.AccessControlException;
-import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.commands.ImapCommand;
-import org.apache.james.core.MimeMessageWrapper;
/**
* Implements the IMAP FETCH command for a given ImapRequestImpl.
1.4 +5 -6 jakarta-james/proposals/imap/java/org/apache/james/imapserver/CommandStore.java
Index: CommandStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/CommandStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandStore.java 15 Jan 2002 12:13:59 -0000 1.3
+++ CommandStore.java 17 Jan 2002 06:09:00 -0000 1.4
@@ -7,15 +7,14 @@
*/
package org.apache.james.imapserver;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.*;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetHeaders;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.imapserver.commands.ImapCommand;
+
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.StringTokenizer;
//import org.apache.james.core.EnhancedMimeMessage;
/**
1.4 +8 -4 jakarta-james/proposals/imap/java/org/apache/james/imapserver/DefaultRecordRepository.java
Index: DefaultRecordRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/DefaultRecordRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRecordRepository.java 15 Jan 2002 12:13:59 -0000 1.3
+++ DefaultRecordRepository.java 17 Jan 2002 06:09:00 -0000 1.4
@@ -7,11 +7,15 @@
*/
package org.apache.james.imapserver;
-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;
+import java.io.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Iterator;
+
/**
* Implementation of a RecordRepository on a FileSystem.
@@ -21,7 +25,7 @@
* @see RecordRepository
*/
public class DefaultRecordRepository
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements RecordRepository {
private String path;
1.4 +8 -10 jakarta-james/proposals/imap/java/org/apache/james/imapserver/FileMailbox.java
Index: FileMailbox.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/FileMailbox.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileMailbox.java 15 Jan 2002 12:13:59 -0000 1.3
+++ FileMailbox.java 17 Jan 2002 06:09:00 -0000 1.4
@@ -7,25 +7,23 @@
*/
package org.apache.james.imapserver;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
import org.apache.avalon.framework.component.ComponentManager;
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;
-import org.apache.james.Constants;
-import org.apache.james.util.Assert;
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
-import org.apache.mailet.Mail;
+import org.apache.james.util.Assert;
+
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeMessage;
+import java.io.*;
+import java.util.*;
/**
* Object representing an IMAP4rev1 mailbox (folder) on a local file system.
@@ -89,7 +87,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";
1.4 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/JamesHost.java
Index: JamesHost.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/JamesHost.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JamesHost.java 15 Jan 2002 12:13:59 -0000 1.3
+++ JamesHost.java 17 Jan 2002 06:09:00 -0000 1.4
@@ -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
{
1.2 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleMessageAttributes.java
Index: SimpleMessageAttributes.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleMessageAttributes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleMessageAttributes.java 31 Oct 2001 14:06:57 -0000 1.1
+++ SimpleMessageAttributes.java 17 Jan 2002 06:09:00 -0000 1.2
@@ -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 = " ";
1.2 +2 -2 jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java
Index: AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonUsersStore.java 26 Oct 2001 05:06:54 -0000 1.1
+++ AvalonUsersStore.java 17 Jan 2002 06:09:01 -0000 1.2
@@ -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;
1.2 +5 -5 jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/RMIRemoteManager.java
Index: RMIRemoteManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/RMIRemoteManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RMIRemoteManager.java 26 Oct 2001 05:06:54 -0000 1.1
+++ RMIRemoteManager.java 17 Jan 2002 06:09:01 -0000 1.2
@@ -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 <a href="mailto:buchi@email.com">Gabriel Bucher</a>
*/
-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) {
1.2 +2 -2 jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerAdminImpl.java
Index: UserManagerAdminImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerAdminImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserManagerAdminImpl.java 26 Oct 2001 05:06:54 -0000 1.1
+++ UserManagerAdminImpl.java 17 Jan 2002 06:09:01 -0000 1.2
@@ -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 <a href="mailto:buchi@email.com">Gabriel Bucher</a>
*/
-public class UserManagerAdminImpl extends AbstractLoggable
+public class UserManagerAdminImpl extends AbstractLogEnabled;
implements UserManagerAdmin, Contextualizable, Composable, Configurable, Initializable {
private static final String USER_MANAGER = "usermanager";
1.2 +2 -2 jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerImpl.java
Index: UserManagerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/java/org/apache/james/remotemanager/UserManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserManagerImpl.java 26 Oct 2001 05:06:54 -0000 1.1
+++ UserManagerImpl.java 17 Jan 2002 06:09:01 -0000 1.2
@@ -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 <a href="buchi@email.com">Gabriel Bucher</a>
*/
-public class UserManagerImpl extends AbstractLoggable
+public class UserManagerImpl extends AbstractLogEnabled
implements UserManager, Contextualizable, Composable, Configurable, Initializable {
private MailServer mailServer;
1.5 +1 -2 jakarta-james/src/java/org/apache/james/BaseConnectionHandler.java
Index: BaseConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/BaseConnectionHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseConnectionHandler.java 12 Jan 2002 01:10:30 -0000 1.4
+++ BaseConnectionHandler.java 17 Jan 2002 06:09:01 -0000 1.5
@@ -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
1.16 +6 -6 jakarta-james/src/java/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- James.java 7 Dec 2001 21:53:27 -0000 1.15
+++ James.java 17 Jan 2002 06:09:01 -0000 1.16
@@ -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;
@@ -52,11 +52,11 @@
* @author Serge
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.15 $
- * Committed on $Date: 2001/12/07 21:53:27 $ by: $Author: serge $
+ * This is $Revision: 1.16 $
+ * Committed on $Date: 2002/01/17 06:09:01 $ by: $Author: darrell $
*/
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);
}
/**
1.9 +5 -5 jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java
Index: AvalonMailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AvalonMailStore.java 1 Nov 2001 17:44:48 -0000 1.8
+++ AvalonMailStore.java 17 Jan 2002 06:09:01 -0000 1.9
@@ -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) {
1.5 +2 -2 jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java
Index: AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AvalonUsersStore.java 17 Nov 2001 15:52:12 -0000 1.4
+++ AvalonUsersStore.java 17 Jan 2002 06:09:01 -0000 1.5
@@ -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;
1.4 +2 -2 jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DNSServer.java 25 Sep 2001 04:06:15 -0000 1.3
+++ DNSServer.java 17 Jan 2002 06:09:01 -0000 1.4
@@ -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 <se...@lokitech.com>
*/
public class DNSServer
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Block, Configurable, Initializable,
org.apache.james.services.DNSServer {
1.11 +2 -2 jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
Index: AvalonMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AvalonMailRepository.java 26 Oct 2001 04:47:35 -0000 1.10
+++ AvalonMailRepository.java 17 Jan 2002 06:09:01 -0000 1.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 <ch...@benett1.demon.co.uk>
*/
public class AvalonMailRepository
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements MailRepository, Component, Configurable, Composable, Initializable {
private Lock lock;
1.15 +2 -2 jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
Index: JDBCMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JDBCMailRepository.java 7 Dec 2001 23:29:15 -0000 1.14
+++ JDBCMailRepository.java 17 Jan 2002 06:09:01 -0000 1.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;
1.10 +1 -1 jakarta-james/src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
Index: JDBCSpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDBCSpoolRepository.java 7 Dec 2001 23:29:57 -0000 1.9
+++ JDBCSpoolRepository.java 17 Jan 2002 06:09:01 -0000 1.10
@@ -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;
1.2 +3 -3 jakarta-james/src/java/org/apache/james/nntpserver/AuthServiceImpl.java
Index: AuthServiceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/AuthServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AuthServiceImpl.java 18 Nov 2001 01:00:37 -0000 1.1
+++ AuthServiceImpl.java 17 Jan 2002 06:09:01 -0000 1.2
@@ -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 <ha...@kodemuse.com>
*/
-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
+}
1.4 +0 -3 jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java
Index: ArticleIDRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArticleIDRepository.java 10 Nov 2001 23:10:59 -0000 1.3
+++ ArticleIDRepository.java 17 Jan 2002 06:09:01 -0000 1.4
@@ -15,9 +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;
/**
1.4 +2 -2 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
Index: NNTPRepositoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPRepositoryImpl.java 10 Nov 2001 23:10:59 -0000 1.3
+++ NNTPRepositoryImpl.java 17 Jan 2002 06:09:01 -0000 1.4
@@ -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 <ha...@kodemuse.com>
*/
-public class NNTPRepositoryImpl extends AbstractLoggable
+public class NNTPRepositoryImpl extends AbstractLogEnabled
implements NNTPRepository, Contextualizable, Configurable, Initializable, Block
{
private Context context;
1.4 +6 -6 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
Index: NNTPSpooler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPSpooler.java 10 Nov 2001 23:10:59 -0000 1.3
+++ NNTPSpooler.java 17 Jan 2002 06:09:01 -0000 1.4
@@ -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 <ha...@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;
1.4 +4 -4 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPUtil.java
Index: NNTPUtil.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPUtil.java 10 Nov 2001 23:10:59 -0000 1.3
+++ NNTPUtil.java 17 Jan 2002 06:09:01 -0000 1.4
@@ -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 )
1.4 +1 -1 jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java
Index: POP3Handler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- POP3Handler.java 5 Dec 2001 22:12:26 -0000 1.3
+++ POP3Handler.java 17 Jan 2002 06:09:01 -0000 1.4
@@ -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;
1.8 +3 -3 jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Index: RemoteManagerHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RemoteManagerHandler.java 9 Jan 2002 21:35:50 -0000 1.7
+++ RemoteManagerHandler.java 17 Jan 2002 06:09:01 -0000 1.8
@@ -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;
@@ -44,8 +44,8 @@
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * Last changed by: $Author: danny $ on $Date: 2002/01/09 21:35:50 $
- * $Revision: 1.7 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/17 06:09:01 $
+ * $Revision: 1.8 $
*
*/
public class RemoteManagerHandler
1.6 +2 -3 jakarta-james/src/java/org/apache/james/services/MailServer.java
Index: MailServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MailServer.java 12 Jan 2002 01:10:30 -0000 1.5
+++ MailServer.java 17 Jan 2002 06:09:02 -0000 1.6
@@ -20,12 +20,11 @@
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.5 $
- * Committed on $Date: 2002/01/12 01:10:30 $ by: $Author: darrell $
+ * This is $Revision: 1.6 $
+ * Committed on $Date: 2002/01/17 06:09:02 $ by: $Author: darrell $
*/
public interface MailServer
{
-
String ROLE = "org.apache.james.services.MailServer";
/**
1.5 +0 -1 jakarta-james/src/java/org/apache/james/services/UsersStore.java
Index: UsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/UsersStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UsersStore.java 12 Jan 2002 01:10:30 -0000 1.4
+++ UsersStore.java 17 Jan 2002 06:09:02 -0000 1.5
@@ -20,7 +20,6 @@
*/
public interface UsersStore
{
-
String ROLE = "org.apache.james.services.UsersStore";
UsersRepository getRepository( String name );
1.14 +3 -3 jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java
Index: SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SMTPHandler.java 7 Dec 2001 22:08:29 -0000 1.13
+++ SMTPHandler.java 17 Jan 2002 06:09:02 -0000 1.14
@@ -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;
@@ -44,8 +44,8 @@
* @author Matthew Pangaro <ma...@lokitech.com>
* @author Danny Angus <da...@thought.co.uk>
*
- * This is $Revision: 1.13 $
- * Committed on $Date: 2001/12/07 22:08:29 $ by: $Author: serge $
+ * This is $Revision: 1.14 $
+ * Committed on $Date: 2002/01/17 06:09:02 $ by: $Author: darrell $
*/
public class SMTPHandler
extends BaseConnectionHandler
1.7 +4 -4 jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java
Index: JamesSpoolManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JamesSpoolManager.java 25 Oct 2001 12:36:16 -0000 1.6
+++ JamesSpoolManager.java 17 Jan 2002 06:09:02 -0000 1.7
@@ -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.*;
@@ -36,11 +36,11 @@
* @author Serge Knystautas <se...@lokitech.com>
* @author Federico Barbieri <sc...@systemy.it>
*
- * This is $Revision: 1.6 $
- * Committed on $Date: 2001/10/25 12:36:16 $ by: $Author: serge $
+ * This is $Revision: 1.7 $
+ * Committed on $Date: 2002/01/17 06:09:02 $ by: $Author: darrell $
*/
public class JamesSpoolManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Contextualizable, Composable, Configurable, Initializable,
Runnable, Disposable, Block {
1.4 +4 -4 jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java
Index: LinearProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LinearProcessor.java 7 Dec 2001 23:30:46 -0000 1.3
+++ LinearProcessor.java 17 Jan 2002 06:09:02 -0000 1.4
@@ -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;
1.3 +2 -2 jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
Index: AbstractUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractUsersRepository.java 11 Sep 2001 04:34:49 -0000 1.2
+++ AbstractUsersRepository.java 17 Jan 2002 06:09:02 -0000 1.3
@@ -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 <ch...@benett1.demon.co.uk>
*/
public abstract class AbstractUsersRepository
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements UsersRepository
{
//
1.4 +4 -4 jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java
Index: UsersFileRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UsersFileRepository.java 11 Jun 2001 09:29:35 -0000 1.3
+++ UsersFileRepository.java 17 Jan 2002 06:09:02 -0000 1.4
@@ -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;
@@ -38,11 +38,11 @@
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * Last changed by: $Author: charlesb $ on $Date: 2001/06/11 09:29:35 $
- * $Revision: 1.3 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/17 06:09:02 $
+ * $Revision: 1.4 $
*/
public class UsersFileRepository
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements UsersRepository, Component, Configurable, Composable, Initializable {
protected static boolean DEEP_DEBUG = true;
1.4 +4 -5 jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
Index: UsersLDAPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UsersLDAPRepository.java 12 Jan 2002 01:10:30 -0000 1.3
+++ UsersLDAPRepository.java 17 Jan 2002 06:09:02 -0000 1.4
@@ -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;
}
1.3 +3 -3 jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JdbcDataSource.java 7 Dec 2001 22:09:38 -0000 1.2
+++ JdbcDataSource.java 17 Jan 2002 06:09:02 -0000 1.3
@@ -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;
@@ -42,11 +42,11 @@
* </pre>
*
* @author <a href="mailto:serge@apache.org">Serge Knystautas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/12/07 22:09:38 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/01/17 06:09:02 $
* @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
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>