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 do...@apache.org on 2001/03/05 16:22:11 UTC

cvs commit: jakarta-james/src/org/apache/james/imapserver ConnectionHandler.java FileMailbox.java Host.java IMAPServer.java IMAPSystem.java JamesHost.java Mailbox.java SimpleSystem.java SingleThreadedConnectionHandler.java

donaldp     01/03/05 07:22:10

  Modified:    src/org/apache/james/imapserver ConnectionHandler.java
                        FileMailbox.java Host.java IMAPServer.java
                        IMAPSystem.java JamesHost.java Mailbox.java
                        SimpleSystem.java
                        SingleThreadedConnectionHandler.java
  Log:
  Updated to non-deprecated Configuration
  
  Submitted By: "Eung-ju Park" <co...@isoft.co.kr>
  
  combined with
  
  Made James conform to the JLS spec closer.
  
  Did this by removing any structures that are "strongly discouraged".
  
  Revision  Changes    Path
  1.4       +10 -7     jakarta-james/src/org/apache/james/imapserver/ConnectionHandler.java
  
  Index: ConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/ConnectionHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConnectionHandler.java	2001/02/03 18:21:23	1.3
  +++ ConnectionHandler.java	2001/03/05 15:21:46	1.4
  @@ -9,10 +9,14 @@
   package org.apache.james.imapserver;
   
   import java.net.Socket;
  -
  -import org.apache.avalon.*;
  -import org.apache.phoenix.Service;
  +import org.apache.avalon.Composer;
  +import org.apache.avalon.Contextualizable;
  +import org.apache.avalon.Initializable;
  +import org.apache.avalon.Stoppable;
  +import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.configuration.Configuration;
   import org.apache.cornerstone.services.Scheduler;
  +import org.apache.phoenix.Service;
   
   /**
    * An IMAP Handler handles one IMAP connection. TBC - it may spawn worker
  @@ -23,16 +27,15 @@
    */
   public interface ConnectionHandler
       extends Service, Configurable, Composer, Contextualizable,
  -	    Initializable, Runnable, Stoppable, Scheduler.Target,
  -	    MailboxEventListener {
  +    Initializable, Runnable, Stoppable, Scheduler.Target,
  +    MailboxEventListener {
   
       /**
        * Prepares Connection Handler object by in/out streams to socket. Used before object is attached to its own thread.
        *
        * @param socket Socket providing connection.
        */
  -    public void parseRequest(Socket socket);
  -
  +    void parseRequest( Socket socket );
   }
   
   
  
  
  
  1.4       +4 -1      jakarta-james/src/org/apache/james/imapserver/FileMailbox.java
  
  Index: FileMailbox.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/FileMailbox.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileMailbox.java	2001/01/15 18:20:46	1.3
  +++ FileMailbox.java	2001/03/05 15:21:49	1.4
  @@ -14,7 +14,10 @@
   import javax.mail.*;
   import javax.mail.internet.*;
   
  -import org.apache.avalon.*;
  +import org.apache.avalon.Context;
  +import org.apache.avalon.ComponentManager;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
   
   import org.apache.james.AccessControlException;
   import org.apache.james.AuthorizationException;
  
  
  
  1.4       +26 -27    jakarta-james/src/org/apache/james/imapserver/Host.java
  
  Index: Host.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/Host.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Host.java	2001/02/18 05:38:13	1.3
  +++ Host.java	2001/03/05 15:21:51	1.4
  @@ -13,7 +13,11 @@
   import java.util.*;
   import javax.mail.*;
   import javax.mail.internet.*;
  -import org.apache.avalon.*;
  +import org.apache.avalon.Contextualizable;
  +import org.apache.avalon.Composer;
  +import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.james.AccessControlException;
   import org.apache.james.AuthorizationException;
   
  @@ -36,9 +40,8 @@
   public interface Host 
       extends Configurable, Composer, Contextualizable, org.apache.phoenix.Service {
      
  -    public static final String IMAP_HOST = "IMAP_HOST";
  +    String IMAP_HOST = "IMAP_HOST";
   
  -
       /**
        * Establishes whether this host is the Home Server for the specified user.
        * Used during login to decide whether a LOGIN_REFERRAL has to be sent to
  @@ -48,8 +51,7 @@
        * @returns true if inbox (and private mailfolders) are accessible through
        * this host. 
        */
  -    public boolean isHomeServer (String username);
  -
  +    boolean isHomeServer (String username);
   
       /**
        * Establishes if the specified user can access any mailboxes on this host.
  @@ -60,9 +62,8 @@
        * @returns true if the specified user has at least read access to any
        * mailboxes on this host.
        */
  -    public boolean hasLocalAccess (String username);
  +    boolean hasLocalAccess (String username);
   
  -
       /**
        * Returns a reference to an existing Mailbox. The requested mailbox
        * must already exists on this server and the requesting user must have at
  @@ -75,7 +76,7 @@
        * lookup rights.
        * @throws MailboxException if mailbox does not exist locally.
        */
  -    public ACLMailbox getMailbox(String user, String mailboxName)
  +    ACLMailbox getMailbox(String user, String mailboxName)
           throws AccessControlException, MailboxException;
   
   
  @@ -101,9 +102,8 @@
        * user does not have create rights.
        * @see FolderRecord
        */
  -    public ACLMailbox createMailbox(String user, String mailboxName)
  -        throws AccessControlException, AuthorizationException,
  -        MailboxException;
  +    ACLMailbox createMailbox(String user, String mailboxName)
  +        throws AccessControlException, AuthorizationException, MailboxException;
   
   
       /**
  @@ -122,7 +122,7 @@
        * not have rights to delete it.
        * @see FolderRecord
        */
  -    public boolean deleteMailbox(String user, String mailboxName)
  +    boolean deleteMailbox(String user, String mailboxName)
           throws MailboxException, AuthorizationException;
   
   
  @@ -149,8 +149,9 @@
        * the existing mailbox or create the new mailbox.
        * @see FolderRecord
        */
  -    public boolean renameMailbox(String user, String oldMailboxName,
  -                                 String newMailboxName)
  +    boolean renameMailbox( String user, 
  +                           String oldMailboxName,
  +                           String newMailboxName )
           throws MailboxException, AuthorizationException;
   
       /**
  @@ -159,7 +160,7 @@
        * @param username String user who has finished with this mailbox
        * @param mbox a non-null reference to an ACL Mailbox.
        */
  -    public void releaseMailbox(String user, ACLMailbox mbox);
  +    void releaseMailbox(String user, ACLMailbox mbox);
    
       /**
        * Returns the namespace which should be used for this user unless they
  @@ -168,7 +169,7 @@
        * @param username String an email address
        * @returns a String of a namespace
        */
  -    public String getDefaultNamespace(String username);
  +    String getDefaultNamespace(String username);
   
   
       /**
  @@ -222,8 +223,10 @@
        * referenceName and mailbox name resolve to a single mailbox which does
        * not exist locally.
        */
  -    public Collection listMailboxes(String username, String referenceName,
  -                                    String mailboxName, boolean subscribedOnly)
  +    Collection listMailboxes( String username, 
  +                              String referenceName,
  +                              String mailboxName, 
  +                              boolean subscribedOnly )
           throws MailboxException, AccessControlException;
   
       /**
  @@ -237,7 +240,7 @@
        * not have lookup rights.
        * @throws MailboxException if the mailbox does not exist locally.
        */
  -    public boolean subscribe(String username, String mailbox)
  +    boolean subscribe( String username, String mailbox )
           throws MailboxException, AccessControlException;
   
       /**
  @@ -247,10 +250,9 @@
        * @param mailbox String representation of a mailbox name.
        * @returns true if unsubscribe completes successfully
        */
  -    public boolean unsubscribe(String username, String mailbox)
  +    boolean unsubscribe( String username, String mailbox )
           throws MailboxException, AccessControlException;
   
  -
       /**
        * Returns a string giving the status of a mailbox on requested criteria.
        * Currently defined staus items are:
  @@ -271,12 +273,9 @@
        * lookup rights to the mailbox requested.
        * @throws MailboxException if the mailboxName does not exist locally. 
        */
  -    public String getMailboxStatus(String username, String mailboxName,
  -                                   List dataItems)
  +    String getMailboxStatus( String username, 
  +                             String mailboxName,
  +                             List dataItems )
           throws MailboxException, AccessControlException;
  -
  -
  -
  -
   }
   
  
  
  
  1.6       +9 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IMAPServer.java	2001/02/18 05:38:56	1.5
  +++ IMAPServer.java	2001/03/05 15:21:51	1.6
  @@ -12,8 +12,16 @@
   
   import java.net.*;
   import java.util.Date;
  -import org.apache.avalon.*;
  +import org.apache.avalon.Loggable;
   import org.apache.avalon.AbstractLoggable;
  +import org.apache.avalon.Contextualizable;
  +import org.apache.avalon.Context;
  +import org.apache.avalon.Composer;
  +import org.apache.avalon.ComponentManager;
  +import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.Component;
   import org.apache.avalon.util.lang.*;
   import org.apache.avalon.util.thread.ThreadPool;
   import org.apache.cornerstone.services.SocketServer;
  
  
  
  1.4       +15 -16    jakarta-james/src/org/apache/james/imapserver/IMAPSystem.java
  
  Index: IMAPSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/IMAPSystem.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IMAPSystem.java	2001/02/03 18:21:24	1.3
  +++ IMAPSystem.java	2001/03/05 15:21:52	1.4
  @@ -9,8 +9,11 @@
   package org.apache.james.imapserver;
   
   import java.util.Iterator;
  -import org.apache.avalon.*;
  -//import org.apache.phoenix.Service;
  +import org.apache.avalon.Contextualizable;
  +import org.apache.avalon.Context;
  +import org.apache.avalon.Composer;
  +import org.apache.avalon.ComponentManager;
  +import org.apache.avalon.configuration.Configurable;
   
   import org.apache.james.AuthenticationException;
   
  @@ -29,18 +32,17 @@
   
   public interface IMAPSystem extends Configurable, Contextualizable, Composer {
   
  +    String IMAP_SYSTEM = "IMAP_SYSTEM";
  +    String PRIVATE = "Private";
  +    String OTHER_USERS = "OtherUsers";
  +    String SHARED = "Shared";
   
  -    public static final String IMAP_SYSTEM = "IMAP_SYSTEM";
  -    public static final String PRIVATE = "Private";
  -    public static final String OTHER_USERS = "OtherUsers";
  -    public static final String SHARED = "Shared";
  -
       /**
        * Returns the token indicating a namespace.  Implementation dependent but
        * by convention, '#'.
        * Example: #news.org.apache vs #mail.org.apache
        */
  -    public String getNamespaceToken();
  +    String getNamespaceToken();
   
   
       /**
  @@ -54,8 +56,8 @@
        * @throws AuthenticationException if this System does not recognise
        * the user.
        */
  -    public String getHomeServer(String username)
  -	throws AuthenticationException;
  +    String getHomeServer( String username )
  +        throws AuthenticationException;
   
   
       /**
  @@ -68,8 +70,7 @@
        * @param namespace String identifying a namespace
        * @returns char, usually '.', '/', or '\'
        */
  -    public String getHierarchySeperator(String namespace);
  -
  +    String getHierarchySeperator( String namespace );
   
       /**
        * Provides the set of namesapces a given user can access. Implementations
  @@ -82,9 +83,8 @@
        * <personal namespaces(s)> space <other users' namespace(s)> space
        * <shared namespace(s)>, per RFC2342
        */
  -    public String getNamespaces(String username);
  +    String getNamespaces( String username );
   
  -
       /**
        * Returns an iterator over the collection of servers on which this user
        * has access. The collection should be unmodifiable.
  @@ -93,6 +93,5 @@
        * @param username String identifying a user
        * @return iterator over a collection of strings
        */
  -    public Iterator getAccessibleServers(String username);
  -
  +    Iterator getAccessibleServers( String username );
   }
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JamesHost.java	2001/03/05 11:49:30	1.4
  +++ JamesHost.java	2001/03/05 15:21:53	1.5
  @@ -13,6 +13,8 @@
   import java.util.*;
   import javax.mail.*;
   import javax.mail.internet.*;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.avalon.*;
   import org.apache.james.AccessControlException;
   import org.apache.james.AuthorizationException;
  @@ -39,7 +41,6 @@
   
   public class JamesHost implements Host, Component, Initializable {
   
  -
       private Context context;
       private Configuration conf;
       private ComponentManager compMgr;
  @@ -90,7 +91,6 @@
        * MimeMessage - msg
        * MessageAttributes - att
        */
  -
   
       /* No constructor */
   
  
  
  
  1.4       +66 -84    jakarta-james/src/org/apache/james/imapserver/Mailbox.java
  
  Index: Mailbox.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/Mailbox.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Mailbox.java	2001/02/03 18:21:24	1.3
  +++ Mailbox.java	2001/03/05 15:21:55	1.4
  @@ -14,7 +14,8 @@
   import javax.mail.*;
   import javax.mail.internet.*;
   
  -import org.apache.avalon.*;
  +import org.apache.avalon.Composer;
  +import org.apache.avalon.configuration.Configurable;
   //import org.apache.avalon.services.Service;
   
   import org.apache.james.AccessControlException;
  @@ -80,7 +81,7 @@
        * @returns String name of mailbox relative to its immeadiate parent in
        * the mailbox hierarchy.
        */
  -    public String getName();
  +    String getName();
   
       /**
        * Returns absolute, that is user-independent, hierarchical name of
  @@ -89,7 +90,7 @@
        *
        * @returns String name of mailbox in absolute form
        */
  -    public String getAbsoluteName();
  +    String getAbsoluteName();
   
       /** Returns namespace starting with namespace token.
        * Example: '#mail'
  @@ -104,21 +105,21 @@
        * @param name possible name for this Mailbox
        * @returns true if name matches either getName() or getAbsoluteName()
        */
  -    public boolean matchesName(String name);
  +    boolean matchesName(String name);
   
       /**
        * Returns the current unique id validity value of this mailbox.
        *
        * @returns int current 32 bit unique id validity value of this mailbox
        */
  -    public int getUIDValidity();
  +    int getUIDValidity();
   
       /**
        * Returns the 32 bit uid available for the next message.
        *
        * @returns int the next UID that would be used.
        */
  -    public int getNextUID();
  +    int getNextUID();
   
       /**
        * Returns mailbox size in octets. Should only include actual messages
  @@ -126,7 +127,7 @@
        *
        * @returns int mailbox size in octets
        */
  -    public int getMailboxSize();
  +    int getMailboxSize();
   
       /**
        * Indicates if child folders may be created. It does not indicate which
  @@ -134,7 +135,7 @@
        *
        * @returns boolean TRUE if inferiors aree allowed
        */
  -    public boolean getInferiorsAllowed();
  +    boolean getInferiorsAllowed();
   
       /**
        * Indicates if this folder may be selected by the specified user.
  @@ -146,7 +147,7 @@
        * @returns boolean TRUE if specified user can Select mailbox.
        * @throws AccessControlException if username does not have lookup rights
        */
  -    public boolean isSelectable(String username) throws AccessControlException;
  +    boolean isSelectable(String username) throws AccessControlException;
   
       /**
        * Indicates that messages have been added since this mailbox was last
  @@ -155,9 +156,8 @@
        * @returns boolean TRUE if new messages since any user last selected
        * mailbox
        */
  -    public boolean isMarked();
  +    boolean isMarked();
   
  -
       /**
        * Returns all flags supported by this mailbox.
        * e.g. \Answered \Deleted
  @@ -165,8 +165,7 @@
        * @returns String a space seperated list of message flags which are
        * supported by this mailbox.
        */
  -    public String getSupportedFlags();
  -
  +    String getSupportedFlags();
   
       /**
        * Indicates if specified user can change any flag on a permanent basis,
  @@ -176,7 +175,7 @@
        * @returns true if specified user can change all flags permanently.
        * @throws AccessControlException if username does not have lookup rights
        */
  -    public boolean allFlags(String username) throws AccessControlException;
  +    boolean allFlags(String username) throws AccessControlException;
   
       /**
        * Indicates which flags this user can change permanently. If allFlags()
  @@ -187,7 +186,7 @@
        * @returns String a space seperated list of message flags which this user
        * can set permanently
        */
  -    public String getPermanentFlags(String username)
  +    String getPermanentFlags( String username )
           throws AccessControlException;
   
       /**
  @@ -195,21 +194,21 @@
        *
        * @returns int number of messages
        */
  -    public int getExists();
  +    int getExists();
   
       /**
        * Indicates no of messages with \Recent flag set
        *
        * @returns int no of messages with \Recent flag set
        */
  -    public int getRecent();
  +    int getRecent();
   
   
       /**
        * Remove \Recent flag from all messages in mailbox. Should be called
        * whenever a user session finishes.
        */
  -    public void unsetRecent();
  +    void unsetRecent();
   
       /** 
        * Indicates the oldest unseen message for the specified user. 
  @@ -219,14 +218,14 @@
        * <br> -1 means all messages have \Seen flag set for this user.
        * <br> 0 means no message (Seen or unseen) in this mailbox.
        */
  -    public int getOldestUnseen(String user);
  +    int getOldestUnseen( String user );
   
      /** 
        * Indicates the number of  unseen messages for the specified user. 
        *
        * @returns int number of messages without \Seen flag set for this User.
        */
  -    public int getUnseen(String user);
  +    int getUnseen( String user );
   
       /**
        * Indicates state in which  the mailbox will be opened by specified user.
  @@ -242,8 +241,8 @@
        * @throws AccessControlException if the user can not open this mailbox
        * at least Read-Only.
        */
  -    public boolean isReadOnly(String username) throws AccessControlException;
  -
  +    boolean isReadOnly( String username ) 
  +        throws AccessControlException;
   
       /**
        * Mailbox Events are used to inform registered listeners of events in the
  @@ -251,8 +250,8 @@
        * Example if mail is delivered to an Inbox or if another user appends/ 
        * deletes a message.
        */
  -    public void addMailboxEventListener(MailboxEventListener mel) ;
  -    public void removeMailboxEventListener(MailboxEventListener mel);
  +    void addMailboxEventListener( MailboxEventListener mel );
  +    void removeMailboxEventListener( MailboxEventListener mel );
   
       /**
        * Stores a message in this mailbox. User must have insert rights.
  @@ -263,9 +262,8 @@
        * @throws AccessControlException if username does not have lookup rights for this mailbox.
        * @throws AuthorizationException if username has lookup rights but does not have insert rights.
        */
  -    public boolean store(MimeMessage message, String username)
  -	throws AccessControlException, AuthorizationException,
  -	       IllegalArgumentException ;
  +    boolean store( MimeMessage message, String username )
  +        throws AccessControlException, AuthorizationException, IllegalArgumentException;
   
       /**
        * Stores a message in this mailbox, using passed MessageAttributes and
  @@ -281,10 +279,11 @@
        * @throws AuthorizationException if username has lookup rights but does
        * not have insert rights.
        */
  -    public boolean store(MimeMessage message, String username,
  -			 MessageAttributes attrs, Flags flags)
  -	throws AccessControlException, AuthorizationException,
  -	       IllegalArgumentException ;
  +    boolean store( MimeMessage message, 
  +                   String username,
  +                   MessageAttributes attrs, 
  +                   Flags flags )
  +        throws AccessControlException, AuthorizationException, IllegalArgumentException;
   
       /**
        * Retrieves a message given a message sequence number.
  @@ -298,8 +297,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have read rights.
        */
  -    public EnhancedMimeMessage retrieve(int msn, String user)
  -	throws AccessControlException, AuthorizationException ;
  +    EnhancedMimeMessage retrieve( int msn, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Retrieves a message given a unique identifier.
  @@ -313,8 +312,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have read rights.
        */
  -    public EnhancedMimeMessage retrieveUID(int uid, String user)
  -	throws AccessControlException, AuthorizationException ;
  +    EnhancedMimeMessage retrieveUID( int uid, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Marks a message for deletion given a message sequence number.
  @@ -327,9 +326,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public boolean markDeleted(int msn, String user)
  -	throws AccessControlException, AuthorizationException ;
  -
  +    boolean markDeleted( int msn, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Marks a message for deletion given a unique identifier.
  @@ -343,8 +341,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public boolean markDeletedUID(int uid, String user)
  -	throws AccessControlException, AuthorizationException ;
  +    boolean markDeletedUID( int uid, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Returns the message attributes for a message.
  @@ -359,8 +357,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public MessageAttributes getMessageAttributes(int msn, String user)
  -	throws AccessControlException, AuthorizationException ;
  +    MessageAttributes getMessageAttributes( int msn, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Returns the message attributes for a message.
  @@ -375,8 +373,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public MessageAttributes getMessageAttributesUID(int uid, String user)
  -	throws AccessControlException, AuthorizationException ;
  +    MessageAttributes getMessageAttributesUID( int uid, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Updates the attributes of a message.
  @@ -387,9 +385,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public boolean updateMessageAttributes(MessageAttributes attrs, String user)
  -	throws AccessControlException, AuthorizationException ;
  -
  +    boolean updateMessageAttributes( MessageAttributes attrs, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Get the IMAP-formatted String of flags for specified message.
  @@ -402,8 +399,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have read rights.
        */
  -    public String getFlags(int msn, String user)
  -	throws AccessControlException, AuthorizationException;
  +    String getFlags( int msn, String user )
  +        throws AccessControlException, AuthorizationException;
   
      /**
        * Get the IMAP-formatted String of flags for specified message.
  @@ -416,10 +413,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have read rights.
        */
  -    public String getFlagsUID(int uid, String user)
  -	throws AccessControlException, AuthorizationException;
  -
  -
  +    String getFlagsUID(int uid, String user)
  +        throws AccessControlException, AuthorizationException;
       
       /**
        * Updates the flags of a message. 
  @@ -432,8 +427,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public boolean setFlags(int msn, String user, String request)
  -	throws AccessControlException, AuthorizationException, IllegalArgumentException ;
  +    boolean setFlags( int msn, String user, String request )
  +        throws AccessControlException, AuthorizationException, IllegalArgumentException;
   
       /**
        * Updates the flags of a message. 
  @@ -446,11 +441,9 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public boolean setFlagsUID(int uid, String user, String request)
  -	throws AccessControlException, AuthorizationException, IllegalArgumentException ;
  -
  +    boolean setFlagsUID( int uid, String user, String request )
  +        throws AccessControlException, AuthorizationException, IllegalArgumentException;
   
  -
       /**
        * Returns the Internet Headers for a message.  These are the top-level
        * headers only, ie not MIME part headers or headers of encapsulated
  @@ -466,9 +459,8 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public InternetHeaders getInternetHeaders(int msn, String user)
  -	throws AccessControlException, AuthorizationException ;
  -
  +    InternetHeaders getInternetHeaders( int msn, String user )
  +        throws AccessControlException, AuthorizationException;
   
       /**
        * Returns the Internet Headers for a message.  These are the top-level
  @@ -485,17 +477,9 @@
        * @throws AuthorizationException if user has lookup rights but does not
        * have delete rights.
        */
  -    public InternetHeaders getInternetHeadersUID(int uid, String user)
  -	throws AccessControlException, AuthorizationException ;
  +    InternetHeaders getInternetHeadersUID( int uid, String user )
  +        throws AccessControlException, AuthorizationException;
   
  -
  -
  -
  -
  -
  -
  -
  -
       /**
        * Removes all messages marked Deleted.  User must have delete rights.
        *
  @@ -506,8 +490,8 @@
        * @throws AuthorizationException if user has delete rights but does not
        * have delete rights.
        */
  -    public boolean expunge(String user)
  -	throws AccessControlException, AuthorizationException, IllegalArgumentException ;
  +    boolean expunge( String user )
  +        throws AccessControlException, AuthorizationException, IllegalArgumentException;
   
       /**
        * Establishes if specified user has lookup rights for this mailbox.
  @@ -515,7 +499,7 @@
        * @param username String represnting user
        * @returns true if user has at least lookup rights
        */
  -    public boolean hasLookupRights(String user);
  +    boolean hasLookupRights( String user );
   	
       /**
        * Establishes if specified user has create rights for this mailbox.
  @@ -525,8 +509,8 @@
        * @throws AccessControlException if user does not have lookup rights for
        * this mailbox.
        */
  -    public boolean hasCreateRights(String user)
  -	throws AccessControlException;
  +    boolean hasCreateRights( String user )
  +        throws AccessControlException;
   
       /**
        * Lists uids of messages in mailbox indexed by MSN.
  @@ -536,9 +520,8 @@
        * @throws AccessControlException if user does not have lookup rights for
        * this mailbox.
        */
  -    public List listUIDs(String user);
  +    List listUIDs( String user );
   
  -
       /**
        * Returns true once this Mailbox has been checkpointed.
        * This may include resolving in-memory state with disk state.
  @@ -546,7 +529,7 @@
        *
        * @returns true if check completes normally, false otherwise.
        */
  -    public boolean checkpoint();
  +    boolean checkpoint();
   
       /**
        * Mark this mailbox as not selectable by anyone. 
  @@ -554,17 +537,16 @@
        *
        * @param state true if folder is not selectable by anyone
        */
  -    public void setNotSelectableByAnyone(boolean state);
  +    void setNotSelectableByAnyone( boolean state );
   
  -    public boolean isNotSelectableByAnyone();
  +    boolean isNotSelectableByAnyone();
   
       /**
        * Gets map of users to number of unseen messages. User key will only be
        * present if getOldestUnseen() has been called, usually as a result of
        * an IMAP SELECT or EXAMINE.
        */
  -    public Map getUnseenByUser() ;
  -
  +    Map getUnseenByUser();
   }
    
   
  
  
  
  1.3       +6 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleSystem.java	2001/01/15 12:55:29	1.2
  +++ SimpleSystem.java	2001/03/05 15:21:57	1.3
  @@ -10,7 +10,12 @@
   
   
   import java.util.*;
  -import org.apache.avalon.*;
  +import org.apache.avalon.Context;
  +import org.apache.avalon.ComponentManager;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.Initializable;
  +import org.apache.avalon.Component;
   
   import org.apache.james.AuthenticationException;
   
  
  
  
  1.7       +4 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SingleThreadedConnectionHandler.java	2001/02/03 18:21:24	1.6
  +++ SingleThreadedConnectionHandler.java	2001/03/05 15:21:58	1.7
  @@ -16,7 +16,10 @@
   import javax.mail.Session;
   import javax.mail.internet.*;
   
  -import org.apache.avalon.*;
  +import org.apache.avalon.Context;
  +import org.apache.avalon.ComponentManager;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
   import org.apache.cornerstone.services.Scheduler;
   
   //import org.apache.james.*;