Author: markt
Date: Sun Jul 15 19:38:51 2012
New Revision: 1361770
URL: http://svn.apache.org/viewvc?rev=1361770&view=rev
Log:
Deprecate unused code
Remove deprecation markers from JAASReam#setAppName
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1361769
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
Sun Jul 15 19:38:51 2012
@@ -48,7 +48,10 @@ public class GenericPrincipal implements
*
* @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);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Sun Jul
15 19:38:51 2012
@@ -178,9 +178,7 @@ public class JAASRealm
/**
* setter for the <code>appName</code> member variable
- * @deprecated JAAS should use the <code>Engine</code> (domain) name and
webpp/host overrides
*/
- @Deprecated
public void setAppName(String name) {
appName = name;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Jul
15 19:38:51 2012
@@ -728,7 +728,10 @@ 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
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1361770&r1=1361769&r2=1361770&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sun
Jul 15 19:38:51 2012
@@ -266,7 +266,10 @@ 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
