Author: markt Date: Mon Sep 14 11:53:58 2015 New Revision: 1702914 URL: http://svn.apache.org/r1702914 Log: Remove more deprecated code
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1702914&r1=1702913&r2=1702914&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Mon Sep 14 11:53:58 2015 @@ -100,26 +100,6 @@ public abstract class RealmBase extends protected Log containerLog = null; - /** - * Digest algorithm used in storing passwords in a non-plaintext format. - * Valid values are those accepted for the algorithm name by the - * MessageDigest class, or <code>null</code> if no digesting should - * be performed. - * - * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards. - */ - @Deprecated - protected String digest = null; - - /** - * The encoding charset for the digest. - * - * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards. - */ - @Deprecated - protected String digestEncoding = null; - - private CredentialHandler credentialHandler; @@ -242,34 +222,6 @@ public abstract class RealmBase extends /** - * Set the digest algorithm used for storing credentials. - * - * @param digest The new digest algorithm - * - * @deprecated This will be removed in Tomcat 9.0.x as it has been replaced - * by the CredentialHandler - */ - @Deprecated - public void setDigest(String digest) { - CredentialHandler ch = credentialHandler; - if (ch == null) { - ch = new MessageDigestCredentialHandler(); - credentialHandler = ch; - } - if (ch instanceof MessageDigestCredentialHandler) { - try { - ((MessageDigestCredentialHandler) ch).setAlgorithm(digest); - } catch (NoSuchAlgorithmException e) { - throw new IllegalArgumentException(e); - } - } else { - log.warn(sm.getString("realmBase.credentialHandler.customCredentialHandler", - "digest", digest)); - } - this.digest = digest; - } - - /** * Returns the digest encoding charset. * * @return The charset (may be null) for platform default @@ -286,30 +238,6 @@ public abstract class RealmBase extends return null; } - /** - * Sets the digest encoding charset. - * - * @param charset The charset (null for platform default) - * - * @deprecated This will be removed in Tomcat 9.0.x as it has been replaced - * by the CredentialHandler - */ - @Deprecated - public void setDigestEncoding(String charset) { - CredentialHandler ch = credentialHandler; - if (ch == null) { - ch = new MessageDigestCredentialHandler(); - credentialHandler = ch; - } - if (ch instanceof MessageDigestCredentialHandler) { - ((MessageDigestCredentialHandler) ch).setEncoding(charset); - } else { - log.warn(sm.getString("realmBase.credentialHandler.customCredentialHandler", - "digestEncoding", charset)); - } - this.digestEncoding = charset; - } - /** * @deprecated This will be removed in Tomcat 9.0.x as it has been replaced --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org