From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 21 Mar 2011 17:26:48 +0000 (+0000)
Subject: Remove unused code
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9a0d44800db214809c6517cdcf4c8772c421064a;p=tomcat7.0

Remove unused code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1083875 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index e40587f5d..cf42e29cf 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -86,13 +86,6 @@ public abstract class AuthenticatorBase extends ValveBase
 
 
     /**
-     * The default message digest algorithm to use if we cannot use
-     * the requested one.
-     */
-    protected static final String DEFAULT_ALGORITHM = "MD5";
-
-
-    /**
      * Authentication header
      */
     protected static final String AUTH_HEADER_NAME = "WWW-Authenticate";
@@ -103,14 +96,6 @@ public abstract class AuthenticatorBase extends ValveBase
     protected static final String REALM_NAME = "Authentication required";
 
     /**
-     * The message digest algorithm to be used when generating session
-     * identifiers.  This must be an algorithm supported by the
-     * <code>java.security.MessageDigest</code> class on your platform.
-     */
-    protected String algorithm = DEFAULT_ALGORITHM;
-
-
-    /**
      * Should a session always be used once a user is authenticated? This may
      * offer some performance benefits since the session can then be used to
      * cache the authenticated Principal, hence removing the need to
@@ -218,28 +203,6 @@ public abstract class AuthenticatorBase extends ValveBase
 
 
     /**
-     * Return the message digest algorithm for this Manager.
-     */
-    public String getAlgorithm() {
-
-        return (this.algorithm);
-
-    }
-
-
-    /**
-     * Set the message digest algorithm for this Manager.
-     *
-     * @param algorithm The new message digest algorithm
-     */
-    public void setAlgorithm(String algorithm) {
-
-        this.algorithm = algorithm;
-
-    }
-
-
-    /**
      * Return the cache authenticated Principals flag.
      */
     public boolean getCache() {
diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index 5a5c38094..0b4fd9d69 100644
--- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
@@ -23,10 +23,6 @@
          group="Valve"
          type="org.apache.catalina.authenticator.BasicAuthenticator">
     
-    <attribute name="algorithm"
-               description="The message digest algorithm to be used when generating session identifiers"
-               type="java.lang.String"/>
-      
     <attribute name="cache"
                description="Should we cache authenticated Principals if the request is part of an HTTP session?"
                type="boolean"/>
@@ -61,10 +57,6 @@
          group="Valve"
          type="org.apache.catalina.authenticator.DigestAuthenticator">
     
-    <attribute name="algorithm"
-               description="The message digest algorithm to be used when generating session identifiers"
-               type="java.lang.String"/>
-      
     <attribute name="cache"
                description="Should we cache authenticated Principals if the request is part of an HTTP session?"
                type="boolean"/>
@@ -98,10 +90,6 @@
          group="Valve"
          type="org.apache.catalina.authenticator.FormAuthenticator">
     
-    <attribute name="algorithm"
-               description="The message digest algorithm to be used when generating session identifiers"
-               type="java.lang.String"/>
-      
     <attribute name="cache"
                description="Should we cache authenticated Principals if the request is part of an HTTP session?"
                type="boolean"/>
@@ -135,10 +123,6 @@
          group="Valve"
          type="org.apache.catalina.authenticator.NonLoginAuthenticator">
     
-    <attribute name="algorithm"
-               description="The message digest algorithm to be used when generating session identifiers"
-               type="java.lang.String"/>
-      
     <attribute name="cache"
                description="Should we cache authenticated Principals if the request is part of an HTTP session?"
                type="boolean"/>
@@ -187,10 +171,6 @@
          group="Valve"
          type="org.apache.catalina.authenticator.SSLAuthenticator">
 
-    <attribute name="algorithm"
-               description="The message digest algorithm to be used when generating session identifiers"
-               type="java.lang.String"/>
-      
     <attribute name="cache"
                description="Should we cache authenticated Principals if the request is part of an HTTP session?"
                type="boolean"/>