james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-james/src/org/apache/james/userrepository UsersLDAPRepository.java
Date Wed, 25 Apr 2001 14:46:18 GMT
donaldp     01/04/25 07:46:18

  Modified:    lib      avalonapi.jar cornerstone.bar phoenix-client.jar
                        phoenix-engine.jar phoenix-loader.jar
               src/org/apache/james James.java
               src/org/apache/james/core AvalonMailStore.java
                        AvalonUsersStore.java
               src/org/apache/james/dnsserver DNSServer.java
               src/org/apache/james/imapserver ACLMailbox.java Flags.java
                        IMAPServer.java JamesHost.java
                        SimpleFolderRecord.java SimpleSystem.java
                        SingleThreadedConnectionHandler.java
               src/org/apache/james/nntpserver NNTPHandler.java
               src/org/apache/james/nntpserver/repository
                        NNTPRepositoryImpl.java
               src/org/apache/james/pop3server POP3Handler.java
               src/org/apache/james/services DNSServer.java
               src/org/apache/james/smtpserver SMTPHandler.java
                        SizeLimitedSMTPHandler.java
               src/org/apache/james/userrepository UsersLDAPRepository.java
  Log:
  Updated to latest avalon. Changes in
  
  * Context.get() throws ContextException
  * Move Initializable/Disposable to final package
  
  Revision  Changes    Path
  1.12      +354 -441  jakarta-james/lib/avalonapi.jar
  
  	<<Binary file>>
  
  
  1.12      +165 -154  jakarta-james/lib/cornerstone.bar
  
  	<<Binary file>>
  
  
  1.7       +17 -16    jakarta-james/lib/phoenix-client.jar
  
  	<<Binary file>>
  
  
  1.7       +290 -221  jakarta-james/lib/phoenix-engine.jar
  
  	<<Binary file>>
  
  
  1.7       +12 -12    jakarta-james/lib/phoenix-loader.jar
  
  	<<Binary file>>
  
  
  1.36      +15 -12    jakarta-james/src/org/apache/james/James.java
  
  Index: James.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/James.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- James.java	2001/04/23 01:09:56	1.35
  +++ James.java	2001/04/25 14:45:56	1.36
  @@ -14,7 +14,7 @@
   import javax.mail.MessagingException;
   import javax.mail.Session;
   import javax.mail.internet.*;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
  @@ -72,12 +72,14 @@
       private String inboxRootURL;
       private UsersRepository localusers;
       private Collection serverNames;
  +
       // this used to be long, but increment operations on long are not
       // thread safe. Changed to int. 'int' should be ok, because id generation
       // is based on System time and count
       private static int count;
       private String helloName;
       private String hostName;
  +    private MailAddress postmaster;
       private Map mailboxes; //Not to be shared!
       private Hashtable attributes = new Hashtable();
   
  @@ -87,6 +89,7 @@
       private Host imapHost;
       protected BlockContext           blockContext;
   
  +
       public void contextualize( final Context context )
       {
           this.blockContext = (BlockContext)context;
  @@ -105,7 +108,7 @@
           mailboxes = new HashMap(31);
       }
   
  -    public void init() throws Exception {
  +    public void initialize() throws Exception {
   
           getLogger().info("JAMES init...");
   
  @@ -166,12 +169,13 @@
           for (Iterator i = serverNames.iterator(); i.hasNext(); ) {
               getLogger().info("Handling mail for: " + i.next());
           }
  -        context.put(Constants.SERVER_NAMES, serverNames);
  +        context.put(Constants.SERVER_NAMES, this.serverNames);
   
   
           // Get postmaster
  -        String postmaster = conf.getChild("postmaster").getValue("root@localhost");
  -        context.put(Constants.POSTMASTER, new MailAddress(postmaster));
  +        String postMasterAddress = conf.getChild("postmaster").getValue("root@localhost");
  +        this.postmaster = new MailAddress( postMasterAddress );
  +        context.put( Constants.POSTMASTER, postmaster );
   
           //Get localusers
           try {
  @@ -210,7 +214,7 @@
                   imapSystem.contextualize(context);
                   imapSystem.compose(compMgr);
                   if (imapSystem instanceof Initializable) {
  -                    ((Initializable)imapSystem).init();
  +                    ((Initializable)imapSystem).initialize();
                   }
                   compMgr.put("org.apache.james.imapserver.IMAPSystem", (Component)imapSystem);
                   getLogger().info("Using SimpleSystem.");
  @@ -220,7 +224,7 @@
                   imapHost.contextualize(context);
                   imapHost.compose(compMgr);
                   if (imapHost instanceof Initializable) {
  -                    ((Initializable)imapHost).init();
  +                    ((Initializable)imapHost).initialize();
                   }
                   compMgr.put("org.apache.james.imapserver.Host", (Component)imapHost);
                   getLogger().info("Using: " + imapHostClass);
  @@ -269,7 +273,7 @@
               spoolMgr.configure(conf.getChild("spoolmanager"));
               spoolMgr.contextualize(context);
               spoolMgr.compose(compMgr);
  -            spoolMgr.init();
  +            spoolMgr.initialize();
               workerPool.execute(spoolMgr);
               getLogger().info("SpoolManager started");
           } catch (Exception e) {
  @@ -462,7 +466,7 @@
       }
   
       public MailAddress getPostmaster() {
  -        return (MailAddress)context.get(Constants.POSTMASTER);
  +        return postmaster;
       }
   
       public void storeMail(MailAddress sender, MailAddress recipient, MimeMessage message)
{
  @@ -505,9 +509,8 @@
           return 2;
       }
   
  -    public boolean isLocalServer(String serverName) {
  -        List names = (List)context.get(Constants.SERVER_NAMES);
  -        return names.contains(serverName);
  +    public boolean isLocalServer( final String serverName ) {
  +        return serverNames.contains( serverName );
       }
   
       public String getServerInfo() {
  
  
  
  1.9       +3 -3      jakarta-james/src/org/apache/james/core/AvalonMailStore.java
  
  Index: AvalonMailStore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/core/AvalonMailStore.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AvalonMailStore.java	2001/04/21 21:27:39	1.8
  +++ AvalonMailStore.java	2001/04/25 14:45:58	1.9
  @@ -9,7 +9,7 @@
   
   import java.util.HashMap;
   import java.util.Iterator;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentException;
  @@ -60,7 +60,7 @@
           this.configuration = configuration;
       }
   
  -    public void init()
  +    public void initialize()
           throws Exception {
   
           getLogger().info("JamesMailStore init...");
  @@ -161,7 +161,7 @@
                     ((Contextualizable) reply).contextualize(context);
                     }*/
                       if (reply instanceof Initializable) {
  -                        ((Initializable) reply).init();
  +                        ((Initializable) reply).initialize();
                       }
                       repositories.put(repID, reply);
                       models.put(repID, model);
  
  
  
  1.9       +3 -3      jakarta-james/src/org/apache/james/core/AvalonUsersStore.java
  
  Index: AvalonUsersStore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/core/AvalonUsersStore.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AvalonUsersStore.java	2001/04/19 04:06:34	1.8
  +++ AvalonUsersStore.java	2001/04/25 14:45:58	1.9
  @@ -11,7 +11,7 @@
   import java.net.URL;
   import java.util.HashMap;
   import java.util.Iterator;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
  @@ -46,7 +46,7 @@
           this.componentManager = componentManager;
       }
   
  -    public void init()
  +    public void initialize()
           throws Exception {
   
           getLogger().info("AvalonUsersStore init...");
  @@ -76,7 +76,7 @@
                 }
               */
               if (rep instanceof Initializable) {
  -                ((Initializable) rep).init();
  +                ((Initializable) rep).initialize();
               }
               repositories.put(repName, rep);
               getLogger().info("UsersRepository " + repName + " started.");
  
  
  
  1.13      +2 -2      jakarta-james/src/org/apache/james/dnsserver/DNSServer.java
  
  Index: DNSServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/dnsserver/DNSServer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DNSServer.java	2001/04/21 05:43:28	1.12
  +++ DNSServer.java	2001/04/25 14:46:00	1.13
  @@ -15,7 +15,7 @@
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.Vector;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
  @@ -57,7 +57,7 @@
           dnsCredibility = authoritative ? Credibility.AUTH_ANSWER : Credibility.NONAUTH_ANSWER;
       }
   
  -    public void init()
  +    public void initialize()
           throws Exception {
   
           getLogger().info("DNSServer init...");
  
  
  
  1.5       +3 -3      jakarta-james/src/org/apache/james/imapserver/ACLMailbox.java
  
  Index: ACLMailbox.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/ACLMailbox.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ACLMailbox.java	2001/04/19 04:06:40	1.4
  +++ ACLMailbox.java	2001/04/25 14:46:03	1.5
  @@ -7,8 +7,8 @@
    */
   package org.apache.james.imapserver;
   
  -import org.apache.avalon.Disposable;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Disposable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.context.Contextualizable;
   
   /**
  @@ -39,7 +39,7 @@
        * setConfiguration, setContext, setComponentManager, if they are called,
        * but before any opertional methods are called.
        */
  -    void reInit()
  +    void reinitialize()
           throws Exception;
   }
   
  
  
  
  1.3       +2 -2      jakarta-james/src/org/apache/james/imapserver/Flags.java
  
  Index: Flags.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/Flags.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Flags.java	2001/03/06 07:39:06	1.2
  +++ Flags.java	2001/04/25 14:46:04	1.3
  @@ -10,7 +10,7 @@
   import java.io.Serializable;
   import java.util.HashSet;
   import java.util.Set;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   
   /**
    * The set of flags associated with a message. The \Seen flag is maintained
  @@ -42,7 +42,7 @@
       /**
        * Initialisation - only for object creation not on deserialisation.
        */
  -    public void init() {
  +    public void initialize() {
           users = new HashSet();
       }
   
  
  
  
  1.11      +2 -2      jakarta-james/src/org/apache/james/imapserver/IMAPServer.java
  
  Index: IMAPServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/IMAPServer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- IMAPServer.java	2001/04/23 01:14:29	1.10
  +++ IMAPServer.java	2001/04/25 14:46:04	1.11
  @@ -57,11 +57,11 @@
           super.configure( configuration.getChild( "imaphandler" ) );
       }
   
  -    public void init() throws Exception {
  +    public void initialize() throws Exception {
   
           getLogger().info( "IMAPServer init..." );
           getLogger().info( "IMAPListener using " + m_serverSocketType + " on port " + m_port
);
  -        super.init();
  +        super.initialize();
           getLogger().info("IMAPServer ...init end");
           System.out.println("Started IMAP Server "+m_connectionName);
       }
  
  
  
  1.8       +9 -9      jakarta-james/src/org/apache/james/imapserver/JamesHost.java
  
  Index: JamesHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/JamesHost.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JamesHost.java	2001/04/19 04:06:44	1.7
  +++ JamesHost.java	2001/04/25 14:46:04	1.8
  @@ -12,7 +12,7 @@
   import java.util.*;
   import javax.mail.*;
   import javax.mail.internet.*;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.context.Context;
  @@ -108,7 +108,7 @@
           compMgr = comp;
       }
       
  -    public void init() throws Exception {
  +    public void initialize() throws Exception {
   
           logger.info("JamesHost init...");
           imapSystem = (IMAPSystem) compMgr.lookup("org.apache.james.imapserver.IMAPSystem");
  @@ -242,7 +242,7 @@
                       mailbox.configure(conf);
                       mailbox.contextualize(context);
                       mailbox.compose(compMgr);
  -                    mailbox.reInit();
  +                    mailbox.reinitialize();
                   } catch (Exception e) {
                       e.printStackTrace();
                       throw new
  @@ -351,7 +351,7 @@
                   mailbox.contextualize(context);
                   mailbox.compose(compMgr);
                   mailbox.prepareMailbox(user, absoluteName, user);
  -                mailbox.init();
  +                mailbox.initialize();
               } catch (Exception e) {
                   logger.error("Exception creating mailbox: " + e);
                   throw new MailboxException("Exception creating mailbox: " + e);
  @@ -361,7 +361,7 @@
                   + absoluteName.substring(absoluteName.indexOf(user) + user.length(), absoluteName.length());
               SimpleFolderRecord fr
                   = new SimpleFolderRecord(mailboxName, user, absoluteName);
  -            fr.init();
  +            fr.initialize();
               recordRep.store(fr);
               openMailboxes.put(absoluteName, mailbox);
               mailboxCounts.put(absoluteName, new Integer(1));
  @@ -952,21 +952,21 @@
               userInbox.contextualize(context);
               userInbox.compose(compMgr);
               userInbox.prepareMailbox(user, userInboxAbsName, user);
  -            userRootFolder.init();
  +            userRootFolder.initialize();
               userRootFolder.setNotSelectableByAnyone(true);
  -            userInbox.init();
  +            userInbox.initialize();
               userInbox.setRights(user, MailServer.MDA, "lrswi");
           } catch (Exception e) {
               logger.error("Exception creating new account: " + e);
               return false;
           }
  -        userInboxRecord.init();
  +        userInboxRecord.initialize();
           userInboxRecord.setUidValidity(userInbox.getUIDValidity());
           userInboxRecord.setHighestUid(userInbox.getNextUID() -1);
           userInboxRecord.setLookupRights(userInbox.getUsersWithLookupRights());
           userInboxRecord.setReadRights(userInbox.getUsersWithReadRights());
           userInboxRecord.setNotSelectableByAnyone(userInbox.isNotSelectableByAnyone());
  -        userRootRecord.init();
  +        userRootRecord.initialize();
           userRootRecord.setLookupRights(userRootFolder.getUsersWithLookupRights());
           userRootRecord.setReadRights(userRootFolder.getUsersWithReadRights());
           userRootRecord.setNotSelectableByAnyone(userRootFolder.isNotSelectableByAnyone());
  
  
  
  1.3       +2 -2      jakarta-james/src/org/apache/james/imapserver/SimpleFolderRecord.java
  
  Index: SimpleFolderRecord.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SimpleFolderRecord.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleFolderRecord.java	2001/03/06 07:39:13	1.2
  +++ SimpleFolderRecord.java	2001/04/25 14:46:05	1.3
  @@ -10,7 +10,7 @@
   import java.io.Serializable;
   import java.util.Map;
   import java.util.Set;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   
   /**
    * Object representing the record of a folder in an IMAP on an IMAP Host.
  @@ -53,7 +53,7 @@
           absoluteName = absName;
       }
   
  -    public void init() {
  +    public void initialize() {
           nameInUse = true;
           deleted = false;
           uidValidity = 1; 
  
  
  
  1.6       +2 -2      jakarta-james/src/org/apache/james/imapserver/SimpleSystem.java
  
  Index: SimpleSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SimpleSystem.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SimpleSystem.java	2001/04/19 04:06:46	1.5
  +++ SimpleSystem.java	2001/04/25 14:46:05	1.6
  @@ -8,7 +8,7 @@
   package org.apache.james.imapserver;
   
   import java.util.*;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.configuration.Configuration;
  @@ -49,7 +49,7 @@
           compMgr = comp;
       }
   
  -    public void init() {
  +    public void initialize() throws Exception {
           // Derive namespace and namespaceToken from conf
           singleServer = (String) context.get("HostName");
           servers.add(singleServer);
  
  
  
  1.14      +5 -3      jakarta-james/src/org/apache/james/imapserver/SingleThreadedConnectionHandler.java
  
  Index: SingleThreadedConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SingleThreadedConnectionHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SingleThreadedConnectionHandler.java	2001/04/21 05:48:40	1.13
  +++ SingleThreadedConnectionHandler.java	2001/04/25 14:46:05	1.14
  @@ -12,7 +12,7 @@
   import java.text.*;
   import java.util.*;
   import javax.mail.internet.*;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.Stoppable;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
  @@ -21,6 +21,7 @@
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.cornerstone.services.connection.ConnectionHandler;
   import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
  @@ -146,7 +147,8 @@
               lookup("org.apache.james.imapserver.Host");
       }
   
  -    public void contextualize( final Context context ) {
  +    public void contextualize( final Context context ) 
  +        throws ContextException {
           servername = (String)context.get( Constants.HELO_NAME );
           if ( servername == null )
               servername = "IMAPServer";
  @@ -157,7 +159,7 @@
           timeout = configuration.getChild( "connectiontimeout" ).getValueAsInt( 1800000
);
       }
   
  -    public void init() throws Exception {
  +    public void initialize() throws Exception {
           getLogger().info("SingleThreadedConnectionHandler starting ...");
           namespaceToken = imapSystem.getNamespaceToken();
           getLogger().info("SingleThreadedConnectionHandler initialized");
  
  
  
  1.5       +4 -2      jakarta-james/src/org/apache/james/nntpserver/NNTPHandler.java
  
  Index: NNTPHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/NNTPHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NNTPHandler.java	2001/04/21 05:43:34	1.4
  +++ NNTPHandler.java	2001/04/25 14:46:09	1.5
  @@ -24,7 +24,7 @@
   import java.util.List;
   import java.util.StringTokenizer;
   import java.util.Vector;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  @@ -32,6 +32,7 @@
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cornerstone.services.connection.ConnectionHandler;
  @@ -82,7 +83,8 @@
       private NNTPGroup group;
       private NNTPRepository repo;
   
  -    public void  contextualize( final Context context ) {
  +    public void  contextualize( final Context context ) 
  +        throws ContextException {
           //System.out.println(getClass().getName()+": contextualize");
           servername = (String)context.get( Constants.HELO_NAME );
           if ( servername == null )
  
  
  
  1.5       +3 -3      jakarta-james/src/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
  
  Index: NNTPRepositoryImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NNTPRepositoryImpl.java	2001/04/21 05:43:37	1.4
  +++ NNTPRepositoryImpl.java	2001/04/25 14:46:11	1.5
  @@ -9,7 +9,7 @@
   
   import java.io.*;
   import java.util.*;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.Component;
   import org.apache.avalon.configuration.Configurable;
   import org.apache.avalon.configuration.Configuration;
  @@ -62,7 +62,7 @@
           addGroups = (String[])addGroupsList.toArray(new String[0]);
           getLogger().debug("repository configuration done");
       }
  -    public void init() throws Exception {
  +    public void initialize() throws Exception {
           //System.out.println(getClass().getName()+": init");
           if ( rootPath.exists() == false )
               rootPath.mkdirs();
  @@ -77,7 +77,7 @@
           if ( articleIDPath.exists() == false )
               articleIDPath.mkdirs();
           if ( spool instanceof Initializable )
  -            ((Initializable)spool).init();
  +            ((Initializable)spool).initialize();
           getLogger().debug("repository initialization done");
       }
       public boolean isReadOnly() {
  
  
  
  1.42      +4 -2      jakarta-james/src/org/apache/james/pop3server/POP3Handler.java
  
  Index: POP3Handler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/pop3server/POP3Handler.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- POP3Handler.java	2001/04/21 05:43:42	1.41
  +++ POP3Handler.java	2001/04/25 14:46:13	1.42
  @@ -19,7 +19,7 @@
   import java.util.StringTokenizer;
   import java.util.Vector;
   import javax.mail.MessagingException;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  @@ -27,6 +27,7 @@
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cornerstone.services.connection.ConnectionHandler;
  @@ -80,7 +81,8 @@
       private final static String OK_RESPONSE = "+OK";
       private final static String ERR_RESPONSE = "-ERR";
   
  -    public void  contextualize( final Context context ) {
  +    public void  contextualize( final Context context ) 
  +        throws ContextException {
           servername = (String)context.get( Constants.HELO_NAME );
           if ( servername == null )
               servername = "POP3Server";
  
  
  
  1.2       +2 -2      jakarta-james/src/org/apache/james/services/DNSServer.java
  
  Index: DNSServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/services/DNSServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DNSServer.java	2001/04/21 05:56:22	1.1
  +++ DNSServer.java	2001/04/25 14:46:14	1.2
  @@ -10,5 +10,5 @@
   import java.util.Collection;
   
   public interface DNSServer {
  -    public Collection findMXRecords(String hostname);
  -}
  \ No newline at end of file
  +    Collection findMXRecords(String hostname);
  +}
  
  
  
  1.35      +4 -2      jakarta-james/src/org/apache/james/smtpserver/SMTPHandler.java
  
  Index: SMTPHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/smtpserver/SMTPHandler.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- SMTPHandler.java	2001/04/21 05:43:46	1.34
  +++ SMTPHandler.java	2001/04/25 14:46:15	1.35
  @@ -12,7 +12,7 @@
   import java.util.*;
   import javax.mail.*;
   import javax.mail.internet.*;
  -import org.apache.avalon.Initializable;
  +import org.apache.avalon.activity.Initializable;
   import org.apache.avalon.component.ComponentException;
   import org.apache.avalon.component.ComponentManager;
   import org.apache.avalon.component.Composable;
  @@ -20,6 +20,7 @@
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cornerstone.services.connection.ConnectionHandler;
  @@ -80,7 +81,8 @@
           timeout = conf.getChild( "connectiontimeout" ).getValueAsInt( 120000 );
       }
   
  -    public void  contextualize( final Context context ) {
  +    public void contextualize( final Context context )
  +        throws ContextException {
           servername = (String)context.get( Constants.HELO_NAME );
           if ( servername == null )
               servername = "SMTPServer";
  
  
  
  1.5       +3 -1      jakarta-james/src/org/apache/james/smtpserver/SizeLimitedSMTPHandler.java
  
  Index: SizeLimitedSMTPHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/smtpserver/SizeLimitedSMTPHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SizeLimitedSMTPHandler.java	2001/04/19 04:07:03	1.4
  +++ SizeLimitedSMTPHandler.java	2001/04/25 14:46:15	1.5
  @@ -19,6 +19,7 @@
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.AbstractLoggable;
   import org.apache.cornerstone.services.connection.ConnectionHandler;
  @@ -79,7 +80,8 @@
       private int timeout;
       private long maxmessagesize;
   
  -    public void  contextualize( final Context context ) {
  +    public void  contextualize( final Context context ) 
  +        throws ContextException {
           servername = (String)context.get( Constants.HELO_NAME );
       }
   
  
  
  
  1.8       +3 -1      jakarta-james/src/org/apache/james/userrepository/UsersLDAPRepository.java
  
  Index: UsersLDAPRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/userrepository/UsersLDAPRepository.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- UsersLDAPRepository.java	2001/04/19 04:07:29	1.7
  +++ UsersLDAPRepository.java	2001/04/25 14:46:17	1.8
  @@ -18,6 +18,7 @@
   import org.apache.avalon.configuration.Configuration;
   import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.context.Context;
  +import org.apache.avalon.context.ContextException;
   import org.apache.avalon.context.Contextualizable;
   import org.apache.avalon.logger.Loggable;
   import org.apache.james.Constants;
  @@ -90,7 +91,8 @@
           this.comp = comp;
       }
   
  -    public void contextualize(Context context) {
  +    public void contextualize(Context context) 
  +        throws ContextException {
           Collection serverNames
               = (Collection)context.get(Constants.SERVER_NAMES);
           usersDomain = (String)serverNames.iterator().next();
  
  
  

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


Mime
View raw message