Author: markt
Date: Sun Jul 22 22:18:57 2012
New Revision: 1364449
URL: http://svn.apache.org/viewvc?rev=1364449&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/util/MD5Encoder.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1364449&r1=1364448&r2=1364449&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Sun Jul 22 22:18:57 2012
@@ -57,15 +57,6 @@ public class DigestAuthenticator extends
// -------------------------------------------------------------- Constants
/**
- * The MD5 helper object for this class.
- *
- * @deprecated Unused - will be removed in Tomcat 8.0.x
- */
- @Deprecated
- protected static final MD5Encoder md5Encoder = new MD5Encoder();
-
-
- /**
* Tomcat's DIGEST implementation only supports auth quality of protection.
*/
protected static final String QOP = "auth";
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=1364449&r1=1364448&r2=1364449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Sun Jul 22
22:18:57 2012
@@ -108,15 +108,6 @@ public abstract class RealmBase extends
/**
- * The MD5 helper object for this class.
- *
- * @deprecated Unused - will be removed in Tomcat 8.0.x
- */
- @Deprecated
- protected static final MD5Encoder md5Encoder = new MD5Encoder();
-
-
- /**
* MD5 message digest provider.
*/
protected static volatile MessageDigest md5Helper;
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1364449&r1=1364448&r2=1364449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Sun Jul
22 22:18:57 2012
@@ -210,15 +210,6 @@ public class WebdavServlet
protected static MessageDigest md5Helper;
- /**
- * The MD5 helper object for this class.
- *
- * @deprecated Unused - will be removed in Tomcat 8.0.x
- */
- @Deprecated
- protected static final MD5Encoder md5Encoder = new MD5Encoder();
-
-
// ----------------------------------------------------- Instance Variables
/**
Modified: tomcat/trunk/java/org/apache/catalina/util/MD5Encoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/MD5Encoder.java?rev=1364449&r1=1364448&r2=1364449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/MD5Encoder.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/MD5Encoder.java Sun Jul 22
22:18:57 2012
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.util;
-
/**
* Encode an MD5 digest into a String.
* <p>
@@ -29,36 +26,26 @@ package org.apache.catalina.util;
* @author Remy Maucherat
* @version $Id$
*/
-
public final class MD5Encoder {
- /**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
- @Deprecated
- public MD5Encoder() {
- // NOOP
+ private MD5Encoder() {
+ // Hide default constructor for utility class
}
- // ----------------------------------------------------- Instance Variables
-
- private static final char[] hexadecimal =
- {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- 'a', 'b', 'c', 'd', 'e', 'f'};
-
-
- // --------------------------------------------------------- Public Methods
+ private static final char[] hexadecimal = {'0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
/**
* Encodes the 128 bit (16 bytes) MD5 into a 32 character String.
*
* @param binaryData Array containing the digest
+ *
* @return Encoded MD5, or null if encoding failed
*/
- public static String encode( byte[] binaryData ) {
+ public static String encode(byte[] binaryData) {
if (binaryData.length != 16)
return null;
@@ -73,9 +60,6 @@ public final class MD5Encoder {
}
return new String(buffer);
-
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
