From a522c33536ec9b6d9b85d30b869af8e4eeb888d1 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 27 Jul 2011 09:13:36 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51561
 Recommend the use of digest.[bat|sh] to generate digests rather than calling
 RealmBase directly.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1151395 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml   |  5 +++++
 webapps/docs/realm-howto.xml | 17 ++---------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 466dd08d3..649383699 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,6 +158,11 @@
         the implications of setting the path attribute on a Context element in
         server.xml. (markt)
       </update>
+      <fix>
+        <bug>51561</bug>: Update the Realm page within the documentation web
+        application to recommend the use of digest.[bat|sh] to generate digests
+        rather than calling RealmBase directly. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index 760c5d710..fc1c276ed 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -196,9 +196,7 @@ techniques are supported:</p>
     method will return the digested password.</li>
 <li>If you want to execute a command line utility to calculate the digested
     password, simply execute
-<source>
-java org.apache.catalina.realm.RealmBase \
-    -a {algorithm} {cleartext-password}
+<source>CATALINA_HOME/bin/digest.[bat|sh] -a {algorithm} {cleartext-password}
 </source>
     and the digested version of this cleartext password will be returned to
     standard output.</li>
@@ -215,19 +213,8 @@ java org.apache.catalina.realm.RealmBase \
    not specified in web.xml, the default value of <code>Authentication
    required</code> is used.</p>
 
-<p>To use either of the above techniques, the following jar files will need
-to be on your class path to make the <code>RealmBase</code> class available:
-</p>
-
-<ul>
-  <li>$CATALINA_HOME/bin/tomcat-juli.jar</li>
-  <li>$CATALINA_HOME/lib/catalina.jar</li>
-  <li>$CATALINA_HOME/lib/tomcat-util.jar</li>
-</ul>
-
 <p>Non-ASCII usernames and/or passwords are supported using
-<source>java org.apache.catalina.realm.RealmBase \
-    -a {algorithm} -e {encoding} {input}
+<source>CATALINA_HOME/bin/digest.[bat|sh] -a {algorithm} -e {encoding} {input}
 </source>
 but care is required to ensure that the non-ASCII input is
 correctly passed to the digester.
-- 
2.11.0