tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1361771 - in /tomcat/trunk/java/org/apache/catalina/realm: GenericPrincipal.java JDBCRealm.java MemoryRealm.java
Date Sun, 15 Jul 2012 19:40:19 GMT
Author: markt
Date: Sun Jul 15 19:40:18 2012
New Revision: 1361771

URL: http://svn.apache.org/viewvc?rev=1361771&view=rev
Log:
Remove deprecated code

Modified:
    tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
    tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
    tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1361771&r1=1361770&r2=1361771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Sun Jul 15 19:40:18
2012
@@ -42,24 +42,6 @@ public class GenericPrincipal implements
 
     // ----------------------------------------------------------- Constructors
 
-
-    /**
-     * Construct a new Principal, associated with the specified Realm, for the
-     * specified username and password.
-     *
-     * @param name The username of the user represented by this Principal
-     * @param password Credentials used to authenticate this user
-     *
-     * @deprecated  Unused
-     */
-    @Deprecated
-    public GenericPrincipal(String name, String password) {
-
-        this(name, password, null);
-
-    }
-
-
     /**
      * Construct a new Principal, associated with the specified Realm, for the
      * specified username and password, with the specified role names

Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1361771&r1=1361770&r2=1361771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Jul 15 19:40:18 2012
@@ -706,21 +706,6 @@ public class JDBCRealm
 
 
     /**
-     * Release our use of this connection so that it can be recycled.
-     *
-     * @param dbConnection The connection to be released
-     *
-     * @deprecated  Unused
-     */
-    @Deprecated
-    protected void release(Connection dbConnection) {
-
-        // NO-OP since we are not pooling anything
-
-    }
-
-
-    /**
      * Return a PreparedStatement configured to perform the SELECT required
      * to retrieve user roles for the specified username.
      *

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1361771&r1=1361770&r2=1361771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sun Jul 15 19:40:18 2012
@@ -235,22 +235,9 @@ public class MemoryRealm  extends RealmB
 
     }
 
-    /**
-     * Returns the principals for this realm.
-     *
-     * @return The principals, keyed by user name (a String)
-     *
-     * @deprecated  Unused
-     */
-    @Deprecated
-    protected Map<String,GenericPrincipal> getPrincipals() {
-        return principals;
-    }
-
 
     // ------------------------------------------------------ Lifecycle Methods
 
-
     /**
      * Prepare for the beginning of active use of the public methods of this
      * component and implement the requirements of



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


Mime
View raw message