HTH
Index: proposals/imap2/java/org/apache/james/imapserver/ImapHandler.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/ImapHandler.java,v
retrieving revision 1.7
diff -u -r1.7 ImapHandler.java
--- proposals/imap2/java/org/apache/james/imapserver/ImapHandler.java 8 Mar 2003
21:13:54 -0000 1.7
+++ proposals/imap2/java/org/apache/james/imapserver/ImapHandler.java 23 Oct 2003
01:17:37 -0000
@@ -58,34 +58,24 @@
package org.apache.james.imapserver;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.Socket;
+
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.james.Constants;
-import org.apache.james.imapserver.commands.ImapCommand;
-import org.apache.james.imapserver.commands.ImapCommandFactory;
-import org.apache.james.imapserver.commands.CommandParser;
-import org.apache.james.imapserver.store.ImapMailbox;
-import org.apache.mailet.MailRepository;
-import org.apache.mailet.User;
-import org.apache.mailet.UsersRepository;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.io.Reader;
-import java.io.InputStream;
-import java.net.Socket;
+import org.apache.mailet.MailRepository;
/**
* The handler class for IMAP connections.
Index: proposals/imap2/java/org/apache/james/imapserver/ImapHost.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/ImapHost.java,v
retrieving revision 1.7
diff -u -r1.7 ImapHost.java
--- proposals/imap2/java/org/apache/james/imapserver/ImapHost.java 13 Jul 2003
06:04:55 -0000 1.7
+++ proposals/imap2/java/org/apache/james/imapserver/ImapHost.java 23 Oct 2003
01:17:39 -0000
@@ -58,12 +58,11 @@
package org.apache.james.imapserver;
-import org.apache.mailet.User;
+import java.util.Collection;
+
import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.MailboxException;
-
-import javax.mail.search.SearchTerm;
-import java.util.Collection;
+import org.apache.mailet.User;
/**
* A host machine that has an IMAP4rev1 messaging server. There should be one
Index: proposals/imap2/java/org/apache/james/imapserver/ImapServer.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/ImapServer.java,v
retrieving revision 1.5
diff -u -r1.5 ImapServer.java
--- proposals/imap2/java/org/apache/james/imapserver/ImapServer.java 8 Mar 2003
21:13:54 -0000 1.5
+++ proposals/imap2/java/org/apache/james/imapserver/ImapServer.java 23 Oct 2003
01:17:41 -0000
@@ -65,20 +65,17 @@
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.activity.Initializable;
-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.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
-import org.apache.mailet.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
+import org.apache.mailet.UsersRepository;
/**
* TODO: this is a quick cut-and-paste hack from POP3Server. Should probably be
Index: proposals/imap2/java/org/apache/james/imapserver/ImapSession.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/ImapSession.java,v
retrieving revision 1.7
diff -u -r1.7 ImapSession.java
--- proposals/imap2/java/org/apache/james/imapserver/ImapSession.java 21 Jul 2003
23:31:03 -0000 1.7
+++ proposals/imap2/java/org/apache/james/imapserver/ImapSession.java 23 Oct 2003
01:17:42 -0000
@@ -58,11 +58,10 @@
package org.apache.james.imapserver;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.mailet.User;
-import org.apache.mailet.UsersRepository;
import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.MailboxException;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
/**
* Encapsulates all state held for an ongoing Imap session,
Index: proposals/imap2/java/org/apache/james/imapserver/JamesImapHost.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/JamesImapHost.java,v
retrieving revision 1.10
diff -u -r1.10 JamesImapHost.java
--- proposals/imap2/java/org/apache/james/imapserver/JamesImapHost.java 21 Jul 2003
23:31:04 -0000 1.10
+++ proposals/imap2/java/org/apache/james/imapserver/JamesImapHost.java 23 Oct 2003
01:17:44 -0000
@@ -58,21 +58,20 @@
package org.apache.james.imapserver;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.ImapStore;
import org.apache.james.imapserver.store.InMemoryStore;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.imapserver.store.SimpleImapMessage;
import org.apache.mailet.User;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
/**
* An initial implementation of an ImapHost. By default, uses,
Index: proposals/imap2/java/org/apache/james/imapserver/commands/CommandParser.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/commands/CommandParser.java,v
retrieving revision 1.9
diff -u -r1.9 CommandParser.java
--- proposals/imap2/java/org/apache/james/imapserver/commands/CommandParser.java
21 Jul 2003 23:31:04 -0000 1.9
+++ proposals/imap2/java/org/apache/james/imapserver/commands/CommandParser.java
23 Oct 2003 01:17:47 -0000
@@ -58,20 +58,18 @@
package org.apache.james.imapserver.commands;
-import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.imapserver.ImapRequestLineReader;
-import org.apache.james.imapserver.ImapConstants;
-import org.apache.james.imapserver.store.MessageFlags;
-import org.apache.james.util.Assert;
-
-import javax.mail.Flags;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.List;
-import java.util.ArrayList;
import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+
+import javax.mail.Flags;
+
+import org.apache.james.imapserver.ImapConstants;
+import org.apache.james.imapserver.ImapRequestLineReader;
+import org.apache.james.imapserver.ProtocolException;
+import org.apache.james.imapserver.store.MessageFlags;
/**
*
Index: proposals/imap2/java/org/apache/james/imapserver/commands/CopyCommand.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/commands/CopyCommand.java,v
retrieving revision 1.5
diff -u -r1.5 CopyCommand.java
--- proposals/imap2/java/org/apache/james/imapserver/commands/CopyCommand.java 21 Jul
2003 23:31:04 -0000 1.5
+++ proposals/imap2/java/org/apache/james/imapserver/commands/CopyCommand.java 23 Oct
2003 01:17:48 -0000
@@ -61,11 +61,10 @@
import org.apache.james.imapserver.ImapRequestLineReader;
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ProtocolException;
import org.apache.james.imapserver.ImapSessionMailbox;
+import org.apache.james.imapserver.ProtocolException;
import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.imapserver.store.SimpleImapMessage;
/**
* Handles processeing for the COPY imap command.
Index: proposals/imap2/java/org/apache/james/imapserver/commands/ExpungeCommand.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/commands/ExpungeCommand.java,v
retrieving revision 1.5
diff -u -r1.5 ExpungeCommand.java
--- proposals/imap2/java/org/apache/james/imapserver/commands/ExpungeCommand.java
21 Jul 2003 23:31:04 -0000 1.5
+++ proposals/imap2/java/org/apache/james/imapserver/commands/ExpungeCommand.java
23 Oct 2003 01:17:49 -0000
@@ -62,7 +62,6 @@
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.imapserver.ImapHost;
import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.MailboxException;
Index: proposals/imap2/java/org/apache/james/imapserver/commands/StoreCommand.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/commands/StoreCommand.java,v
retrieving revision 1.5
diff -u -r1.5 StoreCommand.java
--- proposals/imap2/java/org/apache/james/imapserver/commands/StoreCommand.java 21 Jul
2003 23:31:05 -0000 1.5
+++ proposals/imap2/java/org/apache/james/imapserver/commands/StoreCommand.java 23 Oct
2003 01:17:51 -0000
@@ -58,13 +58,16 @@
package org.apache.james.imapserver.commands;
-import org.apache.james.imapserver.*;
+import javax.mail.Flags;
+
+import org.apache.james.imapserver.ImapRequestLineReader;
+import org.apache.james.imapserver.ImapResponse;
+import org.apache.james.imapserver.ImapSession;
+import org.apache.james.imapserver.ImapSessionMailbox;
+import org.apache.james.imapserver.ProtocolException;
+import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.store.MessageFlags;
-import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.SimpleImapMessage;
-import org.apache.james.imapserver.store.MailboxException;
-
-import javax.mail.Flags;
/**
* Handles processeing for the STORE imap command.
Index: proposals/imap2/java/org/apache/james/imapserver/commands/SubscribeCommand.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/commands/SubscribeCommand.java,v
retrieving revision 1.5
diff -u -r1.5 SubscribeCommand.java
--- proposals/imap2/java/org/apache/james/imapserver/commands/SubscribeCommand.java
8 Mar 2003 21:13:55 -0000 1.5
+++ proposals/imap2/java/org/apache/james/imapserver/commands/SubscribeCommand.java
23 Oct 2003 01:17:51 -0000
@@ -62,7 +62,6 @@
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.MailboxException;
/**
Index:
proposals/imap2/java/org/apache/james/imapserver/commands/UnsubscribeCommand.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/commands/UnsubscribeCommand.java,v
retrieving revision 1.5
diff -u -r1.5 UnsubscribeCommand.java
--- proposals/imap2/java/org/apache/james/imapserver/commands/UnsubscribeCommand.java
8 Mar 2003 21:13:55 -0000 1.5
+++ proposals/imap2/java/org/apache/james/imapserver/commands/UnsubscribeCommand.java
23 Oct 2003 01:17:52 -0000
@@ -62,7 +62,6 @@
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.imapserver.store.ImapMailbox;
import org.apache.james.imapserver.store.MailboxException;
/**
Index: proposals/imap2/java/org/apache/james/imapserver/store/ImapMailbox.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/store/ImapMailbox.java,v
retrieving revision 1.10
diff -u -r1.10 ImapMailbox.java
--- proposals/imap2/java/org/apache/james/imapserver/store/ImapMailbox.java 21 Jul
2003 23:31:06 -0000 1.10
+++ proposals/imap2/java/org/apache/james/imapserver/store/ImapMailbox.java 23 Oct
2003 01:17:53 -0000
@@ -58,14 +58,13 @@
package org.apache.james.imapserver.store;
-import org.apache.james.core.MailImpl;
-import org.apache.james.imapserver.commands.IdSet;
-import org.apache.james.imapserver.commands.IdRange;
+import java.util.Date;
+import javax.mail.Flags;
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
-import javax.mail.Flags;
-import java.util.Date;
+
+import org.apache.james.core.MailImpl;
/**
* Represents a mailbox within an [EMAIL PROTECTED]
org.apache.james.imapserver.store.ImapStore}.
Index: proposals/imap2/java/org/apache/james/imapserver/store/InMemoryStore.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/java/org/apache/james/imapserver/store/InMemoryStore.java,v
retrieving revision 1.9
diff -u -r1.9 InMemoryStore.java
--- proposals/imap2/java/org/apache/james/imapserver/store/InMemoryStore.java 21 Jul
2003 23:31:06 -0000 1.9
+++ proposals/imap2/java/org/apache/james/imapserver/store/InMemoryStore.java 23 Oct
2003 01:17:56 -0000
@@ -58,17 +58,23 @@
package org.apache.james.imapserver.store;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.core.MailImpl;
-import org.apache.james.imapserver.ImapConstants;
-import org.apache.james.imapserver.commands.IdSet;
-import org.apache.james.imapserver.commands.IdRange;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.StringTokenizer;
+import javax.mail.Flags;
+import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
-import javax.mail.MessagingException;
-import javax.mail.Flags;
-import java.util.*;
+
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.core.MailImpl;
+import org.apache.james.imapserver.ImapConstants;
/**
* A simple in-memory implementation of [EMAIL PROTECTED] ImapStore}, used for testing
Index: proposals/imap2/test/org/apache/james/imapserver/CommandParserTest.java
===================================================================
RCS file:
/home/cvspublic/james-server/proposals/imap2/test/org/apache/james/imapserver/CommandParserTest.java,v
retrieving revision 1.8
diff -u -r1.8 CommandParserTest.java
--- proposals/imap2/test/org/apache/james/imapserver/CommandParserTest.java 21 Jul
2003 23:31:06 -0000 1.8
+++ proposals/imap2/test/org/apache/james/imapserver/CommandParserTest.java 23 Oct
2003 01:17:57 -0000
@@ -58,25 +58,17 @@
package org.apache.james.imapserver;
-import org.apache.james.imapserver.commands.CommandParser;
-import org.apache.james.imapserver.commands.IdSet;
-import org.apache.james.imapserver.commands.IdRange;
-
-import junit.framework.TestCase;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.InputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.Calendar;
-import java.util.SimpleTimeZone;
-import java.util.TimeZone;
import java.text.SimpleDateFormat;
-import java.text.DateFormat;
+import java.util.TimeZone;
+
+import junit.framework.TestCase;
+
+import org.apache.james.imapserver.commands.CommandParser;
+import org.apache.james.imapserver.commands.IdRange;
/**
* Tests for the [EMAIL PROTECTED] ImapRequestLineReader}.
Index: src/java/org/apache/james/James.java
===================================================================
RCS file: /home/cvspublic/james-server/src/java/org/apache/james/James.java,v
retrieving revision 1.61
diff -u -r1.61 James.java
--- src/java/org/apache/james/James.java 2 Jul 2003 11:15:50 -0000 1.61
+++ src/java/org/apache/james/James.java 23 Oct 2003 01:18:05 -0000
@@ -72,12 +72,14 @@
import java.util.Locale;
import java.util.Map;
import java.util.Vector;
+
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 org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
Index: src/java/org/apache/james/core/AvalonUsersStore.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.19
diff -u -r1.19 AvalonUsersStore.java
--- src/java/org/apache/james/core/AvalonUsersStore.java 8 Mar 2003 21:14:01
-0000 1.19
+++ src/java/org/apache/james/core/AvalonUsersStore.java 23 Oct 2003 01:18:06
-0000
@@ -65,11 +65,11 @@
*/
package org.apache.james.core;
+import java.util.HashMap;
+import java.util.Iterator;
+
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -77,11 +77,11 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.services.UsersStore;
import org.apache.mailet.UsersRepository;
-
-import java.util.HashMap;
-import java.util.Iterator;
/**
* Provides a registry of user repositories.
Index: src/java/org/apache/james/dnsserver/DNSServer.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.21
diff -u -r1.21 DNSServer.java
--- src/java/org/apache/james/dnsserver/DNSServer.java 19 Jun 2003 06:13:23 -0000
1.21
+++ src/java/org/apache/james/dnsserver/DNSServer.java 23 Oct 2003 01:18:08 -0000
@@ -208,7 +208,7 @@
* this mail domain name
*/
public Collection findMXRecords(String hostname) {
- Record answers[] = lookup(hostname, Type.MX);
+ Record answers[] = lookup(hostname, (short) Type.MX);
List servers = new ArrayList();
try {
if (answers == null) {
Index: src/java/org/apache/james/pop3server/POP3Handler.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.31
diff -u -r1.31 POP3Handler.java
--- src/java/org/apache/james/pop3server/POP3Handler.java 16 Jul 2003 04:03:22
-0000 1.31
+++ src/java/org/apache/james/pop3server/POP3Handler.java 23 Oct 2003 01:18:15
-0000
@@ -62,16 +62,15 @@
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.Socket;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
-import java.util.ArrayList;
import javax.mail.MessagingException;
Index: src/java/org/apache/james/transport/mailets/AbstractNotify.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/AbstractNotify.java,v
retrieving revision 1.10
diff -u -r1.10 AbstractNotify.java
--- src/java/org/apache/james/transport/mailets/AbstractNotify.java 14 Oct 2003
16:49:17 -0000 1.10
+++ src/java/org/apache/james/transport/mailets/AbstractNotify.java 23 Oct 2003
01:18:18 -0000
@@ -58,28 +58,18 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
-
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
import java.util.Collection;
import java.util.Iterator;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.RFC2822Headers;
/**
* <P>Abstract mailet providing configurable notification services.<BR>
Index: src/java/org/apache/james/transport/mailets/AbstractRedirect.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/AbstractRedirect.java,v
retrieving revision 1.20
diff -u -r1.20 AbstractRedirect.java
--- src/java/org/apache/james/transport/mailets/AbstractRedirect.java 3 Sep 2003
11:10:10 -0000 1.20
+++ src/java/org/apache/james/transport/mailets/AbstractRedirect.java 23 Oct 2003
01:18:30 -0000
@@ -60,33 +60,29 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
-import java.util.ArrayList;
-
import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.AddressException;
+import javax.mail.internet.ParseException;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.dates.RFC822DateFormat;
import org.apache.james.core.MailImpl;
-
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.dates.RFC822DateFormat;
/**
Index: src/java/org/apache/james/transport/mailets/Bounce.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/Bounce.java,v
retrieving revision 1.9
diff -u -r1.9 Bounce.java
--- src/java/org/apache/james/transport/mailets/Bounce.java 4 Jul 2003 16:46:12
-0000 1.9
+++ src/java/org/apache/james/transport/mailets/Bounce.java 23 Oct 2003 01:18:31
-0000
@@ -58,29 +58,14 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
+import java.util.Collection;
+import java.util.HashSet;
-import javax.mail.Address;
-import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.Session;
import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ArrayList;
+
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
/**
* <P>Generates a response to the reverse-path address.
Index: src/java/org/apache/james/transport/mailets/Forward.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/Forward.java,v
retrieving revision 1.20
diff -u -r1.20 Forward.java
--- src/java/org/apache/james/transport/mailets/Forward.java 3 Sep 2003 15:44:43
-0000 1.20
+++ src/java/org/apache/james/transport/mailets/Forward.java 23 Oct 2003 01:18:32
-0000
@@ -58,14 +58,13 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
+import java.util.Collection;
+import java.util.HashSet;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
-import java.util.Collection;
-import java.util.HashSet;
+
+import org.apache.mailet.MailAddress;
/**
* <P>Replaces incoming recipients with those specified, and resends the message
unaltered.</P>
Index: src/java/org/apache/james/transport/mailets/GenericListserv.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/GenericListserv.java,v
retrieving revision 1.20
diff -u -r1.20 GenericListserv.java
--- src/java/org/apache/james/transport/mailets/GenericListserv.java 30 Jun 2003
09:41:03 -0000 1.20
+++ src/java/org/apache/james/transport/mailets/GenericListserv.java 23 Oct 2003
01:18:34 -0000
@@ -60,7 +60,6 @@
import java.io.IOException;
import java.util.Collection;
-import java.util.Vector;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
Index: src/java/org/apache/james/transport/mailets/NotifyPostmaster.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java,v
retrieving revision 1.21
diff -u -r1.21 NotifyPostmaster.java
--- src/java/org/apache/james/transport/mailets/NotifyPostmaster.java 4 Jul 2003
16:46:12 -0000 1.21
+++ src/java/org/apache/james/transport/mailets/NotifyPostmaster.java 23 Oct 2003
01:18:35 -0000
@@ -58,27 +58,13 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
+import java.util.Collection;
+import java.util.HashSet;
-import javax.mail.Address;
-import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.Session;
import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Collection;
-import java.util.Iterator;
+
+import org.apache.mailet.MailAddress;
/**
* <P>Sends a notification message to the Postmaster.</P>
Index: src/java/org/apache/james/transport/mailets/NotifySender.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/NotifySender.java,v
retrieving revision 1.25
diff -u -r1.25 NotifySender.java
--- src/java/org/apache/james/transport/mailets/NotifySender.java 7 Jul 2003
06:16:21 -0000 1.25
+++ src/java/org/apache/james/transport/mailets/NotifySender.java 23 Oct 2003
01:18:37 -0000
@@ -58,27 +58,13 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
+import java.util.Collection;
+import java.util.HashSet;
-import javax.mail.Address;
-import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.Session;
import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Collection;
-import java.util.Iterator;
+
+import org.apache.mailet.MailAddress;
/**
* <P>Sends a notification message to the sender of a message.</P>
Index: src/java/org/apache/james/transport/mailets/Redirect.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/Redirect.java,v
retrieving revision 1.36
diff -u -r1.36 Redirect.java
--- src/java/org/apache/james/transport/mailets/Redirect.java 3 Sep 2003 11:10:10
-0000 1.36
+++ src/java/org/apache/james/transport/mailets/Redirect.java 23 Oct 2003 01:18:40
-0000
@@ -58,29 +58,12 @@
package org.apache.james.transport.mailets;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
import java.util.Collection;
-import java.util.Date;
-import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.ArrayList;
-
-import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.Session;
import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.apache.james.core.MailImpl;
-import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Index: src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java,v
retrieving revision 1.1
diff -u -r1.1 RemoveAllMailAttributes.java
--- src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java 15 Jul
2003 10:44:48 -0000 1.1
+++ src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java 23 Oct
2003 01:18:41 -0000
@@ -58,10 +58,10 @@
package org.apache.james.transport.mailets;
+import javax.mail.MessagingException;
+
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
-import org.apache.mailet.MailetException;
-import javax.mail.MessagingException;
/**
* This mailet sets removes all attributes set on the Mail instance
Index: src/java/org/apache/james/transport/mailets/Resend.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/mailets/Resend.java,v
retrieving revision 1.6
diff -u -r1.6 Resend.java
--- src/java/org/apache/james/transport/mailets/Resend.java 3 Sep 2003 11:10:10
-0000 1.6
+++ src/java/org/apache/james/transport/mailets/Resend.java 23 Oct 2003 01:18:43
-0000
@@ -58,34 +58,6 @@
package org.apache.james.transport.mailets;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.StringTokenizer;
-import java.util.ArrayList;
-
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.apache.james.core.MailImpl;
-
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-
-
/**
* <P>A mailet providing configurable redirection services.</P>
* <P>Can produce listserver, forward and notify behaviour, with the original
Index: src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java,v
retrieving revision 1.4
diff -u -r1.4 AttachmentFileNameIs.java
--- src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java 20 Jun
2003 11:55:47 -0000 1.4
+++ src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java 23 Oct
2003 01:18:55 -0000
@@ -58,18 +58,18 @@
package org.apache.james.transport.matchers;
-import org.apache.mailet.GenericMatcher;
-import org.apache.mailet.Mail;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Locale;
+import java.util.StringTokenizer;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
import javax.mail.internet.MimeMessage;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Locale;
+
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
/**
Index: src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java,v
retrieving revision 1.3
diff -u -r1.3 CompareNumericHeaderValue.java
--- src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java 12 Jul
2003 06:45:18 -0000 1.3
+++ src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java 23 Oct
2003 01:19:18 -0000
@@ -58,17 +58,14 @@
package org.apache.james.transport.matchers;
-import org.apache.mailet.GenericMatcher;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-
-import java.lang.NumberFormatException;
-
import java.util.Collection;
import java.util.StringTokenizer;
-import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
/**
* <P>Matches mails containing a header with a numeric value whose comparison with
the specified value is true.
Index: src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java,v
retrieving revision 1.9
diff -u -r1.9 RemoteAddrInNetwork.java
--- src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java 6 Jun
2003 23:51:38 -0000 1.9
+++ src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java 23 Oct
2003 01:19:20 -0000
@@ -58,10 +58,9 @@
package org.apache.james.transport.matchers;
-import org.apache.mailet.Mail;
-
-import javax.mail.MessagingException;
import java.util.Collection;
+
+import org.apache.mailet.Mail;
/**
* Checks the IP address of the sending server against a comma-
Index: src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java,v
retrieving revision 1.9
diff -u -r1.9 RemoteAddrNotInNetwork.java
--- src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java 6 Jun
2003 23:51:38 -0000 1.9
+++ src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java 23 Oct
2003 01:19:34 -0000
@@ -58,10 +58,9 @@
package org.apache.james.transport.matchers;
-import org.apache.mailet.Mail;
-
-import javax.mail.MessagingException;
import java.util.Collection;
+
+import org.apache.mailet.Mail;
/**
* Checks the IP address of the sending server against a comma-
Index: src/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java,v
retrieving revision 1.2
diff -u -r1.2 SMTPAuthSuccessful.java
--- src/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java 1 Sep
2003 09:54:50 -0000 1.2
+++ src/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java 23 Oct
2003 01:19:48 -0000
@@ -58,12 +58,10 @@
package org.apache.james.transport.matchers;
+import java.util.Collection;
+
import org.apache.mailet.GenericMatcher;
import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-
-import java.util.Collection;
-import java.util.StringTokenizer;
/**
* <P>Matches mails that are sent by an SMTP authenticated user.</P>
Index: src/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java,v
retrieving revision 1.2
diff -u -r1.2 SMTPAuthUserIs.java
--- src/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java 22 Jul 2003
22:21:22 -0000 1.2
+++ src/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java 23 Oct 2003
01:19:49 -0000
@@ -58,12 +58,11 @@
package org.apache.james.transport.matchers;
-import org.apache.mailet.GenericMatcher;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-
import java.util.Collection;
import java.util.StringTokenizer;
+
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
/**
* <P>Matches mails that are sent by an SMTP authenticated user present in a supplied
list.</P>
Index: src/java/org/apache/james/transport/matchers/SenderIsNull.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/transport/matchers/SenderIsNull.java,v
retrieving revision 1.1
diff -u -r1.1 SenderIsNull.java
--- src/java/org/apache/james/transport/matchers/SenderIsNull.java 24 Jun 2003
08:25:55 -0000 1.1
+++ src/java/org/apache/james/transport/matchers/SenderIsNull.java 23 Oct 2003
01:19:49 -0000
@@ -58,11 +58,10 @@
package org.apache.james.transport.matchers;
+import java.util.Collection;
+
import org.apache.mailet.GenericMatcher;
import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-
-import java.util.Collection;
/**
* <P>Matches mails that are sent by a null sender.</P>
Index: src/java/org/apache/james/util/connection/ServerConnection.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/util/connection/ServerConnection.java,v
retrieving revision 1.12
diff -u -r1.12 ServerConnection.java
--- src/java/org/apache/james/util/connection/ServerConnection.java 19 Oct 2003
23:41:54 -0000 1.12
+++ src/java/org/apache/james/util/connection/ServerConnection.java 23 Oct 2003
01:19:53 -0000
@@ -335,7 +335,7 @@
Iterator runnerIterator =
clientConnectionRunners.iterator();
getLogger().info("Connections: ");
while( runnerIterator.hasNext() ) {
- getLogger().info("
" + ((ClientConnectionRunner)runnerIterator.next()).toString());
+ getLogger().info(" " +
((ClientConnectionRunner)runnerIterator.next()).toString());
}
}
}
Index: src/java/org/apache/james/util/dbcp/JdbcDataSource.java
===================================================================
RCS file:
/home/cvspublic/james-server/src/java/org/apache/james/util/dbcp/JdbcDataSource.java,v
retrieving revision 1.2
diff -u -r1.2 JdbcDataSource.java
--- src/java/org/apache/james/util/dbcp/JdbcDataSource.java 19 Aug 2003 15:22:25
-0000 1.2
+++ src/java/org/apache/james/util/dbcp/JdbcDataSource.java 23 Oct 2003 01:19:54
-0000
@@ -8,34 +8,16 @@
package org.apache.james.util.dbcp;
import java.io.PrintWriter;
-import java.io.StringWriter;
-
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.Vector;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.InitialContext;
-
-//import javax.sql.DataSource;
-
-import org.apache.commons.dbcp.BasicDataSource;
-//import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
-//import org.apache.commons.pool.impl.GenericObjectPool;
-//import org.apache.commons.dbcp.ConnectionFactory;
-//import org.apache.commons.dbcp.DriverManagerConnectionFactory;
-//import org.apache.commons.dbcp.PoolingDataSource;
-//import org.apache.commons.dbcp.PoolableConnectionFactory;
-
-
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
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.AbstractLogEnabled;
+import org.apache.commons.dbcp.BasicDataSource;
/**
* <p>
-- Stefano.
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
