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/proposals/imap/java/org/apache/james/imapserver JamesHost.java SimpleSystem.java
Date Thu, 06 Jun 2002 13:27:00 GMT
hammant     2002/06/06 06:27:00

  Modified:    proposals/imap/java/org/apache/james James.java
               proposals/imap/java/org/apache/james/imapserver
                        JamesHost.java SimpleSystem.java
  Log:
  More block elimination
  
  Revision  Changes    Path
  1.4       +5 -6      jakarta-james/proposals/imap/java/org/apache/james/James.java
  
  Index: James.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/James.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- James.java	17 Jan 2002 06:09:00 -0000	1.3
  +++ James.java	6 Jun 2002 13:27:00 -0000	1.4
  @@ -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;
  @@ -56,13 +55,13 @@
    * @author Serge
    * @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
    *
  - * This is $Revision: 1.3 $
  - * Committed on $Date: 2002/01/17 06:09:00 $ by: $Author: darrell $
  + * This is $Revision: 1.4 $
  + * Committed on $Date: 2002/06/06 13:27:00 $ by: $Author: hammant $
    */
   public class James
       extends AbstractLogEnabled
  -    implements Block, Contextualizable, Composable, Configurable,
  -               Initializable, MailServer, MailetContext {
  +    implements Contextualizable, Composable, Configurable,
  +               Initializable, MailServer, MailetContext, Component {
   
       //and this is a mistake
   
  @@ -532,7 +531,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.5       +22 -22    jakarta-james/proposals/imap/java/org/apache/james/imapserver/JamesHost.java
  
  Index: JamesHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/JamesHost.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JamesHost.java	17 Jan 2002 06:09:00 -0000	1.4
  +++ JamesHost.java	6 Jun 2002 13:27:00 -0000	1.5
  @@ -10,13 +10,13 @@
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.james.AccessControlException;
   import org.apache.james.AuthorizationException;
   import org.apache.james.services.MailServer;
  @@ -48,7 +48,7 @@
    */
   public class JamesHost
           extends AbstractLogEnabled
  -        implements Host, Block, Configurable, Composable, Contextualizable, Initializable
  +        implements Host, Component, Configurable, Composable, Contextualizable, Initializable
   {
   
       private Context context;
  @@ -194,7 +194,7 @@
        * the client.
        *
        * @param username an email address
  -     * @returns true if inbox (and private mailfolders) are accessible through
  +     * @return true if inbox (and private mailfolders) are accessible through
        * this host.
        */
       public boolean isHomeServer( String username )
  @@ -208,7 +208,7 @@
        * sent to client.
        *
        * @param username an email address
  -     * @returns true if the specified user has at least read access to any
  +     * @return true if the specified user has at least read access to any
        * mailboxes on this host.
        */
       public boolean hasLocalAccess( String username )
  @@ -223,7 +223,7 @@
        *
        * @param user email address on whose behalf the request is made.
        * @param mailboxName String name of the target.
  -     * @returns an Mailbox reference.
  +     * @return an Mailbox reference.
        * @throws AccessControlException if the user does not have at least
        * lookup rights.
        * @throws MailboxException if mailbox does not exist locally.
  @@ -318,7 +318,7 @@
        *
        * @param user email address on whose behalf the request is made.
        * @param mailboxName String name of the target
  -     * @returns an Mailbox reference.
  +     * @return an Mailbox reference.
        * @throws AccessControlException if the user does not have lookup rights
        * for parent or any needed ancestor folder
        * lookup rights.
  @@ -431,7 +431,8 @@
       /**
        * Releases a reference to a mailbox, allowing Host to do any housekeeping.
        *
  -     * @param mbox a non-null reference to an ACL Mailbox.
  +     * @param user a user.
  +     * @param mailbox a non-null reference to an ACL Mailbox.
        */
       public void releaseMailbox( String user, ACLMailbox mailbox )
       {
  @@ -481,7 +482,7 @@
        *
        * @param user email address on whose behalf the request is made.
        * @param mailboxName String name of the target
  -     * @returns true if mailbox deleted successfully
  +     * @return true if mailbox deleted successfully
        * @throws MailboxException if mailbox does not exist locally or is any
        * identities INBOX.
        * @throws AuthorizationException if mailbox exists locally but user does
  @@ -570,7 +571,7 @@
        * @param user email address on whose behalf the request is made.
        * @param oldMailboxName String name of the existing mailbox
        * @param newMailboxName String target new name
  -     * @returns true if rename completed successfully
  +     * @return true if rename completed successfully
        * @throws MailboxException if mailbox does not exist locally, or there
        * is an existing mailbox with the new name.
        * @throws AuthorizationException if user does not have rights to delete
  @@ -590,7 +591,7 @@
        * expicitly request another.
        *
        * @param username String an email address
  -     * @returns a String of a namespace
  +     * @return a String of a namespace
        */
       public String getDefaultNamespace( String username )
       {
  @@ -602,7 +603,7 @@
        * existing and deleted folders.
        *
        * @param mailbox String name of the existing mailbox
  -     * @returns  an integer containing the current UID Validity value.
  +     * @return  an integer containing the current UID Validity value.
        */
       //  public int getUIDValidity(String mailbox);
   
  @@ -640,7 +641,7 @@
        * @param mailboxName String name of a mailbox possible including a
        * wildcard.
        * @param subscribedOnly only return mailboxes currently subscribed.
  -     * @returns Collection of strings representing a set of mailboxes.
  +     * @return Collection of strings representing a set of mailboxes.
        * @throws AccessControlException if the user does not have at least
        * lookup rights to at least one mailbox in the set requested.
        * @throws MailboxException if the referenceName is not local or if
  @@ -888,9 +889,9 @@
        * Subscribes a userName to a mailbox. The mailbox must exist locally and the
        * userName must have at least lookup rights to it.
        *
  -     * @param username String representation of an email address
  -     * @param mailbox String representation of a mailbox name.
  -     * @returns true if subscribe completes successfully
  +     * @param userName String representation of an email address
  +     * @param mailboxName String representation of a mailbox name.
  +     * @return true if subscribe completes successfully
        * @throws AccessControlException if the mailbox exists but the userName does
        * not have lookup rights.
        * @throws MailboxException if the mailbox does not exist locally.
  @@ -916,9 +917,9 @@
       /**
        * Unsubscribes from a given mailbox.
        *
  -     * @param username String representation of an email address
  -     * @param mailbox String representation of a mailbox name.
  -     * @returns true if unsubscribe completes successfully
  +     * @param userName String representation of an email address
  +     * @param mailboxName String representation of a mailbox name.
  +     * @return true if unsubscribe completes successfully
        */
       public boolean unsubscribe( String userName, String mailboxName )
               throws MailboxException, AccessControlException
  @@ -952,7 +953,7 @@
        * @param mailboxName String name of a mailbox (no wildcards allowed).
        * @param dataItems Vector of one or more Strings each of a single
        * status item.
  -     * @returns String consisting of space seperated pairs:
  +     * @return String consisting of space seperated pairs:
        * dataItem-space-number.
        * @throws AccessControlException if the user does not have at least
        * lookup rights to the mailbox requested.
  @@ -1046,7 +1047,7 @@
        * <br> Convert "INBOX" for user "Fred.Flinstone" into
        * absolute name: "#user.Fred.Flintstone.INBOX"
        *
  -     * @returns String of absoluteName, null if not valid selection
  +     * @return String of absoluteName, null if not valid selection
        */
       private String getAbsoluteMailboxName( String user, String fullMailboxName )
       {
  @@ -1097,7 +1098,7 @@
        * remove this section.
        * Otherwise, return as-is.
        *
  -     * @returns user-aware mailbox name
  +     * @return user-aware mailbox name
        */
       private String getUserAwareMailboxName( String user, String absoluteName )
       {
  @@ -1134,7 +1135,6 @@
        * Return the file-system path to a given absoluteName mailbox.
        *
        * @param absoluteName the user-independent name of the mailbox
  -     * @param owner string name of owner of mailbox
        */
       String getPath( String absoluteName )
       {
  
  
  
  1.4       +5 -5      jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleSystem.java
  
  Index: SimpleSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/proposals/imap/java/org/apache/james/imapserver/SimpleSystem.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleSystem.java	18 Jan 2002 02:48:34 -0000	1.3
  +++ SimpleSystem.java	6 Jun 2002 13:27:00 -0000	1.4
  @@ -9,10 +9,10 @@
   
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.phoenix.Block;
   import org.apache.james.AuthenticationException;
   
   import java.net.InetAddress;
  @@ -30,7 +30,7 @@
    * @version 0.1 on 14 Dec 2000
    */
   public class SimpleSystem
  -    implements IMAPSystem, Block, Initializable {
  +    implements IMAPSystem, Component, Initializable {
   
       private static final String namespaceToken = "#";
       private static final String hierarchySeperator = ".";
  @@ -83,7 +83,7 @@
        * with RFC2192, IMAP URL Scheme.
        *
        * @param username String representation of a user
  -     * @returns String holding an IMAP URL for the user's home server
  +     * @return String holding an IMAP URL for the user's home server
        * @throws AuthenticationException if this System does not recognise
        * the user.
        */
  @@ -100,7 +100,7 @@
        * forward slash or backslash.
        *
        * @param namespace String identifying a namespace
  -     * @returns char, usually '.', '/', or '\'
  +     * @return char, usually '.', '/', or '\'
        */
       public String getHierarchySeperator(String namespace) {
           return hierarchySeperator;
  @@ -113,7 +113,7 @@
        * <code>IMAPHosts</code>
        *
        * @param username String identifying a user of this System
  -     * @returns String whose contents should be a space seperated triple
  +     * @return String whose contents should be a space seperated triple
        * <personal namespaces(s)> space <other users' namespace(s)> space
        * <shared namespace(s)>, per RFC2342
        */
  
  
  

--
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