Author: markt
Date: Tue Dec 5 19:23:20 2017
New Revision: 1817223
URL: http://svn.apache.org/viewvc?rev=1817223&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61223
Add the mbeans-descriptors.dtd file to the custom MBean documentation so users
have a reference to use when constructing mbeans-descriptiors.xml files for
custom components.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/mbeans-descriptors-howto.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1817223&r1=1817222&r2=1817223&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Dec 5 19:23:20 2017
@@ -896,6 +896,8 @@
<copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt"
file="RELEASE-NOTES" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
</copy>
+ <copy tofile="${tomcat.build}/webapps/docs/mbeans-descriptors.dtd"
+ file="java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd"
/>
<copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml"
file="webapps/docs/appdev/build.xml.txt"/>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1817223&r1=1817222&r2=1817223&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Dec 5 19:23:20 2017
@@ -69,6 +69,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <add>
+ <bug>61223</bug>: Add the mbeans-descriptors.dtd file to the custom
+ MBean documentation so users have a reference to use when constructing
+ mbeans-descriptiors.xml files for custom components. (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
Modified: tomcat/trunk/webapps/docs/mbeans-descriptors-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/mbeans-descriptors-howto.xml?rev=1817223&r1=1817222&r2=1817223&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/mbeans-descriptors-howto.xml (original)
+++ tomcat/trunk/webapps/docs/mbeans-descriptors-howto.xml Tue Dec 5 19:23:20
2017
@@ -52,6 +52,11 @@ in order to avoid a "ManagedBean is not
a mbeans-descriptors.xml file, located in the same package as the class files
it describes.</p>
+<p>The permitted syntax for the mbeans-descriptors.xml is defined by
+the <a href="mbeans-descriptors.dtd">DTD</a> file.</p>
+
+<p>The entries for a custom LDAP authentication Realm may look like this:</p>
+
<source><