You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/11 13:59:59 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap LDAPUserManager.java

henning     2003/04/11 04:59:59

  Modified:    src/java/org/apache/turbine/services/security
                        SecurityService.java BaseSecurityService.java
               src/java/org/apache/turbine/services/security/passive
                        PassiveUserManager.java
               src/java/org/apache/turbine/services/security/db
                        DBUserManager.java
               src/java/org/apache/turbine/services/security/ldap
                        LDAPUserManager.java
  Log:
  Deprecation of
  
  User [] getUsers(Criteria crit) in SecurityService / BaseSecurityService
  User [] retrieveList(Criteria crit)   in the various User Managers
  
  as discussed
  
  Revision  Changes    Path
  1.20      +2 -1      jakarta-turbine-2/src/java/org/apache/turbine/services/security/SecurityService.java
  
  Index: SecurityService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/SecurityService.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SecurityService.java	8 Apr 2003 13:32:16 -0000	1.19
  +++ SecurityService.java	11 Apr 2003 11:59:59 -0000	1.20
  @@ -459,6 +459,7 @@
        * @return a List of users meeting the criteria.
        * @throws DataBackendException if there is a problem accessing the
        *         storage.
  +     * @deprecated Use <a href="#retrieveList">retrieveList</a> instead.
        */
       User[] getUsers(Criteria criteria)
               throws DataBackendException;
  
  
  
  1.29      +2 -1      jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java
  
  Index: BaseSecurityService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- BaseSecurityService.java	8 Apr 2003 13:32:16 -0000	1.28
  +++ BaseSecurityService.java	11 Apr 2003 11:59:59 -0000	1.29
  @@ -757,6 +757,7 @@
        * @return a List of users meeting the criteria.
        * @throws DataBackendException if there is a problem accessing the
        *         storage.
  +     * @deprecated Use <a href="#getUserList">getUserList</a> instead.
        */
       public User[] getUsers(Criteria criteria)
               throws DataBackendException
  
  
  
  1.10      +2 -1      jakarta-turbine-2/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
  
  Index: PassiveUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PassiveUserManager.java	8 Apr 2003 12:11:16 -0000	1.9
  +++ PassiveUserManager.java	11 Apr 2003 11:59:59 -0000	1.10
  @@ -150,6 +150,7 @@
        * @return a List of users meeting the criteria.
        * @throws DataBackendException if there is a problem accessing the
        *         storage.
  +     * @deprecated Use <a href="#retrieveList">retrieveList</a> instead.
        */
       public User[] retrieve(Criteria criteria)
               throws DataBackendException
  
  
  
  1.16      +3 -2      jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBUserManager.java
  
  Index: DBUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBUserManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DBUserManager.java	10 Apr 2003 16:41:36 -0000	1.15
  +++ DBUserManager.java	11 Apr 2003 11:59:59 -0000	1.16
  @@ -262,11 +262,12 @@
        * @return a List of users meeting the criteria.
        * @throws DataBackendException if there is a problem accessing the
        *         storage.
  +     * @deprecated Use <a href="#retrieveList">retrieveList</a> instead.
        */
       public User[] retrieve(Criteria criteria)
               throws DataBackendException
       {
  -        return (User [])retrieveList(criteria).toArray(new User[0]);
  +        return (User []) retrieveList(criteria).toArray(new User[0]);
       }
   
       /**
  
  
  
  1.14      +3 -2      jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUserManager.java
  
  Index: LDAPUserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUserManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LDAPUserManager.java	10 Apr 2003 16:41:37 -0000	1.13
  +++ LDAPUserManager.java	11 Apr 2003 11:59:59 -0000	1.14
  @@ -222,11 +222,12 @@
        * @param criteria The criteria of selection.
        * @return a List of users meeting the criteria.
        * @throws DataBackendException Error accessing the data backend.
  +     * @deprecated Use <a href="#retrieveList">retrieveList</a> instead.
        */
       public User[] retrieve(Criteria criteria)
               throws DataBackendException
       {
  -        return (User [])retrieveList(criteria).toArray(new User[0]);
  +        return (User []) retrieveList(criteria).toArray(new User[0]);
       }
   
       /**
  
  
  

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