james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject cvs commit: james-server/src/java/org/apache/james/util/dbcp JdbcDataSource.java
Date Thu, 23 Oct 2003 01:53:21 GMT
noel        2003/10/22 18:53:21

  Modified:    src/java/org/apache/james James.java
               src/java/org/apache/james/core AvalonUsersStore.java
               src/java/org/apache/james/pop3server POP3Handler.java
               src/java/org/apache/james/transport/mailets
                        AbstractNotify.java AbstractRedirect.java
                        Bounce.java Forward.java GenericListserv.java
                        NotifyPostmaster.java NotifySender.java
                        Redirect.java RemoveAllMailAttributes.java
                        Resend.java
               src/java/org/apache/james/transport/matchers
                        AttachmentFileNameIs.java
                        CompareNumericHeaderValue.java
                        RemoteAddrInNetwork.java
                        RemoteAddrNotInNetwork.java SMTPAuthSuccessful.java
                        SMTPAuthUserIs.java SenderIsNull.java
               src/java/org/apache/james/util/dbcp JdbcDataSource.java
  Log:
  import cleanup, courtesy of Stefano Mazzocchi.
  
  Revision  Changes    Path
  1.62      +3 -1      james-server/src/java/org/apache/james/James.java
  
  Index: James.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/James.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- James.java	2 Jul 2003 11:15:50 -0000	1.61
  +++ James.java	23 Oct 2003 01:53:20 -0000	1.62
  @@ -72,12 +72,14 @@
   import java.util.Locale;
   import java.util.Map;
   import java.util.Vector;
  +
   import javax.mail.Address;
   import javax.mail.MessagingException;
   import javax.mail.internet.InternetAddress;
   import javax.mail.internet.MimeBodyPart;
   import javax.mail.internet.MimeMessage;
   import javax.mail.internet.MimeMultipart;
  +
   import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
  
  
  
  1.20      +6 -6      james-server/src/java/org/apache/james/core/AvalonUsersStore.java
  
  Index: AvalonUsersStore.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/core/AvalonUsersStore.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- AvalonUsersStore.java	8 Mar 2003 21:14:01 -0000	1.19
  +++ AvalonUsersStore.java	23 Oct 2003 01:53:20 -0000	1.20
  @@ -65,11 +65,11 @@
    */
   package org.apache.james.core;
   
  +import java.util.HashMap;
  +import java.util.Iterator;
  +
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.avalon.framework.service.ServiceManager;
  -import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -77,11 +77,11 @@
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.james.services.UsersStore;
   import org.apache.mailet.UsersRepository;
  -
  -import java.util.HashMap;
  -import java.util.Iterator;
   
   /**
    * Provides a registry of user repositories.
  
  
  
  1.32      +1 -2      james-server/src/java/org/apache/james/pop3server/POP3Handler.java
  
  Index: POP3Handler.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/pop3server/POP3Handler.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- POP3Handler.java	16 Jul 2003 04:03:22 -0000	1.31
  +++ POP3Handler.java	23 Oct 2003 01:53:20 -0000	1.32
  @@ -62,16 +62,15 @@
   import java.io.BufferedOutputStream;
   import java.io.BufferedReader;
   import java.io.IOException;
  -import java.io.InputStreamReader;
   import java.io.OutputStream;
   import java.io.PrintWriter;
   import java.net.Socket;
  +import java.util.ArrayList;
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.List;
   import java.util.Locale;
   import java.util.StringTokenizer;
  -import java.util.ArrayList;
   
   import javax.mail.MessagingException;
   
  
  
  
  1.11      +9 -19     james-server/src/java/org/apache/james/transport/mailets/AbstractNotify.java
  
  Index: AbstractNotify.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/AbstractNotify.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AbstractNotify.java	14 Oct 2003 16:49:17 -0000	1.10
  +++ AbstractNotify.java	23 Oct 2003 01:53:20 -0000	1.11
  @@ -58,28 +58,18 @@
   
   package org.apache.james.transport.mailets;
   
  -import org.apache.mailet.RFC2822Headers;
  -import org.apache.mailet.GenericMailet;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -import org.apache.mailet.MailetException;
  -
  -import javax.mail.Address;
  -import javax.mail.Message;
  -import javax.mail.MessagingException;
  -import javax.mail.Session;
  -import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeBodyPart;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.MimeMultipart;
  -import java.io.IOException;
   import java.io.PrintWriter;
   import java.io.StringWriter;
  -import java.util.Date;
  -import java.util.HashSet;
  -import java.util.Set;
   import java.util.Collection;
   import java.util.Iterator;
  +
  +import javax.mail.MessagingException;
  +import javax.mail.internet.InternetAddress;
  +import javax.mail.internet.MimeMessage;
  +
  +import org.apache.mailet.Mail;
  +import org.apache.mailet.MailAddress;
  +import org.apache.mailet.RFC2822Headers;
   
   /**
    * <P>Abstract mailet providing configurable notification services.<BR>
  
  
  
  1.21      +5 -9      james-server/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
  
  Index: AbstractRedirect.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/AbstractRedirect.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- AbstractRedirect.java	3 Sep 2003 11:10:10 -0000	1.20
  +++ AbstractRedirect.java	23 Oct 2003 01:53:20 -0000	1.21
  @@ -60,33 +60,29 @@
   
   import java.io.PrintWriter;
   import java.io.StringWriter;
  -
  +import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Date;
   import java.util.Enumeration;
   import java.util.HashSet;
   import java.util.Iterator;
   import java.util.Locale;
  -import java.util.ArrayList;
  -
   
   import javax.mail.Message;
   import javax.mail.MessagingException;
  -import javax.mail.internet.ParseException;
   import javax.mail.Session;
   import javax.mail.internet.InternetAddress;
   import javax.mail.internet.MimeBodyPart;
   import javax.mail.internet.MimeMessage;
   import javax.mail.internet.MimeMultipart;
  -import javax.mail.internet.AddressException;
  +import javax.mail.internet.ParseException;
   
  -import org.apache.mailet.RFC2822Headers;
  -import org.apache.mailet.dates.RFC822DateFormat;
   import org.apache.james.core.MailImpl;
  -
   import org.apache.mailet.GenericMailet;
   import org.apache.mailet.Mail;
   import org.apache.mailet.MailAddress;
  +import org.apache.mailet.RFC2822Headers;
  +import org.apache.mailet.dates.RFC822DateFormat;
   
   
   /**
  
  
  
  1.10      +6 -21     james-server/src/java/org/apache/james/transport/mailets/Bounce.java
  
  Index: Bounce.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/Bounce.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Bounce.java	4 Jul 2003 16:46:12 -0000	1.9
  +++ Bounce.java	23 Oct 2003 01:53:20 -0000	1.10
  @@ -58,29 +58,14 @@
   
   package org.apache.james.transport.mailets;
   
  -import org.apache.mailet.RFC2822Headers;
  -import org.apache.mailet.GenericMailet;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -import org.apache.mailet.MailetException;
  +import java.util.Collection;
  +import java.util.HashSet;
   
  -import javax.mail.Address;
  -import javax.mail.Message;
   import javax.mail.MessagingException;
  -import javax.mail.Session;
   import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeBodyPart;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.MimeMultipart;
  -import java.io.IOException;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -import java.util.Date;
  -import java.util.HashSet;
  -import java.util.Set;
  -import java.util.Collection;
  -import java.util.Iterator;
  -import java.util.ArrayList;
  +
  +import org.apache.mailet.Mail;
  +import org.apache.mailet.MailAddress;
   
   /**
    * <P>Generates a response to the reverse-path address.
  
  
  
  1.21      +5 -6      james-server/src/java/org/apache/james/transport/mailets/Forward.java
  
  Index: Forward.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/Forward.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Forward.java	3 Sep 2003 15:44:43 -0000	1.20
  +++ Forward.java	23 Oct 2003 01:53:20 -0000	1.21
  @@ -58,14 +58,13 @@
   
   package org.apache.james.transport.mailets;
   
  -import org.apache.mailet.GenericMailet;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  +import java.util.Collection;
  +import java.util.HashSet;
   
   import javax.mail.MessagingException;
   import javax.mail.internet.InternetAddress;
  -import java.util.Collection;
  -import java.util.HashSet;
  +
  +import org.apache.mailet.MailAddress;
   
   /**
    * <P>Replaces incoming recipients with those specified, and resends the message
unaltered.</P>
  
  
  
  1.21      +0 -1      james-server/src/java/org/apache/james/transport/mailets/GenericListserv.java
  
  Index: GenericListserv.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/GenericListserv.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- GenericListserv.java	30 Jun 2003 09:41:03 -0000	1.20
  +++ GenericListserv.java	23 Oct 2003 01:53:20 -0000	1.21
  @@ -60,7 +60,6 @@
   
   import java.io.IOException;
   import java.util.Collection;
  -import java.util.Vector;
   
   import javax.mail.MessagingException;
   import javax.mail.internet.MimeMessage;
  
  
  
  1.22      +5 -19     james-server/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java
  
  Index: NotifyPostmaster.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- NotifyPostmaster.java	4 Jul 2003 16:46:12 -0000	1.21
  +++ NotifyPostmaster.java	23 Oct 2003 01:53:20 -0000	1.22
  @@ -58,27 +58,13 @@
   
   package org.apache.james.transport.mailets;
   
  -import org.apache.mailet.GenericMailet;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -import org.apache.mailet.MailetException;
  +import java.util.Collection;
  +import java.util.HashSet;
   
  -import javax.mail.Address;
  -import javax.mail.Message;
   import javax.mail.MessagingException;
  -import javax.mail.Session;
   import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeBodyPart;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.MimeMultipart;
  -import java.io.IOException;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -import java.util.Date;
  -import java.util.HashSet;
  -import java.util.Set;
  -import java.util.Collection;
  -import java.util.Iterator;
  +
  +import org.apache.mailet.MailAddress;
   
   /**
    * <P>Sends a notification message to the Postmaster.</P>
  
  
  
  1.26      +5 -19     james-server/src/java/org/apache/james/transport/mailets/NotifySender.java
  
  Index: NotifySender.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/NotifySender.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- NotifySender.java	7 Jul 2003 06:16:21 -0000	1.25
  +++ NotifySender.java	23 Oct 2003 01:53:20 -0000	1.26
  @@ -58,27 +58,13 @@
   
   package org.apache.james.transport.mailets;
   
  -import org.apache.mailet.GenericMailet;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -import org.apache.mailet.MailetException;
  +import java.util.Collection;
  +import java.util.HashSet;
   
  -import javax.mail.Address;
  -import javax.mail.Message;
   import javax.mail.MessagingException;
  -import javax.mail.Session;
   import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeBodyPart;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.MimeMultipart;
  -import java.io.IOException;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -import java.util.Date;
  -import java.util.HashSet;
  -import java.util.Set;
  -import java.util.Collection;
  -import java.util.Iterator;
  +
  +import org.apache.mailet.MailAddress;
   
   /**
    * <P>Sends a notification message to the sender of a message.</P>
  
  
  
  1.37      +1 -18     james-server/src/java/org/apache/james/transport/mailets/Redirect.java
  
  Index: Redirect.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/Redirect.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Redirect.java	3 Sep 2003 11:10:10 -0000	1.36
  +++ Redirect.java	23 Oct 2003 01:53:20 -0000	1.37
  @@ -58,29 +58,12 @@
   
   package org.apache.james.transport.mailets;
   
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -
   import java.util.Collection;
  -import java.util.Date;
  -import java.util.Enumeration;
   import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.Locale;
  -import java.util.ArrayList;
  -
   
  -import javax.mail.Message;
   import javax.mail.MessagingException;
  -import javax.mail.Session;
   import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeBodyPart;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.MimeMultipart;
  -
  -import org.apache.james.core.MailImpl;
   
  -import org.apache.mailet.GenericMailet;
   import org.apache.mailet.Mail;
   import org.apache.mailet.MailAddress;
   
  
  
  
  1.2       +3 -3      james-server/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
  
  Index: RemoveAllMailAttributes.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RemoveAllMailAttributes.java	15 Jul 2003 10:44:48 -0000	1.1
  +++ RemoveAllMailAttributes.java	23 Oct 2003 01:53:21 -0000	1.2
  @@ -58,10 +58,10 @@
   
   package org.apache.james.transport.mailets;
   
  +import javax.mail.MessagingException;
  +
   import org.apache.mailet.GenericMailet;
   import org.apache.mailet.Mail;
  -import org.apache.mailet.MailetException;
  -import javax.mail.MessagingException;
   
   /**
    * This mailet sets removes all attributes set on the Mail instance
  
  
  
  1.7       +1 -29     james-server/src/java/org/apache/james/transport/mailets/Resend.java
  
  Index: Resend.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/Resend.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Resend.java	3 Sep 2003 11:10:10 -0000	1.6
  +++ Resend.java	23 Oct 2003 01:53:21 -0000	1.7
  @@ -58,34 +58,6 @@
   
   package org.apache.james.transport.mailets;
   
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
  -
  -import java.util.Collection;
  -import java.util.Date;
  -import java.util.Enumeration;
  -import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.Locale;
  -import java.util.StringTokenizer;
  -import java.util.ArrayList;
  -
  -
  -import javax.mail.Message;
  -import javax.mail.MessagingException;
  -import javax.mail.Session;
  -import javax.mail.internet.InternetAddress;
  -import javax.mail.internet.MimeBodyPart;
  -import javax.mail.internet.MimeMessage;
  -import javax.mail.internet.MimeMultipart;
  -
  -import org.apache.james.core.MailImpl;
  -
  -import org.apache.mailet.GenericMailet;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -
  -
   /**
    * <P>A mailet providing configurable redirection services.</P>
    * <P>Can produce listserver, forward and notify behaviour, with the original
  
  
  
  1.5       +8 -8      james-server/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
  
  Index: AttachmentFileNameIs.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AttachmentFileNameIs.java	20 Jun 2003 11:55:47 -0000	1.4
  +++ AttachmentFileNameIs.java	23 Oct 2003 01:53:21 -0000	1.5
  @@ -58,18 +58,18 @@
    
   package org.apache.james.transport.matchers;
   
  -import org.apache.mailet.GenericMatcher;
  -import org.apache.mailet.Mail;
  +import java.util.ArrayList;
  +import java.util.Collection;
  +import java.util.Locale;
  +import java.util.StringTokenizer;
   
   import javax.mail.MessagingException;
   import javax.mail.Multipart;
   import javax.mail.Part;
   import javax.mail.internet.MimeMessage;
  -import java.util.ArrayList;
  -import java.util.Collection;
  -import java.util.Iterator;
  -import java.util.StringTokenizer;
  -import java.util.Locale;
  +
  +import org.apache.mailet.GenericMatcher;
  +import org.apache.mailet.Mail;
   
   
   /**
  
  
  
  1.4       +6 -9      james-server/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
  
  Index: CompareNumericHeaderValue.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompareNumericHeaderValue.java	12 Jul 2003 06:45:18 -0000	1.3
  +++ CompareNumericHeaderValue.java	23 Oct 2003 01:53:21 -0000	1.4
  @@ -58,17 +58,14 @@
   
   package org.apache.james.transport.matchers;
   
  -import org.apache.mailet.GenericMatcher;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -
  -import java.lang.NumberFormatException;
  -
   import java.util.Collection;
   import java.util.StringTokenizer;
   
  -import javax.mail.*;
  -import javax.mail.internet.*;
  +import javax.mail.MessagingException;
  +import javax.mail.internet.MimeMessage;
  +
  +import org.apache.mailet.GenericMatcher;
  +import org.apache.mailet.Mail;
   
   /**
    * <P>Matches mails containing a header with a numeric value whose comparison with
the specified value is true.
  
  
  
  1.10      +2 -3      james-server/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java
  
  Index: RemoteAddrInNetwork.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RemoteAddrInNetwork.java	6 Jun 2003 23:51:38 -0000	1.9
  +++ RemoteAddrInNetwork.java	23 Oct 2003 01:53:21 -0000	1.10
  @@ -58,10 +58,9 @@
   
   package org.apache.james.transport.matchers;
   
  -import org.apache.mailet.Mail;
  -
  -import javax.mail.MessagingException;
   import java.util.Collection;
  +
  +import org.apache.mailet.Mail;
   
   /**
    * Checks the IP address of the sending server against a comma-
  
  
  
  1.10      +2 -3      james-server/src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java
  
  Index: RemoteAddrNotInNetwork.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RemoteAddrNotInNetwork.java	6 Jun 2003 23:51:38 -0000	1.9
  +++ RemoteAddrNotInNetwork.java	23 Oct 2003 01:53:21 -0000	1.10
  @@ -58,10 +58,9 @@
   
   package org.apache.james.transport.matchers;
   
  -import org.apache.mailet.Mail;
  -
  -import javax.mail.MessagingException;
   import java.util.Collection;
  +
  +import org.apache.mailet.Mail;
   
   /**
    * Checks the IP address of the sending server against a comma-
  
  
  
  1.3       +3 -5      james-server/src/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
  
  Index: SMTPAuthSuccessful.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SMTPAuthSuccessful.java	1 Sep 2003 09:54:50 -0000	1.2
  +++ SMTPAuthSuccessful.java	23 Oct 2003 01:53:21 -0000	1.3
  @@ -58,12 +58,10 @@
   
   package org.apache.james.transport.matchers;
   
  +import java.util.Collection;
  +
   import org.apache.mailet.GenericMatcher;
   import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -
  -import java.util.Collection;
  -import java.util.StringTokenizer;
   
   /**
    * <P>Matches mails that are sent by an SMTP authenticated user.</P>
  
  
  
  1.3       +4 -5      james-server/src/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
  
  Index: SMTPAuthUserIs.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SMTPAuthUserIs.java	22 Jul 2003 22:21:22 -0000	1.2
  +++ SMTPAuthUserIs.java	23 Oct 2003 01:53:21 -0000	1.3
  @@ -58,12 +58,11 @@
   
   package org.apache.james.transport.matchers;
   
  -import org.apache.mailet.GenericMatcher;
  -import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -
   import java.util.Collection;
   import java.util.StringTokenizer;
  +
  +import org.apache.mailet.GenericMatcher;
  +import org.apache.mailet.Mail;
   
   /**
    * <P>Matches mails that are sent by an SMTP authenticated user present in a supplied
list.</P>
  
  
  
  1.2       +3 -4      james-server/src/java/org/apache/james/transport/matchers/SenderIsNull.java
  
  Index: SenderIsNull.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/matchers/SenderIsNull.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SenderIsNull.java	24 Jun 2003 08:25:55 -0000	1.1
  +++ SenderIsNull.java	23 Oct 2003 01:53:21 -0000	1.2
  @@ -58,11 +58,10 @@
   
   package org.apache.james.transport.matchers;
   
  +import java.util.Collection;
  +
   import org.apache.mailet.GenericMatcher;
   import org.apache.mailet.Mail;
  -import org.apache.mailet.MailAddress;
  -
  -import java.util.Collection;
   
   /**
    * <P>Matches mails that are sent by a null sender.</P>
  
  
  
  1.3       +2 -20     james-server/src/java/org/apache/james/util/dbcp/JdbcDataSource.java
  
  Index: JdbcDataSource.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/util/dbcp/JdbcDataSource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JdbcDataSource.java	19 Aug 2003 15:22:25 -0000	1.2
  +++ JdbcDataSource.java	23 Oct 2003 01:53:21 -0000	1.3
  @@ -8,34 +8,16 @@
   package org.apache.james.util.dbcp;
   
   import java.io.PrintWriter;
  -import java.io.StringWriter;
  -
   import java.sql.Connection;
   import java.sql.SQLException;
   
  -import java.util.Vector;
  -
  -import javax.naming.Context;
  -import javax.naming.NamingException;
  -import javax.naming.InitialContext;
  -
  -//import javax.sql.DataSource;
  -
  -import org.apache.commons.dbcp.BasicDataSource;
  -//import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
  -//import org.apache.commons.pool.impl.GenericObjectPool;
  -//import org.apache.commons.dbcp.ConnectionFactory;
  -//import org.apache.commons.dbcp.DriverManagerConnectionFactory;
  -//import org.apache.commons.dbcp.PoolingDataSource;
  -//import org.apache.commons.dbcp.PoolableConnectionFactory;
  -
  -
   import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.commons.dbcp.BasicDataSource;
   
   /**
    * <p>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message