avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/ldap LdapUserManager.java
Date Mon, 17 Dec 2001 09:38:24 GMT
hammant     01/12/17 01:38:24

  Modified:    apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager
                        AbstractUserManager.java
               apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/db
                        DbUserManager.java
               apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/ldap
                        LdapUserManager.java
  Added:       apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager
                        InternalUserManagerException.java
  Log:
  JDK1.3 compatability again
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/AbstractUserManager.java
  
  Index: AbstractUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/AbstractUserManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractUserManager.java	2001/12/14 01:22:03	1.1
  +++ AbstractUserManager.java	2001/12/17 09:38:24	1.2
  @@ -31,7 +31,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public abstract class AbstractUserManager extends AbstractLogEnabled
           implements Block, UserManager, Contextualizable, Composable, Configurable, Initializable
{
  @@ -66,6 +66,6 @@
       public void initialize() throws Exception {}
   
       protected RuntimeException processException(Exception e) {
  -        return new RuntimeException("Some low-level problem during operation", e);
  +        return new InternalUserManagerException("Some low-level problem during operation",
e);
       }
   }
  
  
  
  1.1                  jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/InternalUserManagerException.java
  
  Index: InternalUserManagerException.java
  ===================================================================
  
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE file.
   */
  package org.apache.avalon.ftpserver.blocks.usermanager;
  
  
  
  /**
   * Class InternalUserManagerException because the constructor with throwable is not in JDK1.3
   *
   *
   * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
   * @version $Revision: 1.1 $
   */
  public class InternalUserManagerException extends RuntimeException {
  
      private Throwable mCause;
  
      /**
       * Constructor InternalUserManagerException
       *
       *
       * @param msg
       * @param cause
       *
       */
      public InternalUserManagerException(String msg, Throwable cause) {
  
          super(msg);
  
          mCause = cause;
      }
  
      /**
       * Method getCause
       *
       *
       * @return
       *
       */
      public Throwable getCause() {
          return mCause;
      }
  }
  
  
  
  1.2       +2 -1      jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/db/DbUserManager.java
  
  Index: DbUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/db/DbUserManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DbUserManager.java	2001/12/14 01:22:03	1.1
  +++ DbUserManager.java	2001/12/17 09:38:24	1.2
  @@ -25,6 +25,7 @@
   import org.apache.avalon.ftpserver.FtpUser;
   import org.apache.avalon.ftpserver.blocks.config.DefaultConfig;
   import org.apache.avalon.ftpserver.blocks.usermanager.AbstractUserManager;
  +import org.apache.avalon.ftpserver.blocks.usermanager.InternalUserManagerException;
   import org.apache.avalon.ftpserver.services.UserManager;
   
   
  @@ -334,6 +335,6 @@
       }
   
       private RuntimeException processSQLException(SQLException sqle) {
  -        return new RuntimeException("Some low-level problem during SQL operation", sqle);
  +        return new InternalUserManagerException("Some low-level problem during SQL operation",
sqle);
       }
   }
  
  
  
  1.2       +2 -1      jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/ldap/LdapUserManager.java
  
  Index: LdapUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/ftpserver/src/java/org/apache/avalon/ftpserver/blocks/usermanager/ldap/LdapUserManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LdapUserManager.java	2001/12/14 01:22:03	1.1
  +++ LdapUserManager.java	2001/12/17 09:38:24	1.2
  @@ -22,6 +22,7 @@
   import org.apache.avalon.ftpserver.FtpUser;
   import org.apache.avalon.ftpserver.blocks.config.DefaultConfig;
   import org.apache.avalon.ftpserver.blocks.usermanager.AbstractUserManager;
  +import org.apache.avalon.ftpserver.blocks.usermanager.InternalUserManagerException;
   import org.apache.avalon.ftpserver.services.UserManager;
   import org.apache.avalon.framework.configuration.Configuration;
   
  @@ -394,7 +395,7 @@
       }
   
       private RuntimeException processNamingException(NamingException ne) {
  -        return new RuntimeException("Some low-level problem during naming operation", ne);
  +        return new InternalUserManagerException("Some low-level problem during naming operation",
ne);
       }
   
       // static block
  
  
  

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


Mime
View raw message