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/18 03:48:40 UTC
cvs commit: jakarta-james/src/java/org/apache/mailet GenericMailet.java GenericMatcher.java GenericRecipientMatcher.java Mail.java MailetConfig.java MailetContext.java MailetException.java Matcher.java
darrell 02/01/17 18:48:40
Modified: proposals/imap/java/org/apache/james/imapserver Flags.java
IMAPServer.java IMAPSystem.java
ImapRequestImpl.java ImapSession.java Mailbox.java
MimeMessageFileSource.java SimpleFolderRecord.java
SimpleMessageAttributes.java SimpleSystem.java
proposals/imap/java/org/apache/james/imapserver/commands
AbstractAclCommand.java CommandTemplate.java
CopyCommand.java DeleteAclCommand.java
DeleteCommand.java GetAclCommand.java
ImapCommandFactory.java ListOrLsubCommand.java
ListRightsCommand.java MyRightsCommand.java
RenameCommand.java SelectOrExamineCommand.java
SetAclCommand.java StatusCommand.java
SubscribeCommand.java UidCommand.java
UnsubscribeCommand.java
proposals/imap/java/org/apache/james/util Assert.java
src/java/org/apache/james BaseConnectionHandler.java
James.java
src/java/org/apache/james/core AvalonMailStore.java
AvalonUsersStore.java MailHeaders.java
MailImpl.java MailetConfigImpl.java
MatcherConfigImpl.java
MimeMessageInputStreamSource.java
MimeMessageWrapper.java
src/java/org/apache/james/dnsserver DNSServer.java
src/java/org/apache/james/mailrepository
AvalonMailRepository.java
AvalonSpoolRepository.java JDBCMailRepository.java
JDBCSpoolRepository.java
MimeMessageAvalonSource.java
MimeMessageJDBCSource.java
src/java/org/apache/james/nntpserver ArticleWriter.java
LISTGroup.java NNTPHandler.java NNTPServer.java
src/java/org/apache/james/nntpserver/repository
ArticleIDRepository.java NNTPArticleImpl.java
NNTPGroupImpl.java NNTPLineReader.java
NNTPLineReaderImpl.java NNTPRepository.java
NNTPRepositoryImpl.java NNTPSpooler.java
NNTPUtil.java
src/java/org/apache/james/pop3server POP3Handler.java
POP3Server.java
src/java/org/apache/james/remotemanager RemoteManager.java
RemoteManagerHandler.java
src/java/org/apache/james/security DigestUtil.java
src/java/org/apache/james/services MailRepository.java
MailServer.java
src/java/org/apache/james/smtpserver
MessageSizeException.java SMTPHandler.java
SMTPInputStream.java SMTPServer.java
SizeLimitedInputStream.java
src/java/org/apache/james/testing
MultiThreadDeliveryPounder.java NNTPClient.java
POP3Hammering.java
src/java/org/apache/james/transport JamesSpoolManager.java
LinearProcessor.java MailetLoader.java
MatchLoader.java
src/java/org/apache/james/transport/mailets AddFooter.java
AvalonListserv.java AvalonListservManager.java
Forward.java GenericListserv.java
GenericListservManager.java JDBCAlias.java
JDBCListserv.java LocalDelivery.java
NotifyPostmaster.java NotifySender.java Null.java
PostmasterAlias.java Redirect.java
RemoteDelivery.java ServerTime.java
ToProcessor.java ToRepository.java
UseHeaderRecipients.java
src/java/org/apache/james/transport/mailets/debug
Counter.java DumpSystemErr.java
ExceptionThrowingMailet.java Identity.java
src/java/org/apache/james/transport/matchers All.java
CommandForListserv.java HasAttachment.java
HostIs.java HostIsLocal.java
InSpammerBlacklist.java IsSingleRecipient.java
NESSpamCheck.java RecipientIs.java
RecipientIsLocal.java RelayLimit.java
RemoteAddrInNetwork.java
RemoteAddrNotInNetwork.java SenderInFakeDomain.java
SenderIs.java SizeGreaterThan.java SubjectIs.java
SubjectStartsWith.java UserIs.java
src/java/org/apache/james/userrepository
AbstractJdbcUsersRepository.java
AbstractUsersRepository.java DefaultJamesUser.java
DefaultUser.java DefaultUsersJdbcRepository.java
JamesUsersJdbcRepository.java
ListUsersJdbcRepository.java
UsersFileRepository.java UsersLDAPRepository.java
src/java/org/apache/james/util Base64.java
DebugInputStream.java RFC822Date.java
SchedulerNotifyInputStream.java
SchedulerNotifyOutputStream.java SqlResources.java
src/java/org/apache/james/util/mordred JdbcDataSource.java
PoolConnEntry.java
src/java/org/apache/mailet GenericMailet.java
GenericMatcher.java GenericRecipientMatcher.java
Mail.java MailetConfig.java MailetContext.java
MailetException.java Matcher.java
Log:
Cleaned up imports on all files. I didn't do this by hand, of course,
but used Intellij's "optimise imports" function.
Revision Changes Path
1.2 +2 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/Flags.java
Index: Flags.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/Flags.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Flags.java 31 Oct 2001 14:06:57 -0000 1.1
+++ Flags.java 18 Jan 2002 02:48:34 -0000 1.2
@@ -7,10 +7,11 @@
*/
package org.apache.james.imapserver;
+import org.apache.avalon.framework.activity.Initializable;
+
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-import org.apache.avalon.framework.activity.Initializable;
/**
* The set of flags associated with a message. The \Seen flag is maintained
1.3 +6 -9 jakarta-james/proposals/imap/java/org/apache/james/imapserver/IMAPServer.java
Index: IMAPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/IMAPServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IMAPServer.java 15 Jan 2002 08:38:25 -0000 1.2
+++ IMAPServer.java 18 Jan 2002 02:48:34 -0000 1.3
@@ -7,18 +7,15 @@
*/
package org.apache.james.imapserver;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-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.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.cornerstone.services.connection.AbstractService;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
* The Server listens on a specified port and passes connections to a
1.2 +2 -3 jakarta-james/proposals/imap/java/org/apache/james/imapserver/IMAPSystem.java
Index: IMAPSystem.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/IMAPSystem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IMAPSystem.java 31 Oct 2001 14:06:57 -0000 1.1
+++ IMAPSystem.java 18 Jan 2002 02:48:34 -0000 1.2
@@ -7,13 +7,12 @@
*/
package org.apache.james.imapserver;
-import java.util.Iterator;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.james.AuthenticationException;
+
+import java.util.Iterator;
/**
* An IMAP4rev1 messaging system, possible containing multiple Hosts. There
1.2 +0 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/ImapRequestImpl.java
Index: ImapRequestImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/ImapRequestImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImapRequestImpl.java 15 Jan 2002 08:38:25 -0000 1.1
+++ ImapRequestImpl.java 18 Jan 2002 02:48:34 -0000 1.2
@@ -7,8 +7,6 @@
*/
package org.apache.james.imapserver;
-import java.io.OutputStream;
-import java.io.PrintWriter;
import java.util.StringTokenizer;
/**
1.3 +1 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/ImapSession.java
Index: ImapSession.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/ImapSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImapSession.java 15 Jan 2002 12:13:59 -0000 1.2
+++ ImapSession.java 18 Jan 2002 02:48:34 -0000 1.3
@@ -8,11 +8,10 @@
package org.apache.james.imapserver;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.james.services.UsersRepository;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.imapserver.commands.ImapCommand;
+import org.apache.james.services.UsersRepository;
import java.io.BufferedReader;
import java.io.PrintWriter;
1.3 +5 -5 jakarta-james/proposals/imap/java/org/apache/james/imapserver/Mailbox.java
Index: Mailbox.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/Mailbox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mailbox.java 15 Jan 2002 08:38:25 -0000 1.2
+++ Mailbox.java 18 Jan 2002 02:48:34 -0000 1.3
@@ -7,16 +7,16 @@
*/
package org.apache.james.imapserver;
-import java.util.List;
-import java.util.Map;
-import javax.mail.internet.InternetHeaders;
-import javax.mail.internet.MimeMessage;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.core.MimeMessageWrapper;
-import org.apache.mailet.Mail;
+
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeMessage;
+import java.util.List;
+import java.util.Map;
/**
* Interface for objects representing an IMAP4rev1 mailbox (folder). Contains
1.2 +2 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/MimeMessageFileSource.java
Index: MimeMessageFileSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/MimeMessageFileSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MimeMessageFileSource.java 31 Oct 2001 14:06:57 -0000 1.1
+++ MimeMessageFileSource.java 18 Jan 2002 02:48:34 -0000 1.2
@@ -7,10 +7,11 @@
*/
package org.apache.james.imapserver;
+import org.apache.james.core.MimeMessageSource;
+
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.core.MimeMessageSource;
public class MimeMessageFileSource extends MimeMessageSource {
1.3 +2 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleFolderRecord.java
Index: SimpleFolderRecord.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleFolderRecord.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleFolderRecord.java 15 Jan 2002 08:38:25 -0000 1.2
+++ SimpleFolderRecord.java 18 Jan 2002 02:48:34 -0000 1.3
@@ -7,10 +7,11 @@
*/
package org.apache.james.imapserver;
+import org.apache.avalon.framework.activity.Initializable;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.activity.Initializable;
/**
* Object representing the record of a folder in an IMAP on an IMAP Host.
1.3 +7 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleMessageAttributes.java 17 Jan 2002 06:09:00 -0000 1.2
+++ SimpleMessageAttributes.java 18 Jan 2002 02:48:34 -0000 1.3
@@ -7,18 +7,16 @@
*/
package org.apache.james.imapserver;
-import java.io.*;
-import java.util.*;
-import javax.mail.BodyPart;
-import javax.mail.Header;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.*;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.util.RFC822DateFormat;
import org.apache.log.Logger;
-import org.apache.mailet.*;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.BodyPart;
+import javax.mail.MessagingException;
+import javax.mail.internet.*;
+import java.io.Serializable;
+import java.util.*;
/**
* Attributes of a Message in IMAP4rev1 style. Message
1.3 +7 -5 jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleSystem.java
Index: SimpleSystem.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleSystem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleSystem.java 15 Jan 2002 08:38:25 -0000 1.2
+++ SimpleSystem.java 18 Jan 2002 02:48:34 -0000 1.3
@@ -7,18 +7,20 @@
*/
package org.apache.james.imapserver;
-import java.util.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
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.phoenix.Block;
import org.apache.james.AuthenticationException;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
/**
* A simple, single-server, implementation of IMAPSystem.
1.3 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/AbstractAclCommand.java
Index: AbstractAclCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/AbstractAclCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAclCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ AbstractAclCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -9,9 +9,9 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ImapSessionState;
import java.util.StringTokenizer;
1.3 +0 -6 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/CommandTemplate.java
Index: CommandTemplate.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/CommandTemplate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommandTemplate.java 15 Jan 2002 12:14:00 -0000 1.2
+++ CommandTemplate.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -8,14 +8,8 @@
package org.apache.james.imapserver.commands;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.james.AccessControlException;
import org.apache.james.imapserver.*;
-
-import java.util.List;
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Iterator;
abstract class CommandTemplate
extends AbstractLogEnabled implements ImapCommand, ImapConstants
1.2 +5 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/CopyCommand.java
Index: CopyCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/CopyCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopyCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ CopyCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -9,10 +9,13 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.*;
+import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
+import org.apache.james.imapserver.MessageAttributes;
-import java.util.StringTokenizer;
import java.util.List;
+import java.util.StringTokenizer;
class CopyCommand extends SelectedStateCommand
{
1.2 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/DeleteAclCommand.java
Index: DeleteAclCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/DeleteAclCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteAclCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ DeleteAclCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -9,9 +9,9 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
class DeleteAclCommand extends AbstractAclCommand
{
1.3 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/DeleteCommand.java
Index: DeleteCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/DeleteCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ DeleteCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -7,12 +7,12 @@
*/
package org.apache.james.imapserver.commands;
-import org.apache.james.AuthorizationException;
import org.apache.james.AccessControlException;
+import org.apache.james.AuthorizationException;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.MailboxException;
import org.apache.james.imapserver.ImapSessionState;
+import org.apache.james.imapserver.MailboxException;
import java.util.StringTokenizer;
1.2 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/GetAclCommand.java
Index: GetAclCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/GetAclCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetAclCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ GetAclCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -9,9 +9,9 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
class GetAclCommand extends AbstractAclCommand
{
1.2 +3 -3 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/ImapCommandFactory.java
Index: ImapCommandFactory.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/ImapCommandFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImapCommandFactory.java 15 Jan 2002 08:38:26 -0000 1.1
+++ ImapCommandFactory.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -7,14 +7,14 @@
*/
package org.apache.james.imapserver.commands;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.james.imapserver.CommandFetch;
import org.apache.james.imapserver.CommandStore;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* A factory for ImapCommand instances, provided based on the command name.
1.3 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/ListOrLsubCommand.java
Index: ListOrLsubCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/ListOrLsubCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListOrLsubCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ ListOrLsubCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -10,12 +10,12 @@
import org.apache.james.AccessControlException;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.MailboxException;
import org.apache.james.imapserver.ImapSessionState;
+import org.apache.james.imapserver.MailboxException;
-import java.util.StringTokenizer;
import java.util.Collection;
import java.util.Iterator;
+import java.util.StringTokenizer;
class ListOrLsubCommand extends AuthenticatedSelectedStateCommand
{
1.2 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/ListRightsCommand.java
Index: ListRightsCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/ListRightsCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListRightsCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ ListRightsCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -9,9 +9,9 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
import java.util.StringTokenizer;
1.2 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/MyRightsCommand.java
Index: MyRightsCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/MyRightsCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MyRightsCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ MyRightsCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -9,9 +9,9 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
class MyRightsCommand extends AbstractAclCommand
{
1.3 +1 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/RenameCommand.java
Index: RenameCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/RenameCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenameCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ RenameCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -10,8 +10,8 @@
import org.apache.james.AuthorizationException;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.MailboxException;
import org.apache.james.imapserver.ImapSessionState;
+import org.apache.james.imapserver.MailboxException;
import java.util.StringTokenizer;
1.3 +1 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/SelectOrExamineCommand.java
Index: SelectOrExamineCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/SelectOrExamineCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SelectOrExamineCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ SelectOrExamineCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -8,9 +8,9 @@
package org.apache.james.imapserver.commands;
import org.apache.james.AccessControlException;
+import org.apache.james.imapserver.ACLMailbox;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ACLMailbox;
import org.apache.james.imapserver.ImapSessionState;
import java.util.StringTokenizer;
1.2 +2 -2 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/SetAclCommand.java
Index: SetAclCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/SetAclCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetAclCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ SetAclCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -9,9 +9,9 @@
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
-import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ACLMailbox;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
class SetAclCommand extends AbstractAclCommand
{
1.3 +3 -3 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/StatusCommand.java
Index: StatusCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/StatusCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatusCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ StatusCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -10,12 +10,12 @@
import org.apache.james.AccessControlException;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.MailboxException;
import org.apache.james.imapserver.ImapSessionState;
+import org.apache.james.imapserver.MailboxException;
-import java.util.StringTokenizer;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
class StatusCommand extends AuthenticatedSelectedStateCommand
{
1.3 +1 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/SubscribeCommand.java
Index: SubscribeCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/SubscribeCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SubscribeCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ SubscribeCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -10,8 +10,8 @@
import org.apache.james.AccessControlException;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.MailboxException;
import org.apache.james.imapserver.ImapSessionState;
+import org.apache.james.imapserver.MailboxException;
import java.util.StringTokenizer;
1.2 +4 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/UidCommand.java
Index: UidCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/UidCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UidCommand.java 15 Jan 2002 08:38:26 -0000 1.1
+++ UidCommand.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -7,7 +7,10 @@
*/
package org.apache.james.imapserver.commands;
-import org.apache.james.imapserver.*;
+import org.apache.james.imapserver.CommandFetch;
+import org.apache.james.imapserver.CommandStore;
+import org.apache.james.imapserver.ImapRequest;
+import org.apache.james.imapserver.ImapSession;
import java.util.StringTokenizer;
1.3 +1 -1 jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/UnsubscribeCommand.java
Index: UnsubscribeCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/commands/UnsubscribeCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnsubscribeCommand.java 15 Jan 2002 12:14:00 -0000 1.2
+++ UnsubscribeCommand.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -10,8 +10,8 @@
import org.apache.james.AccessControlException;
import org.apache.james.imapserver.ImapRequest;
import org.apache.james.imapserver.ImapSession;
-import org.apache.james.imapserver.MailboxException;
import org.apache.james.imapserver.ImapSessionState;
+import org.apache.james.imapserver.MailboxException;
import java.util.StringTokenizer;
1.3 +1 -1 jakarta-james/proposals/imap/java/org/apache/james/util/Assert.java
Index: Assert.java
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/util/Assert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Assert.java 15 Jan 2002 12:14:01 -0000 1.2
+++ Assert.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -1,6 +1,6 @@
package org.apache.james.util;
-import org.apache.avalon.framework.CascadingRuntimeException;
+
/**
* A set of debugging utilities.
1.6 +4 -25 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseConnectionHandler.java 17 Jan 2002 06:09:01 -0000 1.5
+++ BaseConnectionHandler.java 18 Jan 2002 02:48:35 -0000 1.6
@@ -7,34 +7,13 @@
*/
package org.apache.james;
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import javax.mail.internet.*;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
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.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;
-import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.james.AccessControlException;
-import org.apache.james.AuthenticationException;
-import org.apache.james.AuthorizationException;
-import org.apache.james.Constants;
-import org.apache.james.services.*;
-import org.apache.james.util.InternetPrintWriter;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
* Different connection handlers extend this class
1.17 +24 -22 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- James.java 17 Jan 2002 06:09:01 -0000 1.16
+++ James.java 18 Jan 2002 02:48:35 -0000 1.17
@@ -7,39 +7,41 @@
*/
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.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.excalibur.thread.ThreadPool;
-import org.apache.james.core.*;
+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.services.*;
-import org.apache.james.transport.*;
import org.apache.james.userrepository.DefaultJamesUser;
import org.apache.james.util.RFC822DateFormat;
-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:
@@ -52,8 +54,8 @@
* @author Serge
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.16 $
- * Committed on $Date: 2002/01/17 06:09:01 $ by: $Author: darrell $
+ * This is $Revision: 1.17 $
+ * Committed on $Date: 2002/01/18 02:48:35 $ by: $Author: darrell $
*/
public class James
extends AbstractLogEnabled
1.10 +3 -6 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AvalonMailStore.java 17 Jan 2002 06:09:01 -0000 1.9
+++ AvalonMailStore.java 18 Jan 2002 02:48:35 -0000 1.10
@@ -7,13 +7,9 @@
*/
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.Component;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentException;
-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.Configurable;
@@ -25,11 +21,12 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.phoenix.Block;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailStore;
import org.apache.james.services.SpoolRepository;
-import org.apache.avalon.phoenix.Block;
+
+import java.util.HashMap;
/**
* Provides Registry of mail repositories. A mail repository is uniquely
1.6 +4 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AvalonUsersStore.java 17 Jan 2002 06:09:01 -0000 1.5
+++ AvalonUsersStore.java 18 Jan 2002 02:48:35 -0000 1.6
@@ -7,10 +7,6 @@
*/
package org.apache.james.core;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -23,9 +19,12 @@
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.phoenix.Block;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
-import org.apache.avalon.phoenix.Block;
+
+import java.util.HashMap;
+import java.util.Iterator;
/**
*
1.2 +3 -4 jakarta-james/src/java/org/apache/james/core/MailHeaders.java
Index: MailHeaders.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MailHeaders.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailHeaders.java 11 Sep 2001 04:32:12 -0000 1.1
+++ MailHeaders.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -8,11 +8,10 @@
package org.apache.james.core;
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import javax.mail.internet.*;
import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
+import java.io.*;
+import java.util.Enumeration;
/**
* This interface defines a container for mail headers. Each header must use
1.10 +12 -5 jakarta-james/src/java/org/apache/james/core/MailImpl.java
Index: MailImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MailImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MailImpl.java 5 Dec 2001 22:11:48 -0000 1.9
+++ MailImpl.java 18 Jan 2002 02:48:35 -0000 1.10
@@ -7,12 +7,19 @@
*/
package org.apache.james.core;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.ParseException;
import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashSet;
/**
* Wrap a MimeMessage adding routing informations (from SMTP) and same simple API.
1.2 +4 -6 jakarta-james/src/java/org/apache/james/core/MailetConfigImpl.java
Index: MailetConfigImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MailetConfigImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailetConfigImpl.java 11 May 2001 09:15:43 -0000 1.1
+++ MailetConfigImpl.java 18 Jan 2002 02:48:35 -0000 1.2
@@ -7,14 +7,12 @@
*/
package org.apache.james.core;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.mailet.*;
+import org.apache.mailet.MailetConfig;
+import org.apache.mailet.MailetContext;
+
+import java.util.Iterator;
/**
*
1.3 +2 -6 jakarta-james/src/java/org/apache/james/core/MatcherConfigImpl.java
Index: MatcherConfigImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MatcherConfigImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MatcherConfigImpl.java 9 Oct 2001 04:00:17 -0000 1.2
+++ MatcherConfigImpl.java 18 Jan 2002 02:48:35 -0000 1.3
@@ -7,12 +7,8 @@
*/
package org.apache.james.core;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.MailetContext;
+import org.apache.mailet.MatcherConfig;
/**
* The implementation of the configuration object for a Matcher.
1.4 +1 -8 jakarta-james/src/java/org/apache/james/core/MimeMessageInputStreamSource.java
Index: MimeMessageInputStreamSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MimeMessageInputStreamSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MimeMessageInputStreamSource.java 5 Dec 2001 22:11:48 -0000 1.3
+++ MimeMessageInputStreamSource.java 18 Jan 2002 02:48:35 -0000 1.4
@@ -7,14 +7,7 @@
*/
package org.apache.james.core;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
/**
* MimeMessageInputStreamSource.java
1.7 +6 -4 jakarta-james/src/java/org/apache/james/core/MimeMessageWrapper.java
Index: MimeMessageWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MimeMessageWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MimeMessageWrapper.java 7 Dec 2001 21:53:39 -0000 1.6
+++ MimeMessageWrapper.java 18 Jan 2002 02:48:35 -0000 1.7
@@ -7,12 +7,14 @@
*/
package org.apache.james.core;
-import java.io.*;
-import java.text.ParseException;
-import java.util.*;
-import javax.activation.*;
+import javax.activation.DataHandler;
import javax.mail.*;
import javax.mail.internet.*;
+import java.io.*;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Vector;
/**
* This object wraps a MimeMessage, only loading the underlying MimeMessage
1.5 +5 -24 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DNSServer.java 17 Jan 2002 06:09:01 -0000 1.4
+++ DNSServer.java 18 Jan 2002 02:48:36 -0000 1.5
@@ -7,36 +7,17 @@
*/
package org.apache.james.dnsserver;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.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.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.Block;
-import org.apache.james.transport.Resources;
-import org.xbill.DNS.Cache;
-import org.xbill.DNS.Credibility;
-import org.xbill.DNS.DClass;
-import org.xbill.DNS.ExtendedResolver;
-import org.xbill.DNS.Header;
-import org.xbill.DNS.MXRecord;
-import org.xbill.DNS.Message;
-import org.xbill.DNS.Name;
-import org.xbill.DNS.RRset;
-import org.xbill.DNS.Rcode;
-import org.xbill.DNS.Record;
-import org.xbill.DNS.Resolver;
-import org.xbill.DNS.SetResponse;
-import org.xbill.DNS.Type;
+import org.xbill.DNS.*;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
/**
* @version 1.0.0, 18/06/2000
1.12 +6 -13 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AvalonMailRepository.java 17 Jan 2002 06:09:01 -0000 1.11
+++ AvalonMailRepository.java 18 Jan 2002 02:48:36 -0000 1.12
@@ -7,16 +7,9 @@
*/
package org.apache.james.mailrepository;
-import java.io.EOFException;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import org.apache.avalon.cornerstone.services.store.ObjectRepository;
+import org.apache.avalon.cornerstone.services.store.Store;
+import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -27,14 +20,14 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
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;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailStore;
import org.apache.james.util.Lock;
+
+import java.io.OutputStream;
+import java.util.*;
/**
* Implementation of a MailRepository on a FileSystem.
1.4 +3 -5 jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java
Index: AvalonSpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AvalonSpoolRepository.java 26 Oct 2001 04:36:39 -0000 1.3
+++ AvalonSpoolRepository.java 18 Jan 2002 02:48:36 -0000 1.4
@@ -7,14 +7,12 @@
*/
package org.apache.james.mailrepository;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import javax.mail.MessagingException;
-import org.apache.james.util.Lock;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailStore;
import org.apache.james.services.SpoolRepository;
import org.apache.mailet.Mail;
+
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
/**
* Implementation of a MailRepository on a FileSystem.
1.16 +12 -32 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JDBCMailRepository.java 17 Jan 2002 06:09:01 -0000 1.15
+++ JDBCMailRepository.java 18 Jan 2002 02:48:36 -0000 1.16
@@ -7,40 +7,15 @@
*/
package org.apache.james.mailrepository;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import javax.mail.internet.MimeMessage;
+import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.cornerstone.services.store.StreamRepository;
-import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -50,14 +25,19 @@
import org.apache.avalon.framework.context.Contextualizable;
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;
+import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.services.MailRepository;
-import org.apache.james.services.SpoolRepository;
import org.apache.james.util.Lock;
import org.apache.james.util.SqlResources;
-import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+
+import javax.mail.internet.MimeMessage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.OutputStream;
+import java.sql.*;
+import java.util.*;
/**
* Implementation of a MailRepository on a database.
1.11 +3 -23 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JDBCSpoolRepository.java 17 Jan 2002 06:09:01 -0000 1.10
+++ JDBCSpoolRepository.java 18 Jan 2002 02:48:36 -0000 1.11
@@ -7,34 +7,14 @@
*/
package org.apache.james.mailrepository;
+import org.apache.james.services.SpoolRepository;
+import org.apache.mailet.Mail;
+
import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
-import java.util.Set;
-import java.util.StringTokenizer;
-import javax.mail.internet.MimeMessage;
-import org.apache.avalon.framework.component.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.logger.AbstractLogEnabled;
-import org.apache.james.core.MimeMessageWrapper;
-import org.apache.james.core.MailImpl;
-import org.apache.james.services.SpoolRepository;
-import org.apache.james.util.Lock;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
/**
* Implementation of a SpoolRepository on a database.
1.2 +3 -2 jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
Index: MimeMessageAvalonSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MimeMessageAvalonSource.java 6 Aug 2001 03:42:18 -0000 1.1
+++ MimeMessageAvalonSource.java 18 Jan 2002 02:48:36 -0000 1.2
@@ -7,10 +7,11 @@
*/
package org.apache.james.mailrepository;
-import java.io.IOException;
-import java.io.InputStream;
import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.james.core.MimeMessageSource;
+
+import java.io.IOException;
+import java.io.InputStream;
public class MimeMessageAvalonSource extends MimeMessageSource {
1.4 +3 -5 jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
Index: MimeMessageJDBCSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MimeMessageJDBCSource.java 5 Dec 2001 22:14:33 -0000 1.3
+++ MimeMessageJDBCSource.java 18 Jan 2002 02:48:36 -0000 1.4
@@ -7,19 +7,17 @@
*/
package org.apache.james.mailrepository;
+import org.apache.avalon.cornerstone.services.store.StreamRepository;
+import org.apache.james.core.MimeMessageSource;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
-import org.apache.james.core.MimeMessageSource;
-import org.apache.avalon.cornerstone.services.store.StreamRepository;
-import org.apache.james.util.SqlResources;
/**
* This class points to a specific message in a repository. This will return an
1.3 +2 -1 jakarta-james/src/java/org/apache/james/nntpserver/ArticleWriter.java
Index: ArticleWriter.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/ArticleWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArticleWriter.java 10 Nov 2001 23:09:27 -0000 1.2
+++ ArticleWriter.java 18 Jan 2002 02:48:36 -0000 1.3
@@ -7,8 +7,9 @@
*/
package org.apache.james.nntpserver;
-import java.io.PrintWriter;
import org.apache.james.nntpserver.repository.NNTPArticle;
+
+import java.io.PrintWriter;
/**
1.3 +2 -1 jakarta-james/src/java/org/apache/james/nntpserver/LISTGroup.java
Index: LISTGroup.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/LISTGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LISTGroup.java 10 Nov 2001 23:09:27 -0000 1.2
+++ LISTGroup.java 18 Jan 2002 02:48:36 -0000 1.3
@@ -7,8 +7,9 @@
*/
package org.apache.james.nntpserver;
-import java.io.PrintWriter;
import org.apache.james.nntpserver.repository.NNTPGroup;
+
+import java.io.PrintWriter;
/**
* formatted Group Information.
1.11 +10 -16 jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java
Index: NNTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NNTPHandler.java 12 Jan 2002 01:10:30 -0000 1.10
+++ NNTPHandler.java 18 Jan 2002 02:48:36 -0000 1.11
@@ -7,20 +7,6 @@
*/
package org.apache.james.nntpserver;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
import org.apache.avalon.cornerstone.services.scheduler.Target;
@@ -29,14 +15,22 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
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.Logger;
import org.apache.james.BaseConnectionHandler;
import org.apache.james.nntpserver.repository.NNTPArticle;
import org.apache.james.nntpserver.repository.NNTPGroup;
import org.apache.james.nntpserver.repository.NNTPLineReaderImpl;
import org.apache.james.nntpserver.repository.NNTPRepository;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* The NNTP protocol is defined by RFC 977.
1.4 +3 -3 jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.java
Index: NNTPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPServer.java 10 Nov 2001 23:09:27 -0000 1.3
+++ NNTPServer.java 18 Jan 2002 02:48:36 -0000 1.4
@@ -7,14 +7,14 @@
*/
package org.apache.james.nntpserver;
-import java.net.InetAddress;
-import java.io.PrintStream;
-import java.net.UnknownHostException;
import org.apache.avalon.cornerstone.services.connection.AbstractService;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
* NNTP Server Protocol Handler
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ArticleIDRepository.java 17 Jan 2002 06:09:01 -0000 1.4
+++ ArticleIDRepository.java 18 Jan 2002 02:48:36 -0000 1.5
@@ -7,15 +7,15 @@
*/
package org.apache.james.nntpserver.repository;
+import org.apache.james.util.Base64;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Date;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
-import org.apache.james.util.Base64;
/**
* ArticleIDRepository: contains one file for each article.
1.3 +3 -7 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticleImpl.java
Index: NNTPArticleImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticleImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPArticleImpl.java 10 Nov 2001 23:10:59 -0000 1.2
+++ NNTPArticleImpl.java 18 Jan 2002 02:48:36 -0000 1.3
@@ -7,14 +7,10 @@
*/
package org.apache.james.nntpserver.repository;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.mail.internet.InternetHeaders;
import org.apache.james.nntpserver.NNTPException;
+
+import javax.mail.internet.InternetHeaders;
+import java.io.*;
/**
* Please see NNTPArticle for comments
1.4 +5 -4 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPGroupImpl.java
Index: NNTPGroupImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPGroupImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPGroupImpl.java 18 Nov 2001 01:12:22 -0000 1.3
+++ NNTPGroupImpl.java 18 Jan 2002 02:48:36 -0000 1.4
@@ -7,15 +7,16 @@
*/
package org.apache.james.nntpserver.repository;
+import org.apache.avalon.excalibur.io.AndFileFilter;
+import org.apache.avalon.excalibur.io.ExtensionFileFilter;
+import org.apache.avalon.excalibur.io.InvertedFileFilter;
+import org.apache.james.nntpserver.DateSinceFileFilter;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.apache.avalon.excalibur.io.AndFileFilter;
-import org.apache.avalon.excalibur.io.ExtensionFileFilter;
-import org.apache.avalon.excalibur.io.InvertedFileFilter;
-import org.apache.james.nntpserver.DateSinceFileFilter;
/**
* Group is represented by a directory.
1.3 +2 -2 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReader.java
Index: NNTPLineReader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPLineReader.java 10 Nov 2001 23:10:59 -0000 1.2
+++ NNTPLineReader.java 18 Jan 2002 02:48:36 -0000 1.3
@@ -7,9 +7,9 @@
*/
package org.apache.james.nntpserver.repository;
-import java.io.*;
-/**
+
+/**
* Read and translates client data.
*
* @author Harmeet Bedi <ha...@kodemuse.com>
1.3 +2 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReaderImpl.java
Index: NNTPLineReaderImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReaderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPLineReaderImpl.java 10 Nov 2001 23:10:59 -0000 1.2
+++ NNTPLineReaderImpl.java 18 Jan 2002 02:48:36 -0000 1.3
@@ -7,9 +7,10 @@
*/
package org.apache.james.nntpserver.repository;
+import org.apache.james.nntpserver.NNTPException;
+
import java.io.BufferedReader;
import java.io.IOException;
-import org.apache.james.nntpserver.NNTPException;
/**
* reads and translates client data. After this translation,
1.3 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepository.java
Index: NNTPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPRepository.java 10 Nov 2001 23:10:59 -0000 1.2
+++ NNTPRepository.java 18 Jan 2002 02:48:36 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.james.nntpserver.repository;
-import java.util.Iterator;
import java.util.Date;
+import java.util.Iterator;
/**
* Abstraction of entire NNTP Repository.
1.5 +9 -8 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPRepositoryImpl.java 17 Jan 2002 06:09:01 -0000 1.4
+++ NNTPRepositoryImpl.java 18 Jan 2002 02:48:36 -0000 1.5
@@ -7,14 +7,6 @@
*/
package org.apache.james.nntpserver.repository;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
import org.apache.avalon.excalibur.io.AndFileFilter;
import org.apache.avalon.excalibur.io.DirectoryFileFilter;
import org.apache.avalon.framework.activity.Initializable;
@@ -29,6 +21,15 @@
import org.apache.james.nntpserver.DateSinceFileFilter;
import org.apache.james.nntpserver.NNTPException;
import org.apache.oro.io.GlobFilenameFilter;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
/**
* NNTP Repository implementation.
1.5 +7 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPSpooler.java 17 Jan 2002 06:09:01 -0000 1.4
+++ NNTPSpooler.java 18 Jan 2002 02:48:36 -0000 1.5
@@ -7,9 +7,7 @@
*/
package org.apache.james.nntpserver.repository;
-import java.io.*;
-import java.util.*;
-import javax.mail.internet.MimeMessage;
+import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -19,8 +17,13 @@
import org.apache.avalon.framework.context.Contextualizable;
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;
+
+import javax.mail.internet.MimeMessage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
/**
* Processes entries and sends to appropriate groups.
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPUtil.java 17 Jan 2002 06:09:01 -0000 1.4
+++ NNTPUtil.java 18 Jan 2002 02:48:36 -0000 1.5
@@ -7,8 +7,6 @@
*/
package org.apache.james.nntpserver.repository;
-import java.io.File;
-import java.io.PrintStream;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -18,6 +16,9 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.james.nntpserver.NNTPException;
+
+import java.io.File;
+import java.io.PrintStream;
/**
* Helper fuctions.
1.5 +11 -23 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- POP3Handler.java 17 Jan 2002 06:09:01 -0000 1.4
+++ POP3Handler.java 18 Jan 2002 02:48:37 -0000 1.5
@@ -7,44 +7,32 @@
*/
package org.apache.james.pop3server;
-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.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import javax.mail.MessagingException;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.excalibur.collections.ListUtils;
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.Configurable;
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.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-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;
-import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.avalon.excalibur.collections.ListUtils;
+import org.apache.james.BaseConnectionHandler;
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
-import org.apache.james.BaseConnectionHandler;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.SchedulerNotifyOutputStream;
import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import java.io.*;
+import java.net.Socket;
+import java.util.*;
/**
* @author Federico Barbieri <sc...@systemy.it>
1.2 +5 -4 jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java
Index: POP3Server.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- POP3Server.java 11 May 2001 09:26:01 -0000 1.1
+++ POP3Server.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,13 +7,14 @@
*/
package org.apache.james.pop3server;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.cornerstone.services.connection.AbstractService;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
* @version 1.0.0, 24/04/1999
1.2 +5 -4 jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java
Index: RemoteManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteManager.java 11 May 2001 09:39:32 -0000 1.1
+++ RemoteManager.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,13 +7,14 @@
*/
package org.apache.james.remotemanager;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.cornerstone.services.connection.AbstractService;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
* Provides a really rude network interface to administer James.
1.9 +19 -19 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RemoteManagerHandler.java 17 Jan 2002 06:09:01 -0000 1.8
+++ RemoteManagerHandler.java 18 Jan 2002 02:48:37 -0000 1.9
@@ -7,31 +7,31 @@
*/
package org.apache.james.remotemanager;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.internet.ParseException;
-import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
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.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.avalon.cornerstone.services.connection.ConnectionHandler;
-import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.avalon.cornerstone.services.scheduler.Target;
-import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.james.Constants;
import org.apache.james.BaseConnectionHandler;
-import org.apache.james.services.MailServer;
-import org.apache.james.services.User;
-import org.apache.james.services.JamesUser;
-import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
-import org.apache.mailet.MailAddress;
+import org.apache.james.Constants;
+import org.apache.james.services.*;
import org.apache.james.userrepository.DefaultUser;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.internet.ParseException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.StringTokenizer;
/**
* Provides a really rude network interface to administer James.
@@ -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: darrell $ on $Date: 2002/01/17 06:09:01 $
- * $Revision: 1.8 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/18 02:48:37 $
+ * $Revision: 1.9 $
*
*/
public class RemoteManagerHandler
1.2 +4 -8 jakarta-james/src/java/org/apache/james/security/DigestUtil.java
Index: DigestUtil.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/security/DigestUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DigestUtil.java 11 Jun 2001 09:29:30 -0000 1.1
+++ DigestUtil.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,15 +7,11 @@
*/
package org.apache.james.security;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import javax.mail.MessagingException;
import javax.mail.internet.MimeUtility;
+import java.io.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
/**
@@ -23,8 +19,8 @@
*
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * Last changed by: $Author: charlesb $ on $Date: 2001/06/11 09:29:30 $
- * $Revision: 1.1 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/18 02:48:37 $
+ * $Revision: 1.2 $
*/
public class DigestUtil {
1.3 +2 -1 jakarta-james/src/java/org/apache/james/services/MailRepository.java
Index: MailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailRepository.java 6 Aug 2001 04:14:51 -0000 1.2
+++ MailRepository.java 18 Jan 2002 02:48:37 -0000 1.3
@@ -7,8 +7,9 @@
*/
package org.apache.james.services;
-import java.util.Iterator;
import org.apache.james.core.MailImpl;
+
+import java.util.Iterator;
/**
* Interface for a Repository to store Mails.
1.7 +7 -6 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MailServer.java 17 Jan 2002 06:09:02 -0000 1.6
+++ MailServer.java 18 Jan 2002 02:48:37 -0000 1.7
@@ -7,21 +7,22 @@
*/
package org.apache.james.services;
-import java.io.InputStream;
-import java.util.Collection;
-import javax.mail.MessagingException;
-import javax.mail.internet.*;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.io.InputStream;
+import java.util.Collection;
+
/**
* The interface for Phoenix blocks to the James MailServer
*
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.6 $
- * Committed on $Date: 2002/01/17 06:09:02 $ by: $Author: darrell $
+ * This is $Revision: 1.7 $
+ * Committed on $Date: 2002/01/18 02:48:37 $ by: $Author: darrell $
*/
public interface MailServer
{
1.2 +1 -1 jakarta-james/src/java/org/apache/james/smtpserver/MessageSizeException.java
Index: MessageSizeException.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/MessageSizeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessageSizeException.java 11 May 2001 09:47:16 -0000 1.1
+++ MessageSizeException.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.james.smtpserver;
-import java.io.*;
+import java.io.IOException;
/**
* This exceptions is used to indicate when a new MimeMessage has exceeded
1.15 +17 -19 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SMTPHandler.java 17 Jan 2002 06:09:02 -0000 1.14
+++ SMTPHandler.java 18 Jan 2002 02:48:37 -0000 1.15
@@ -7,33 +7,31 @@
*/
package org.apache.james.smtpserver;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
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.Configurable;
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.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-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;
-import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.james.*;
-import org.apache.james.core.*;
+import org.apache.james.BaseConnectionHandler;
+import org.apache.james.Constants;
+import org.apache.james.core.MailHeaders;
+import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.*;
-import org.apache.mailet.*;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
+import java.io.*;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.*;
/**
* This handles an individual incoming message. It handles regular SMTP
@@ -44,8 +42,8 @@
* @author Matthew Pangaro <ma...@lokitech.com>
* @author Danny Angus <da...@thought.co.uk>
*
- * This is $Revision: 1.14 $
- * Committed on $Date: 2002/01/17 06:09:02 $ by: $Author: darrell $
+ * This is $Revision: 1.15 $
+ * Committed on $Date: 2002/01/18 02:48:37 $ by: $Author: darrell $
*/
public class SMTPHandler
extends BaseConnectionHandler
1.2 +3 -1 jakarta-james/src/java/org/apache/james/smtpserver/SMTPInputStream.java
Index: SMTPInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SMTPInputStream.java 11 Aug 2001 18:25:03 -0000 1.1
+++ SMTPInputStream.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,7 +7,9 @@
*/
package org.apache.james.smtpserver;
-import java.io.*;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
/**
* Removes the dot-stuffing happing during the SMTP DATA transport
1.2 +5 -4 jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java
Index: SMTPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SMTPServer.java 11 May 2001 09:47:16 -0000 1.1
+++ SMTPServer.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,13 +7,14 @@
*/
package org.apache.james.smtpserver;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.cornerstone.services.connection.AbstractService;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
*
1.3 +2 -2 jakarta-james/src/java/org/apache/james/smtpserver/SizeLimitedInputStream.java
Index: SizeLimitedInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SizeLimitedInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SizeLimitedInputStream.java 26 Nov 2001 03:28:25 -0000 1.2
+++ SizeLimitedInputStream.java 18 Jan 2002 02:48:37 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.james.smtpserver;
-import java.io.*;
-import org.apache.james.smtpserver.*;
+import java.io.IOException;
+import java.io.InputStream;
/** This class wraps an underlying input stream, limiting the allowable size
* of an incoming MimeMessage. The size limit is configured in the conf file,
1.3 +9 -3 jakarta-james/src/java/org/apache/james/testing/MultiThreadDeliveryPounder.java
Index: MultiThreadDeliveryPounder.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/testing/MultiThreadDeliveryPounder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiThreadDeliveryPounder.java 3 Dec 2001 22:57:34 -0000 1.2
+++ MultiThreadDeliveryPounder.java 18 Jan 2002 02:48:37 -0000 1.3
@@ -7,9 +7,15 @@
*/
package org.apache.james.testing;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
/**
* Creates numerous threads
1.2 +5 -5 jakarta-james/src/java/org/apache/james/testing/NNTPClient.java
Index: NNTPClient.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/testing/NNTPClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NNTPClient.java 11 May 2001 09:47:17 -0000 1.1
+++ NNTPClient.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,12 +7,12 @@
*/
package org.apache.james.testing;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import sun.net.nntp.*;
import org.apache.avalon.excalibur.io.IOUtil;
-import java.io.*;
+import sun.net.nntp.NewsgroupInfo;
+import sun.net.nntp.NntpClient;
+
+import java.io.File;
+import java.io.FileOutputStream;
/**
* @author Harmeet <hb...@apache.org>
1.2 +3 -2 jakarta-james/src/java/org/apache/james/testing/POP3Hammering.java
Index: POP3Hammering.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/testing/POP3Hammering.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- POP3Hammering.java 11 May 2001 09:47:17 -0000 1.1
+++ POP3Hammering.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,9 +7,10 @@
*/
package org.apache.james.testing;
-import java.util.*;
import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.util.Properties;
/**
* Program that can be run multiple times to recreate the
1.8 +8 -9 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JamesSpoolManager.java 17 Jan 2002 06:09:02 -0000 1.7
+++ JamesSpoolManager.java 18 Jan 2002 02:48:37 -0000 1.8
@@ -7,10 +7,6 @@
*/
package org.apache.james.transport;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.MessagingException;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
@@ -27,17 +23,20 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.Block;
-import org.apache.james.*;
-import org.apache.james.core.*;
-import org.apache.james.services.*;
+import org.apache.james.core.MailImpl;
+import org.apache.james.services.MailStore;
+import org.apache.james.services.SpoolRepository;
import org.apache.mailet.*;
+import javax.mail.MessagingException;
+import java.util.HashMap;
+
/**
* @author Serge Knystautas <se...@lokitech.com>
* @author Federico Barbieri <sc...@systemy.it>
*
- * This is $Revision: 1.7 $
- * Committed on $Date: 2002/01/17 06:09:02 $ by: $Author: darrell $
+ * This is $Revision: 1.8 $
+ * Committed on $Date: 2002/01/18 02:48:37 $ by: $Author: darrell $
*/
public class JamesSpoolManager
extends AbstractLogEnabled
1.5 +9 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinearProcessor.java 17 Jan 2002 06:09:02 -0000 1.4
+++ LinearProcessor.java 18 Jan 2002 02:48:37 -0000 1.5
@@ -7,16 +7,20 @@
*/
package org.apache.james.transport;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
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.core.MailImpl;
import org.apache.james.services.SpoolRepository;
import org.apache.mailet.*;
+
+import javax.mail.MessagingException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+import java.util.Vector;
/**
* @author Serge Knystautas <se...@lokitech.com>
1.2 +7 -4 jakarta-james/src/java/org/apache/james/transport/MailetLoader.java
Index: MailetLoader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/MailetLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailetLoader.java 11 May 2001 10:36:19 -0000 1.1
+++ MailetLoader.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,14 +7,17 @@
*/
package org.apache.james.transport;
-import java.util.*;
-import javax.mail.*;
import org.apache.avalon.framework.component.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.james.core.*;
-import org.apache.mailet.*;
+import org.apache.james.core.MailetConfigImpl;
+import org.apache.mailet.Mailet;
+import org.apache.mailet.MailetContext;
+import org.apache.mailet.MailetException;
+
+import javax.mail.MessagingException;
+import java.util.Vector;
/**
* @author Serge Knystautas <se...@lokitech.com>
1.2 +7 -4 jakarta-james/src/java/org/apache/james/transport/MatchLoader.java
Index: MatchLoader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/MatchLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MatchLoader.java 11 May 2001 10:36:19 -0000 1.1
+++ MatchLoader.java 18 Jan 2002 02:48:37 -0000 1.2
@@ -7,14 +7,17 @@
*/
package org.apache.james.transport;
-import java.util.*;
-import javax.mail.*;
import org.apache.avalon.framework.component.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.james.core.*;
-import org.apache.mailet.*;
+import org.apache.james.core.MatcherConfigImpl;
+import org.apache.mailet.MailetContext;
+import org.apache.mailet.MailetException;
+import org.apache.mailet.Matcher;
+
+import javax.mail.MessagingException;
+import java.util.Vector;
/**
* @author Serge Knystautas <se...@lokitech.com>
1.3 +10 -7 jakarta-james/src/java/org/apache/james/transport/mailets/AddFooter.java
Index: AddFooter.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AddFooter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddFooter.java 12 Aug 2001 06:14:56 -0000 1.2
+++ AddFooter.java 18 Jan 2002 02:48:37 -0000 1.3
@@ -7,13 +7,16 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.james.*;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.internet.MimePart;
+import java.io.IOException;
+import java.util.StringTokenizer;
/**
* This mailet will attach text to the end of the message (like a footer). Right
1.3 +9 -8 jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListserv.java
Index: AvalonListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListserv.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AvalonListserv.java 24 Jun 2001 13:18:36 -0000 1.2
+++ AvalonListserv.java 18 Jan 2002 02:48:37 -0000 1.3
@@ -7,16 +7,17 @@
*/
package org.apache.james.transport.mailets;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.james.*;
+import org.apache.james.Constants;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.internet.ParseException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
/**
* MailingListServer capability.
@@ -29,8 +30,8 @@
* <br><subjectprefix>
*
* @author <a href="sergek@lokitech.com">Serge Knystautas </a>
- * @version This is $Revision: 1.2 $
- * Committed on $Date: 2001/06/24 13:18:36 $ by: $Author: charlesb $
+ * @version This is $Revision: 1.3 $
+ * Committed on $Date: 2002/01/18 02:48:37 $ by: $Author: darrell $
*/
public class AvalonListserv extends GenericListserv {
1.3 +4 -8 jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListservManager.java
Index: AvalonListservManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListservManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AvalonListservManager.java 24 Jun 2001 13:18:36 -0000 1.2
+++ AvalonListservManager.java 18 Jan 2002 02:48:38 -0000 1.3
@@ -7,16 +7,12 @@
*/
package org.apache.james.transport.mailets;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.james.*;
+import org.apache.james.Constants;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
+import org.apache.mailet.MailAddress;
/**
* Adds or removes an email address to a listserv.
@@ -27,8 +23,8 @@
* <br></mailet>
*
* @author <a href="sergek@lokitech.com">Serge Knystautas </a>
- * @version This is $Revision: 1.2 $
- * Committed on $Date: 2001/06/24 13:18:36 $ by: $Author: charlesb $
+ * @version This is $Revision: 1.3 $
+ * Committed on $Date: 2002/01/18 02:48:38 $ by: $Author: darrell $
*/
public class AvalonListservManager extends GenericListservManager {
1.2 +8 -4 jakarta-james/src/java/org/apache/james/transport/mailets/Forward.java
Index: Forward.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Forward.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Forward.java 11 May 2001 10:01:03 -0000 1.1
+++ Forward.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,14 @@
*/
package org.apache.james.transport.mailets;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.StringTokenizer;
/**
* Replace incoming recipient with specified ones.
1.3 +11 -5 jakarta-james/src/java/org/apache/james/transport/mailets/GenericListserv.java
Index: GenericListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/GenericListserv.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GenericListserv.java 31 Oct 2001 21:28:22 -0000 1.2
+++ GenericListserv.java 18 Jan 2002 02:48:38 -0000 1.3
@@ -7,11 +7,17 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetException;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Vector;
/**
* An abstract implementation of a listserv. The underlying implementation must define
1.2 +5 -5 jakarta-james/src/java/org/apache/james/transport/mailets/GenericListservManager.java
Index: GenericListservManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/GenericListservManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericListservManager.java 11 May 2001 10:01:03 -0000 1.1
+++ GenericListservManager.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,11 +7,11 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
/**
* An abstract implementation of a listserv manager. This mailet reads the
1.7 +11 -9 jakarta-james/src/java/org/apache/james/transport/mailets/JDBCAlias.java
Index: JDBCAlias.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/JDBCAlias.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCAlias.java 7 Dec 2001 21:52:22 -0000 1.6
+++ JDBCAlias.java 18 Jan 2002 02:48:38 -0000 1.7
@@ -7,19 +7,21 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
-
import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.james.Constants;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetException;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
+import java.sql.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
/**
* Rewrites recipient addresses based on a database table. The connection
1.6 +8 -9 jakarta-james/src/java/org/apache/james/transport/mailets/JDBCListserv.java
Index: JDBCListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/JDBCListserv.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCListserv.java 7 Dec 2001 21:52:22 -0000 1.5
+++ JDBCListserv.java 18 Jan 2002 02:48:38 -0000 1.6
@@ -7,19 +7,18 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
-
import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.james.Constants;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetException;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
+import java.sql.*;
+import java.util.Collection;
+import java.util.Vector;
/**
* Rewrites recipient addresses based on a database table. The connection
1.2 +7 -2 jakarta-james/src/java/org/apache/james/transport/mailets/LocalDelivery.java
Index: LocalDelivery.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/LocalDelivery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalDelivery.java 11 May 2001 10:01:03 -0000 1.1
+++ LocalDelivery.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,9 +7,14 @@
*/
package org.apache.james.transport.mailets;
-import org.apache.mailet.*;
-import java.util.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
import javax.mail.MessagingException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
/**
* Receive a Mail from JamesSpoolManager and takes care of delivery
1.4 +19 -7 jakarta-james/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java
Index: NotifyPostmaster.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NotifyPostmaster.java 30 Nov 2001 14:00:01 -0000 1.3
+++ NotifyPostmaster.java 18 Jan 2002 02:48:38 -0000 1.4
@@ -7,14 +7,26 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.james.*;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
import org.apache.james.util.RFC822Date;
+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.HashSet;
+import java.util.Iterator;
+import java.util.Set;
/**
* Sends an error message to the sender of a message (that's typically landed in
1.4 +18 -7 jakarta-james/src/java/org/apache/james/transport/mailets/NotifySender.java
Index: NotifySender.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/NotifySender.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NotifySender.java 30 Nov 2001 14:00:01 -0000 1.3
+++ NotifySender.java 18 Jan 2002 02:48:38 -0000 1.4
@@ -7,14 +7,25 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.james.*;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
import org.apache.james.util.RFC822Date;
+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.HashSet;
+import java.util.Set;
/**
* Sends an error message to the sender of a message (that's typically landed in
1.2 +2 -1 jakarta-james/src/java/org/apache/james/transport/mailets/Null.java
Index: Null.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Null.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Null.java 11 May 2001 10:01:03 -0000 1.1
+++ Null.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,7 +7,8 @@
*/
package org.apache.james.transport.mailets;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
/**
* Simpliest Mailet which destroy any incoming messages.
1.3 +9 -4 jakarta-james/src/java/org/apache/james/transport/mailets/PostmasterAlias.java
Index: PostmasterAlias.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/PostmasterAlias.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PostmasterAlias.java 11 Aug 2001 21:32:31 -0000 1.2
+++ PostmasterAlias.java 18 Jan 2002 02:48:38 -0000 1.3
@@ -7,10 +7,15 @@
*/
package org.apache.james.transport.mailets;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetContext;
+
+import javax.mail.MessagingException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
//import com.workingdogs.town.*;
/**
1.3 +17 -5 jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java
Index: Redirect.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Redirect.java 18 Dec 2001 10:00:09 -0000 1.2
+++ Redirect.java 18 Jan 2002 02:48:38 -0000 1.3
@@ -8,12 +8,24 @@
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
import org.apache.james.util.RFC822Date;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+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.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.StringTokenizer;
/**
*<P>A mailet providing configurable redirection services<BR>
1.13 +17 -16 jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RemoteDelivery.java 7 Dec 2001 23:28:34 -0000 1.12
+++ RemoteDelivery.java 18 Jan 2002 02:48:38 -0000 1.13
@@ -7,26 +7,27 @@
*/
package org.apache.james.transport.mailets;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.Address;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.URLName;
-import javax.mail.SendFailedException;
-import javax.mail.internet.*;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.james.*;
-import org.apache.james.core.*;
+import org.apache.james.Constants;
+import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
import org.apache.james.services.MailStore;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.*;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.ParseException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.util.*;
/**
* Receive a MessageContainer from JamesSpoolManager and takes care of delivery
@@ -44,8 +45,8 @@
* @author Serge Knystautas <se...@lokitech.com>
* @author Federico Barbieri <sc...@pop.systemy.it>
*
- * This is $Revision: 1.12 $
- * Committed on $Date: 2001/12/07 23:28:34 $ by: $Author: serge $
+ * This is $Revision: 1.13 $
+ * Committed on $Date: 2002/01/18 02:48:38 $ by: $Author: darrell $
*/
public class RemoteDelivery extends GenericMailet implements Runnable {
1.2 +9 -6 jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java
Index: ServerTime.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerTime.java 11 May 2001 10:01:03 -0000 1.1
+++ ServerTime.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,12 +7,15 @@
*/
package org.apache.james.transport.mailets;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
-import org.apache.james.*;
-import org.apache.james.transport.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.Address;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.util.HashSet;
+import java.util.Set;
/**
* Returns the current time for the mail server. Sample configuration:
1.2 +5 -2 jakarta-james/src/java/org/apache/james/transport/mailets/ToProcessor.java
Index: ToProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ToProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToProcessor.java 11 May 2001 10:01:03 -0000 1.1
+++ ToProcessor.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,11 @@
*/
package org.apache.james.transport.mailets;
-import org.apache.mailet.*;
-import javax.mail.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailetException;
+
+import javax.mail.MessagingException;
/**
* No idea what this class is for..... seems to send processor of a message to
1.4 +6 -8 jakarta-james/src/java/org/apache/james/transport/mailets/ToRepository.java
Index: ToRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ToRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ToRepository.java 21 Jun 2001 16:04:54 -0000 1.3
+++ ToRepository.java 18 Jan 2002 02:48:38 -0000 1.4
@@ -7,17 +7,15 @@
*/
package org.apache.james.transport.mailets;
-import java.util.*;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.james.*;
-import org.apache.james.core.*;
+import org.apache.james.Constants;
+import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailStore;
-import org.apache.james.transport.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
/**
* Stores incoming Mail in the specified Repository.
@@ -26,8 +24,8 @@
* @version 1.0.0, 24/04/1999
* @author Federico Barbieri <sc...@pop.systemy.it>
*
- * This is $Revision: 1.3 $
- * Committed on $Date: 2001/06/21 16:04:54 $ by: $Author: charlesb $
+ * This is $Revision: 1.4 $
+ * Committed on $Date: 2002/01/18 02:48:38 $ by: $Author: darrell $
*/
public class ToRepository extends GenericMailet {
1.2 +10 -4 jakarta-james/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
Index: UseHeaderRecipients.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UseHeaderRecipients.java 11 May 2001 10:01:03 -0000 1.1
+++ UseHeaderRecipients.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,16 @@
*/
package org.apache.james.transport.mailets;
-import org.apache.mailet.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* <p>Mailet designed to process the recipients from the mail headers rather
1.2 +2 -1 jakarta-james/src/java/org/apache/james/transport/mailets/debug/Counter.java
Index: Counter.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/debug/Counter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Counter.java 26 Oct 2001 04:51:14 -0000 1.1
+++ Counter.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,7 +7,8 @@
*/
package org.apache.james.transport.mailets.debug;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
/**
* A simple in memory counter. Designed to count messages sent to this recipient
1.2 +6 -4 jakarta-james/src/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
Index: DumpSystemErr.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DumpSystemErr.java 11 Aug 2001 21:32:10 -0000 1.1
+++ DumpSystemErr.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,12 @@
*/
package org.apache.james.transport.mailets.debug;
-import java.io.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.io.IOException;
/**
* Debugging purpose Mailet. Sends the message to System.err
1.2 +5 -2 jakarta-james/src/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
Index: ExceptionThrowingMailet.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExceptionThrowingMailet.java 11 Aug 2001 21:32:10 -0000 1.1
+++ ExceptionThrowingMailet.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,11 @@
*/
package org.apache.james.transport.mailets.debug;
-import javax.mail.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailetException;
+
+import javax.mail.MessagingException;
/**
* Debugging purpose Mailet. Just throws an exception.
1.2 +2 -1 jakarta-james/src/java/org/apache/james/transport/mailets/debug/Identity.java
Index: Identity.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/debug/Identity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Identity.java 11 Aug 2001 21:32:10 -0000 1.1
+++ Identity.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,7 +7,8 @@
*/
package org.apache.james.transport.mailets.debug;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
/**
* Opposite of Null Mailet. It let any incoming mail untouched. Used only for
1.2 +4 -2 jakarta-james/src/java/org/apache/james/transport/matchers/All.java
Index: All.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/All.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- All.java 11 May 2001 10:13:56 -0000 1.1
+++ All.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,10 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import java.util.Collection;
/**
* @version 1.0.0, 24/04/1999
1.2 +4 -4 jakarta-james/src/java/org/apache/james/transport/matchers/CommandForListserv.java
Index: CommandForListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/CommandForListserv.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandForListserv.java 11 May 2001 10:13:57 -0000 1.1
+++ CommandForListserv.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,10 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
/**
* Returns positive if the recipient is a command for a listserv. For example,
1.2 +6 -4 jakarta-james/src/java/org/apache/james/transport/matchers/HasAttachment.java
Index: HasAttachment.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/HasAttachment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HasAttachment.java 11 Aug 2001 22:02:00 -0000 1.1
+++ HasAttachment.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,12 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
/**
* Checks whether this message has an attachment
1.2 +6 -2 jakarta-james/src/java/org/apache/james/transport/matchers/HostIs.java
Index: HostIs.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/HostIs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HostIs.java 11 May 2001 10:13:57 -0000 1.1
+++ HostIs.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,12 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
+import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.MailAddress;
+
+import java.util.Collection;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* @version 1.0.0, 24/04/1999
1.2 +2 -2 jakarta-james/src/java/org/apache/james/transport/matchers/HostIsLocal.java
Index: HostIsLocal.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/HostIsLocal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HostIsLocal.java 11 May 2001 10:13:57 -0000 1.1
+++ HostIsLocal.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.MailAddress;
/**
* @version 1.0.0, 24/04/1999
1.2 +8 -4 jakarta-james/src/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
Index: InSpammerBlacklist.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/InSpammerBlacklist.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InSpammerBlacklist.java 11 May 2001 10:13:57 -0000 1.1
+++ InSpammerBlacklist.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,14 @@
*/
package org.apache.james.transport.matchers;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.StringTokenizer;
/**
* Checks the network IP address of the sending server against a
1.2 +4 -2 jakarta-james/src/java/org/apache/james/transport/matchers/IsSingleRecipient.java
Index: IsSingleRecipient.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/IsSingleRecipient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IsSingleRecipient.java 11 May 2001 10:13:57 -0000 1.1
+++ IsSingleRecipient.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,10 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import java.util.Collection;
/**
* @version 1.0.0, 04/12/2000
1.2 +10 -5 jakarta-james/src/java/org/apache/james/transport/matchers/NESSpamCheck.java
Index: NESSpamCheck.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/NESSpamCheck.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NESSpamCheck.java 26 Oct 2001 04:54:40 -0000 1.1
+++ NESSpamCheck.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,11 +7,16 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import org.apache.oro.text.regex.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+import org.apache.oro.text.regex.MalformedPatternException;
+import org.apache.oro.text.regex.Pattern;
+import org.apache.oro.text.regex.Perl5Compiler;
+import org.apache.oro.text.regex.Perl5Matcher;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
/**
* This is based on a sample filter.cfg for a Netscape Mail Server to stop
1.2 +6 -3 jakarta-james/src/java/org/apache/james/transport/matchers/RecipientIs.java
Index: RecipientIs.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/RecipientIs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RecipientIs.java 11 May 2001 10:13:57 -0000 1.1
+++ RecipientIs.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,9 +7,12 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import javax.mail.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.MailAddress;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
/**
* @version 1.0.0, 24/04/1999
1.2 +3 -2 jakarta-james/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java
Index: RecipientIsLocal.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RecipientIsLocal.java 11 May 2001 10:13:57 -0000 1.1
+++ RecipientIsLocal.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,9 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
+import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetContext;
/**
* @version 1.0.0, 24/04/1999
1.2 +7 -4 jakarta-james/src/java/org/apache/james/transport/matchers/RelayLimit.java
Index: RelayLimit.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/RelayLimit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelayLimit.java 11 May 2001 10:13:57 -0000 1.1
+++ RelayLimit.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,13 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import java.util.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.Header;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.Enumeration;
/**
*
1.2 +10 -4 jakarta-james/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java
Index: RemoteAddrInNetwork.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteAddrInNetwork.java 11 May 2001 10:13:57 -0000 1.1
+++ RemoteAddrInNetwork.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,16 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Checks the IP address of the sending server against a comma-
1.2 +10 -4 jakarta-james/src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java
Index: RemoteAddrNotInNetwork.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteAddrNotInNetwork.java 11 May 2001 10:13:57 -0000 1.1
+++ RemoteAddrNotInNetwork.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,16 @@
*/
package org.apache.james.transport.matchers;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Checks the IP address of the sending server against a comma-
1.3 +4 -2 jakarta-james/src/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
Index: SenderInFakeDomain.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/SenderInFakeDomain.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SenderInFakeDomain.java 11 Aug 2001 21:45:33 -0000 1.2
+++ SenderInFakeDomain.java 18 Jan 2002 02:48:38 -0000 1.3
@@ -7,8 +7,10 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import java.util.Collection;
/**
* Does a DNS lookup (MX and A/CNAME records) on the sender's domain. If
1.2 +6 -2 jakarta-james/src/java/org/apache/james/transport/matchers/SenderIs.java
Index: SenderIs.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/SenderIs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SenderIs.java 11 May 2001 10:13:57 -0000 1.1
+++ SenderIs.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,12 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import java.util.Collection;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* @version 1.0.0, 24/04/1999
1.3 +8 -4 jakarta-james/src/java/org/apache/james/transport/matchers/SizeGreaterThan.java
Index: SizeGreaterThan.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/SizeGreaterThan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SizeGreaterThan.java 11 Aug 2001 21:54:22 -0000 1.2
+++ SizeGreaterThan.java 18 Jan 2002 02:48:38 -0000 1.3
@@ -7,10 +7,14 @@
*/
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.Header;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.Enumeration;
/**
* Checks whether the message (entire message, not just content) is greater
1.2 +5 -4 jakarta-james/src/java/org/apache/james/transport/matchers/SubjectIs.java
Index: SubjectIs.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/SubjectIs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SubjectIs.java 11 May 2001 10:13:57 -0000 1.1
+++ SubjectIs.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,11 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
/**
*
1.2 +6 -4 jakarta-james/src/java/org/apache/james/transport/matchers/SubjectStartsWith.java
Index: SubjectStartsWith.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/SubjectStartsWith.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SubjectStartsWith.java 11 May 2001 10:13:57 -0000 1.1
+++ SubjectStartsWith.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,10 +7,12 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
/**
*
1.2 +5 -2 jakarta-james/src/java/org/apache/james/transport/matchers/UserIs.java
Index: UserIs.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/UserIs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserIs.java 11 May 2001 10:13:57 -0000 1.1
+++ UserIs.java 18 Jan 2002 02:48:38 -0000 1.2
@@ -7,8 +7,11 @@
*/
package org.apache.james.transport.matchers;
-import java.util.*;
-import org.apache.mailet.*;
+import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.MailAddress;
+
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* @version 1.0.0, 24/04/1999
1.4 +16 -11 jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
Index: AbstractJdbcUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractJdbcUsersRepository.java 12 Jan 2002 01:10:30 -0000 1.3
+++ AbstractJdbcUsersRepository.java 18 Jan 2002 02:48:39 -0000 1.4
@@ -7,22 +7,27 @@
*/
package org.apache.james.userrepository;
-import org.apache.james.services.*;
-import org.apache.james.util.SqlResources;
-import org.apache.mailet.MailAddress;
-import org.apache.avalon.framework.*;
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.component.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
-import org.apache.avalon.framework.logger.*;
-import org.apache.avalon.excalibur.datasource.*;
import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.CascadingRuntimeException;
+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.configuration.Configurable;
+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.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.phoenix.BlockContext;
+import org.apache.james.services.User;
+import org.apache.james.util.SqlResources;
+import java.io.File;
import java.sql.*;
import java.util.*;
-import java.io.File;
/**
* An abstract base class for creating UserRepository implementation
1.4 +6 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractUsersRepository.java 17 Jan 2002 06:09:02 -0000 1.3
+++ AbstractUsersRepository.java 18 Jan 2002 02:48:39 -0000 1.4
@@ -7,9 +7,13 @@
*/
package org.apache.james.userrepository;
-import java.util.*;
-import org.apache.james.services.*;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.services.User;
+import org.apache.james.services.UsersRepository;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
/**
* A partial implementation of a Repository to store users.
1.2 +2 -4 jakarta-james/src/java/org/apache/james/userrepository/DefaultJamesUser.java
Index: DefaultJamesUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultJamesUser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultJamesUser.java 11 Jun 2001 09:29:35 -0000 1.1
+++ DefaultJamesUser.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -7,9 +7,7 @@
*/
package org.apache.james.userrepository;
-import java.io.Serializable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.james.services.User;
import org.apache.james.services.JamesUser;
import org.apache.mailet.MailAddress;
@@ -18,8 +16,8 @@
*
* @author Charles Benett <ch...@benett1.demon.co.uk>
*
- * Last changed by: $Author: charlesb $ on $Date: 2001/06/11 09:29:35 $
- * $Revision: 1.1 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/18 02:48:39 $
+ * $Revision: 1.2 $
*/
public class DefaultJamesUser
1.2 +5 -6 jakarta-james/src/java/org/apache/james/userrepository/DefaultUser.java
Index: DefaultUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultUser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultUser.java 11 Jun 2001 09:29:35 -0000 1.1
+++ DefaultUser.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -7,21 +7,20 @@
*/
package org.apache.james.userrepository;
-import java.io.Serializable;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
import org.apache.james.security.DigestUtil;
import org.apache.james.services.User;
+import java.io.Serializable;
+import java.security.NoSuchAlgorithmException;
+
/**
* Implementation of User Interface. Instances of this class do not allow
* the the user name to be reset.
*
* @author Charles Benett <ch...@benett1.demon.co.uk>
*
- * Last changed by: $Author: charlesb $ on $Date: 2001/06/11 09:29:35 $
- * $Revision: 1.1 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/18 02:48:39 $
+ * $Revision: 1.2 $
*/
public class DefaultUser implements User, Serializable {
1.2 +4 -1 jakarta-james/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
Index: DefaultUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultUsersJdbcRepository.java 11 Sep 2001 04:34:49 -0000 1.1
+++ DefaultUsersJdbcRepository.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -8,7 +8,10 @@
package org.apache.james.userrepository;
import org.apache.james.services.User;
-import java.sql.*;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
/**
1.2 +1 -1 jakarta-james/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
Index: JamesUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JamesUsersJdbcRepository.java 11 Sep 2001 04:34:49 -0000 1.1
+++ JamesUsersJdbcRepository.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -10,8 +10,8 @@
import org.apache.james.services.User;
import org.apache.mailet.MailAddress;
-import java.sql.ResultSet;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
/**
1.2 +4 -1 jakarta-james/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
Index: ListUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListUsersJdbcRepository.java 11 Sep 2001 04:34:49 -0000 1.1
+++ ListUsersJdbcRepository.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -8,7 +8,10 @@
package org.apache.james.userrepository;
import org.apache.james.services.User;
-import java.sql.*;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
/**
* A very lightweight UserRepository, which persists a list
1.5 +9 -8 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UsersFileRepository.java 17 Jan 2002 06:09:02 -0000 1.4
+++ UsersFileRepository.java 18 Jan 2002 02:48:39 -0000 1.5
@@ -7,8 +7,9 @@
*/
package org.apache.james.userrepository;
-import java.io.File;
-import java.util.Iterator;
+import org.apache.avalon.cornerstone.services.store.ObjectRepository;
+import org.apache.avalon.cornerstone.services.store.Store;
+import org.apache.avalon.excalibur.concurrent.Lock;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -19,11 +20,11 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
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;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.User;
+import org.apache.james.services.UsersRepository;
+
+import java.io.File;
+import java.util.Iterator;
/**
* Implementation of a Repository to store users on the File System.
@@ -38,8 +39,8 @@
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * Last changed by: $Author: darrell $ on $Date: 2002/01/17 06:09:02 $
- * $Revision: 1.4 $
+ * Last changed by: $Author: darrell $ on $Date: 2002/01/18 02:48:39 $
+ * $Revision: 1.5 $
*/
public class UsersFileRepository
extends AbstractLogEnabled
1.5 +6 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UsersLDAPRepository.java 17 Jan 2002 06:09:02 -0000 1.4
+++ UsersLDAPRepository.java 18 Jan 2002 02:48:39 -0000 1.5
@@ -7,13 +7,8 @@
*/
package org.apache.james.userrepository;
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.naming.directory.*;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -25,6 +20,12 @@
import org.apache.james.Constants;
import org.apache.james.services.User;
import org.apache.james.services.UsersRepository;
+
+import javax.naming.AuthenticationException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.*;
+import java.util.*;
/**
* Implementation of a Repository to store users.
1.3 +4 -5 jakarta-james/src/java/org/apache/james/util/Base64.java
Index: Base64.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/Base64.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Base64.java 25 Jun 2001 18:13:27 -0000 1.2
+++ Base64.java 18 Jan 2002 02:48:39 -0000 1.3
@@ -7,20 +7,19 @@
*/
package org.apache.james.util;
+import javax.mail.internet.MimeUtility;
import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.InputStreamReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import javax.mail.internet.MimeUtility;
+import java.io.InputStreamReader;
/**
* Simple Base64 string decoding function
* @author Jason Borden <jb...@javasense.com>
*
- * This is $Revision: 1.2 $
- * Committed on $Date: 2001/06/25 18:13:27 $ by: $Author: charlesb $
+ * This is $Revision: 1.3 $
+ * Committed on $Date: 2002/01/18 02:48:39 $ by: $Author: darrell $
*/
public class Base64 {
1.3 +2 -1 jakarta-james/src/java/org/apache/james/util/DebugInputStream.java
Index: DebugInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/DebugInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DebugInputStream.java 25 Nov 2001 21:14:58 -0000 1.2
+++ DebugInputStream.java 18 Jan 2002 02:48:39 -0000 1.3
@@ -7,7 +7,8 @@
*/
package org.apache.james.util;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
public class DebugInputStream extends InputStream {
InputStream in = null;
1.3 +1 -1 jakarta-james/src/java/org/apache/james/util/RFC822Date.java
Index: RFC822Date.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/RFC822Date.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RFC822Date.java 4 Oct 2001 10:44:04 -0000 1.2
+++ RFC822Date.java 18 Jan 2002 02:48:39 -0000 1.3
@@ -9,11 +9,11 @@
import java.text.DateFormat;
import java.text.DecimalFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import java.text.ParseException;
/**
* A utility class to allow creation of RFC822 date strings from Dates
1.2 +3 -1 jakarta-james/src/java/org/apache/james/util/SchedulerNotifyInputStream.java
Index: SchedulerNotifyInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/SchedulerNotifyInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchedulerNotifyInputStream.java 26 Nov 2001 03:26:46 -0000 1.1
+++ SchedulerNotifyInputStream.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -8,8 +8,10 @@
package org.apache.james.util;
-import java.io.*;
import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
+
+import java.io.IOException;
+import java.io.InputStream;
/**
* This will reset the scheduler each time a certain amount of data has
1.3 +3 -1 jakarta-james/src/java/org/apache/james/util/SchedulerNotifyOutputStream.java
Index: SchedulerNotifyOutputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/SchedulerNotifyOutputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SchedulerNotifyOutputStream.java 29 Nov 2001 19:54:19 -0000 1.2
+++ SchedulerNotifyOutputStream.java 18 Jan 2002 02:48:39 -0000 1.3
@@ -8,8 +8,10 @@
package org.apache.james.util;
-import java.io.*;
import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
+
+import java.io.IOException;
+import java.io.OutputStream;
/**
* This will reset the scheduler each time a certain amount of data has
1.2 +9 -21 jakarta-james/src/java/org/apache/james/util/SqlResources.java
Index: SqlResources.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/SqlResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SqlResources.java 11 Sep 2001 04:35:11 -0000 1.1
+++ SqlResources.java 18 Jan 2002 02:48:39 -0000 1.2
@@ -7,30 +7,18 @@
*/
package org.apache.james.util;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-/** Jdbc and utilities */
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.*;
-import java.io.*;
-
-/** W3C DOM classes **/
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Attr;
+import org.apache.oro.text.perl.MalformedPerl5PatternException;
+import org.apache.oro.text.perl.Perl5Util;
+import org.w3c.dom.*;
-/** Parser classes **/
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/** ORO regex classes */
-import org.apache.oro.text.perl.Perl5Util;
-import org.apache.oro.text.perl.MalformedPerl5PatternException;
+import java.io.File;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
1.4 +7 -8 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JdbcDataSource.java 17 Jan 2002 06:09:02 -0000 1.3
+++ JdbcDataSource.java 18 Jan 2002 02:48:40 -0000 1.4
@@ -7,19 +7,18 @@
*/
package org.apache.james.util.mordred;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Vector;
+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;
-//Notice how cornerstone is dependent on Excalibur
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Vector;
/**
* <p>This is a <b>reliable</b> DataSource implementation, based on the pooling
@@ -42,7 +41,7 @@
* </pre>
*
* @author <a href="mailto:serge@apache.org">Serge Knystautas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/01/17 06:09:02 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/01/18 02:48:40 $
* @since 4.0
*/
public class JdbcDataSource
1.2 +3 -2 jakarta-james/src/java/org/apache/james/util/mordred/PoolConnEntry.java
Index: PoolConnEntry.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/mordred/PoolConnEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PoolConnEntry.java 5 Dec 2001 22:10:14 -0000 1.1
+++ PoolConnEntry.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,9 +7,10 @@
*/
package org.apache.james.util.mordred;
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.sql.*;
-import java.util.*;
+import java.util.Map;
/**
* Insert the type's description here.
1.2 +2 -2 jakarta-james/src/java/org/apache/mailet/GenericMailet.java
Index: GenericMailet.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/GenericMailet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericMailet.java 11 May 2001 08:50:26 -0000 1.1
+++ GenericMailet.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.mailet;
-import java.util.*;
-import javax.mail.*;
+import javax.mail.MessagingException;
+import java.util.Iterator;
/**
* GenericMailet makes writing mailets easier. It provides simple
1.2 +2 -2 jakarta-james/src/java/org/apache/mailet/GenericMatcher.java
Index: GenericMatcher.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/GenericMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericMatcher.java 11 May 2001 08:50:26 -0000 1.1
+++ GenericMatcher.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.mailet;
-import java.util.*;
-import javax.mail.*;
+import javax.mail.MessagingException;
+import java.util.Collection;
/**
* GenericMatcher implements the Matcher and MatcherConfig interfaces.
1.2 +4 -2 jakarta-james/src/java/org/apache/mailet/GenericRecipientMatcher.java
Index: GenericRecipientMatcher.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/GenericRecipientMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericRecipientMatcher.java 11 May 2001 08:50:26 -0000 1.1
+++ GenericRecipientMatcher.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,8 +7,10 @@
*/
package org.apache.mailet;
-import java.util.*;
-import javax.mail.*;
+import javax.mail.MessagingException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
/**
* GenericMatcher makes writing recipient based matchers easier. It provides
1.3 +4 -5 jakarta-james/src/java/org/apache/mailet/Mail.java
Index: Mail.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/Mail.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mail.java 6 Aug 2001 03:37:21 -0000 1.2
+++ Mail.java 18 Jan 2002 02:48:40 -0000 1.3
@@ -7,11 +7,10 @@
*/
package org.apache.mailet;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.io.Serializable;
+import java.util.Collection;
/**
* Wrap a MimeMessage with routing information (from SMTP) such
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/MailetConfig.java
Index: MailetConfig.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/MailetConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailetConfig.java 11 May 2001 08:50:26 -0000 1.1
+++ MailetConfig.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.mailet;
-import java.util.*;
+import java.util.Iterator;
/**
* A mailet configuration object used by a mailet container used to pass information
1.3 +4 -3 jakarta-james/src/java/org/apache/mailet/MailetContext.java
Index: MailetContext.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/MailetContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailetContext.java 31 Oct 2001 14:30:41 -0000 1.2
+++ MailetContext.java 18 Jan 2002 02:48:40 -0000 1.3
@@ -7,9 +7,10 @@
*/
package org.apache.mailet;
-import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.Iterator;
/**
* Defines a set of methods that a mailet or matcher uses to communicate
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/MailetException.java
Index: MailetException.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/MailetException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailetException.java 11 May 2001 08:50:26 -0000 1.1
+++ MailetException.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.mailet;
-import javax.mail.*;
+import javax.mail.MessagingException;
/**
* Defines a general exception a mailet can throw when it encounters difficulty.
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/Matcher.java
Index: Matcher.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/Matcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Matcher.java 11 May 2001 08:50:26 -0000 1.1
+++ Matcher.java 18 Jan 2002 02:48:40 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.mailet;
-import java.util.*;
+import java.util.Collection;
/**
* This interface define the behaviour of the message "routing" inside
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>