james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-james/src/java/org/apache/james/transport JamesSpoolManager.java
Date Mon, 03 Jun 2002 16:07:07 GMT
hammant     2002/06/03 09:07:07

  Modified:    lib      cornerstone.jar
               phoenix-bin/bin phoenix-engine.jar phoenix-loader.jar
               phoenix-bin/conf kernel.xml
               phoenix-bin/lib phoenix-client.jar
               src/java/org/apache/james James.java
               src/java/org/apache/james/core AvalonMailStore.java
                        AvalonUsersStore.java
               src/java/org/apache/james/dnsserver DNSServer.java
               src/java/org/apache/james/nntpserver AuthService.java
                        AuthServiceImpl.java NNTPServer.java
               src/java/org/apache/james/nntpserver/repository
                        NNTPArticleImpl.java NNTPLineReaderImpl.java
                        NNTPRepositoryImpl.java
               src/java/org/apache/james/pop3server POP3Server.java
               src/java/org/apache/james/remotemanager RemoteManager.java
               src/java/org/apache/james/smtpserver SMTPServer.java
               src/java/org/apache/james/transport JamesSpoolManager.java
  Added:       phoenix-bin/lib avalon-framework-20021805.jar
                        logkit-1.1a.jar
  Removed:     phoenix-bin/lib avalon-framework-20022103.jar
  Log:
  Phoenix plus cornerstone upgrade.  Drop of Block.
  
  Revision  Changes    Path
  1.2       +351 -368  jakarta-james/lib/cornerstone.jar
  
  	<<Binary file>>
  
  
  1.2       +364 -368  jakarta-james/phoenix-bin/bin/phoenix-engine.jar
  
  	<<Binary file>>
  
  
  1.2       +29 -32    jakarta-james/phoenix-bin/bin/phoenix-loader.jar
  
  	<<Binary file>>
  
  
  1.2       +1 -1      jakarta-james/phoenix-bin/conf/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-james/phoenix-bin/conf/kernel.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- kernel.xml	16 May 2002 23:47:20 -0000	1.1
  +++ kernel.xml	3 Jun 2002 16:07:05 -0000	1.2
  @@ -42,4 +42,4 @@
               logger="packages"/>
   -->
       </embeddor>
  -</phoenix>
  \ No newline at end of file
  +</phoenix>
  
  
  
  1.2       +125 -125  jakarta-james/phoenix-bin/lib/phoenix-client.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-james/phoenix-bin/lib/avalon-framework-20021805.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-james/phoenix-bin/lib/logkit-1.1a.jar
  
  	<<Binary file>>
  
  
  1.23      +5 -6      jakarta-james/src/java/org/apache/james/James.java
  
  Index: James.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- James.java	18 Apr 2002 13:39:34 -0000	1.22
  +++ James.java	3 Jun 2002 16:07:05 -0000	1.23
  @@ -18,7 +18,6 @@
   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.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.james.core.MailHeaders;
   import org.apache.james.core.MailImpl;
  @@ -55,14 +54,14 @@
    * @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
    *
   
  - * This is $Revision: 1.22 $
  - * Committed on $Date: 2002/04/18 13:39:34 $ by: $Author: serge $
  + * This is $Revision: 1.23 $
  + * Committed on $Date: 2002/06/03 16:07:05 $ by: $Author: hammant $
   
    */
   public class James
       extends AbstractLogEnabled
  -    implements Block, Contextualizable, Composable, Configurable,
  -               Initializable, MailServer, MailetContext {
  +    implements Contextualizable, Composable, Configurable,
  +               Initializable, MailServer, MailetContext, Component {
   
       private final static String VERSION = Constants.SOFTWARE_NAME + " " + Constants.SOFTWARE_VERSION;
       private final static boolean DEEP_DEBUG = true;
  @@ -492,7 +491,7 @@
        * @param userName String representing user name, that is the portion of
        * an email address before the '@<domain>'.
        * @param password String plaintext password
  -     * @returns boolean true if user added succesfully, else false.
  +     * @return boolean true if user added succesfully, else false.
        */
       public boolean addUser(String userName, String password) {
           boolean success;
  
  
  
  1.11      +1 -2      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AvalonMailStore.java	18 Jan 2002 02:48:35 -0000	1.10
  +++ AvalonMailStore.java	3 Jun 2002 16:07:05 -0000	1.11
  @@ -21,7 +21,6 @@
   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.phoenix.Block;
   import org.apache.james.services.MailRepository;
   import org.apache.james.services.MailStore;
   import org.apache.james.services.SpoolRepository;
  @@ -38,7 +37,7 @@
    */
   public class AvalonMailStore
       extends AbstractLogEnabled
  -    implements Block, Contextualizable, Composable, Configurable, Initializable, MailStore
{
  +    implements Contextualizable, Composable, Configurable, Initializable, MailStore {
   
       private static final String REPOSITORY_NAME = "Repository";
       private static long id;
  
  
  
  1.7       +1 -2      jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java
  
  Index: AvalonUsersStore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AvalonUsersStore.java	18 Jan 2002 02:48:35 -0000	1.6
  +++ AvalonUsersStore.java	3 Jun 2002 16:07:06 -0000	1.7
  @@ -19,7 +19,6 @@
   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;
   
  @@ -32,7 +31,7 @@
    */
   public class AvalonUsersStore
       extends AbstractLogEnabled
  -    implements Block, Contextualizable, Composable, Configurable, Initializable, UsersStore
{
  +    implements Contextualizable, Composable, Configurable, Initializable, UsersStore {
   
       private HashMap repositories;
       protected Context                context;
  
  
  
  1.6       +1 -2      jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java
  
  Index: DNSServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DNSServer.java	18 Jan 2002 02:48:36 -0000	1.5
  +++ DNSServer.java	3 Jun 2002 16:07:06 -0000	1.6
  @@ -12,7 +12,6 @@
   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.xbill.DNS.*;
   
   import java.net.InetAddress;
  @@ -25,7 +24,7 @@
    */
   public class DNSServer
       extends AbstractLogEnabled
  -    implements Block, Configurable, Initializable, 
  +    implements Configurable, Initializable,
       org.apache.james.services.DNSServer {
   
       private Resolver resolver;
  
  
  
  1.2       +1 -1      jakarta-james/src/java/org/apache/james/nntpserver/AuthService.java
  
  Index: AuthService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/AuthService.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AuthService.java	18 Nov 2001 01:29:23 -0000	1.1
  +++ AuthService.java	3 Jun 2002 16:07:06 -0000	1.2
  @@ -20,4 +20,4 @@
       void setUser(String userid);
       void setPassword(String password);
       boolean isAuthorized(String command);
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +1 -2      jakarta-james/src/java/org/apache/james/nntpserver/AuthServiceImpl.java
  
  Index: AuthServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/AuthServiceImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AuthServiceImpl.java	17 Jan 2002 06:09:01 -0000	1.2
  +++ AuthServiceImpl.java	3 Jun 2002 16:07:06 -0000	1.3
  @@ -14,7 +14,6 @@
   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.services.UsersRepository;
   import org.apache.james.services.UsersStore;
   
  @@ -31,7 +30,7 @@
    * @author  Harmeet <harmeet@kodemuse.com> 
    */
   public class AuthServiceImpl extends AbstractLogEnabled
  -    implements AuthService, Composable, Configurable, Block 
  +    implements AuthService, Composable, Configurable
   {
       protected boolean authRequired;
       protected UsersRepository repo;
  
  
  
  1.6       +2 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NNTPServer.java	27 Feb 2002 05:06:05 -0000	1.5
  +++ NNTPServer.java	3 Jun 2002 16:07:06 -0000	1.6
  @@ -12,6 +12,7 @@
   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.component.Component;
   
   import java.net.InetAddress;
   import java.net.UnknownHostException;
  @@ -21,7 +22,7 @@
    *
    * @author Harmeet Bedi <harmeet@kodemuse.com>
    */
  -public class NNTPServer extends AbstractService {
  +public class NNTPServer extends AbstractService implements Component {
   
       protected ConnectionHandlerFactory createFactory() {
           return new DefaultHandlerFactory( NNTPHandler.class );
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NNTPArticleImpl.java	18 Jan 2002 02:48:36 -0000	1.3
  +++ NNTPArticleImpl.java	3 Jun 2002 16:07:06 -0000	1.4
  @@ -104,4 +104,4 @@
               return hdr.getHeader(header,null);
           } catch(Exception ex) { throw new NNTPException(ex); }
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.4       +1 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NNTPLineReaderImpl.java	18 Jan 2002 02:48:36 -0000	1.3
  +++ NNTPLineReaderImpl.java	3 Jun 2002 16:07:06 -0000	1.4
  @@ -37,4 +37,4 @@
               throw new NNTPException("could not create article",ioe);
           }
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.6       +1 -2      jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
  
  Index: NNTPRepositoryImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NNTPRepositoryImpl.java	18 Jan 2002 02:48:36 -0000	1.5
  +++ NNTPRepositoryImpl.java	3 Jun 2002 16:07:06 -0000	1.6
  @@ -17,7 +17,6 @@
   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.nntpserver.DateSinceFileFilter;
   import org.apache.james.nntpserver.NNTPException;
   import org.apache.oro.io.GlobFilenameFilter;
  @@ -37,7 +36,7 @@
    * @author Harmeet Bedi <harmeet@kodemuse.com>
    */
   public class NNTPRepositoryImpl extends AbstractLogEnabled 
  -    implements NNTPRepository, Contextualizable, Configurable, Initializable, Block
  +    implements NNTPRepository, Contextualizable, Configurable, Initializable
   {
       private Context context;
       private boolean readOnly;
  
  
  
  1.4       +2 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- POP3Server.java	27 Feb 2002 05:06:22 -0000	1.3
  +++ POP3Server.java	3 Jun 2002 16:07:06 -0000	1.4
  @@ -12,6 +12,7 @@
   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.component.Component;
   
   import java.net.InetAddress;
   import java.net.UnknownHostException;
  @@ -21,7 +22,7 @@
    * @author  Federico Barbieri <scoobie@pop.systemy.it>
    */
   public class POP3Server
  -    extends AbstractService {
  +    extends AbstractService implements Component {
   
       protected ConnectionHandlerFactory createFactory()
       {
  
  
  
  1.5       +2 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RemoteManager.java	1 Mar 2002 15:58:39 -0000	1.4
  +++ RemoteManager.java	3 Jun 2002 16:07:06 -0000	1.5
  @@ -12,6 +12,7 @@
   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.component.Component;
   
   import java.net.InetAddress;
   import java.net.UnknownHostException;
  @@ -27,7 +28,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class RemoteManager
  -    extends AbstractService {
  +    extends AbstractService implements Component {
   
       protected ConnectionHandlerFactory createFactory()
       {
  
  
  
  1.5       +2 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SMTPServer.java	1 Mar 2002 15:58:40 -0000	1.4
  +++ SMTPServer.java	3 Jun 2002 16:07:07 -0000	1.5
  @@ -12,6 +12,7 @@
   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.component.Component;
   
   import java.net.InetAddress;
   import java.net.UnknownHostException;
  @@ -24,7 +25,7 @@
    * @author  <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class SMTPServer
  -    extends AbstractService {
  +    extends AbstractService implements Component {
   
       protected ConnectionHandlerFactory createFactory()
       {
  
  
  
  1.10      +4 -4      jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java
  
  Index: JamesSpoolManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JamesSpoolManager.java	1 Mar 2002 15:58:40 -0000	1.9
  +++ JamesSpoolManager.java	3 Jun 2002 16:07:07 -0000	1.10
  @@ -15,6 +15,7 @@
   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.Component;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -22,7 +23,6 @@
   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.phoenix.Block;
   import org.apache.james.core.MailImpl;
   import org.apache.james.services.MailStore;
   import org.apache.james.services.SpoolRepository;
  @@ -36,13 +36,13 @@
    * @author Serge Knystautas <sergek@lokitech.com>
    * @author Federico Barbieri <scoobie@systemy.it>
    *
  - * This is $Revision: 1.9 $
  - * Committed on $Date: 2002/03/01 15:58:40 $ by: $Author: danny $
  + * This is $Revision: 1.10 $
  + * Committed on $Date: 2002/06/03 16:07:07 $ by: $Author: hammant $
    */
   public class JamesSpoolManager
       extends AbstractLogEnabled
       implements Contextualizable, Composable, Configurable, Initializable,
  -               Runnable, Disposable,  Block {
  +               Runnable, Disposable, Component {
   
       private final static boolean DEEP_DEBUG = true;
       private DefaultComponentManager compMgr;
  
  
  

--
To unsubscribe, e-mail:   <mailto:james-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:james-dev-help@jakarta.apache.org>


Mime
View raw message