Author: markt
Date: Thu Sep 25 19:33:49 2014
New Revision: 1627615
URL: http://svn.apache.org/r1627615
Log:
Update docs
Modified:
tomcat/trunk/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
tomcat/trunk/webapps/docs/config/project.xml
tomcat/trunk/webapps/docs/config/realm.xml
Modified:
tomcat/trunk/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java?rev=1627615&r1=1627614&r2=1627615&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
Thu Sep 25 19:33:49 2014
@@ -45,7 +45,6 @@ import org.apache.tomcat.util.security.C
* iteration code and a hex encoded credential, each separated by $</li>
* </ul>
*
- * Prefixes of {MD5} and {SHA}
* <p>
* If the stored password form does not included an iteration count then an
* iteration count of 1 is used.
Modified: tomcat/trunk/webapps/docs/config/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/project.xml?rev=1627615&r1=1627614&r2=1627615&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/project.xml (original)
+++ tomcat/trunk/webapps/docs/config/project.xml Thu Sep 25 19:33:49 2014
@@ -56,6 +56,7 @@
</menu>
<menu name="Nested Components">
+ <item name="CredentialHandler" href="credentialhandler.html"/>
<item name="Global Resources" href="globalresources.html"/>
<item name="JarScanner" href="jar-scanner.html"/>
<item name="JarScanFilter" href="jar-scan-filter.html"/>
Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1627615&r1=1627614&r2=1627615&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Thu Sep 25 19:33:49 2014
@@ -143,11 +143,15 @@
<p>The name of the <code>MessageDigest</code> algorithm used
to encode user passwords stored in the database. If not specified,
user passwords are assumed to be stored in clear-text.</p>
+ <p>This attribute is deprecated. Set the algorithm on a nested
+ <strong>CredentialHandler</strong> element instead.</p>
</attribute>
<attribute name="digestEncoding" required="false">
<p>The charset for encoding digests. If not specified, the platform
default will be used.</p>
+ <p>This attribute is deprecated. Set the encoding on a nested
+ <strong>CredentialHandler</strong> element instead.</p>
</attribute>
<attribute name="driverName" required="true">
@@ -265,6 +269,8 @@
<p>The name of the <code>MessageDigest</code> algorithm used
to encode user passwords stored in the database. If not specified,
user passwords are assumed to be stored in clear-text.</p>
+ <p>This attribute is deprecated. Set the algorithm on a nested
+ <strong>CredentialHandler</strong> element instead.</p>
</attribute>
<attribute name="localDataSource" required="false">
@@ -458,6 +464,8 @@
by the <code>java.security.MessageDigest</code> class. If not
specified the plaintext password is assumed to be retrieved. Not
required unless <code>userPassword</code> is specified</p>
+ <p>This attribute is deprecated. Set the algorithm on a nested
+ <strong>CredentialHandler</strong> element instead.</p>
</attribute>
<attribute name="protocol" required="false">
@@ -763,6 +771,8 @@
formats. Valid values are those accepted for the algorithm name by the
<code>java.security.MessageDigest</code> class. If not specified,
passwords are stored in clear text.</p>
+ <p>This attribute is deprecated. Set the algorithm on a nested
+ <strong>CredentialHandler</strong> element instead.</p>
</attribute>
<attribute name="pathname" required="false">
@@ -1031,15 +1041,18 @@
<section name="Nested Components">
- <h3>CombinedRealm Implementation</h3>
-
- <p>If you are using the <em>CombinedRealm Implementation</em> or a Realm
- that extends the CombinedRealm, e.g. the LockOutRealm,
- <strong><Realm></strong> elements may be nested inside it.</p>
-
- <h3>Other Realm Implementations</h3>
-
- <p>No other Realm implementation supports nested components.</p>
+ <p>You can nest at most one instance of the following components by nesting a
+ corresponding element inside your <strong>Realm</strong> element:</p>
+ <ul>
+ <li><strong>CombinedRealm Implementation</strong> - If you are using the
+ <em>CombinedRealm Implementation</em> or a Realm
+ that extends the CombinedRealm, e.g. the LockOutRealm, one or more
+ <strong><Realm></strong> elements may be nested inside it.</li>
+ <li><a href="crdentialhandler.html"><strong>CredentialHandler</strong></a> -
+ Configure the credential handler that will be used to validate provided
+ credentials with those stored by the Realm. If not specified a default
+ <em>MessageDigestCredentialHandler</em> will configured.</li>
+ </ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
