Author: markt
Date: Thu Jan 9 10:45:31 2014
New Revision: 1556784
URL: http://svn.apache.org/r1556784
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55888
Clarify that Container elements may only no more than one Realm.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1556783
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1556784&r1=1556783&r2=1556784&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 9 10:45:31 2014
@@ -61,7 +61,7 @@
<fix>
Avoid possible NPE if a content type is specified without a character
set. (markt)
- </fix>
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -96,6 +96,10 @@
Clarify the behaviour of the maxConnections attribute for a connector
in
the documentation web application. (markt)
</fix>
+ <fix>
+ <bug>55888</bug>: Update the documentation web application to make it
+ clearer that a Container may define no more than one Realm. (markt)
+ </fix>
</changelog>
</subsection>
</section>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml?rev=1556784&r1=1556783&r2=1556784&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Thu Jan 9 10:45:31 2014
@@ -43,11 +43,14 @@
<em>Container Managed Security</em> as described in the Servlet
Specification.</p>
- <p>You may nest a Realm inside any Catalina container
- <a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
- <a href="context.html">Context</a>). In addition, Realms associated with
- an Engine or a Host are automatically inherited by lower-level
- containers, unless explicitly overridden.</p>
+ <p>A Catalina container (<a href="engine.html">Engine</a>,
+ <a href="host.html">Host</a>, or <a href="context.html">Context</a>) may
+ contain no more than one Realm element (although if supported by the Realm
+ this one Realm may itself contain multiple nested Realms). In addition, the
+ Realm associated with an Engine or a Host is automatically inherited by
+ lower-level containers unless the lower level container explicitly defines
its
+ own Realm.
+ </p>
<p>For more in-depth information about container managed security in web
applications, as well as more information on configuring and using the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
