This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push: new 125f6ac4b4 Removed attributes also need to be removed from MBeans. 125f6ac4b4 is described below commit 125f6ac4b4ecd0f260b4ec7d614e54b9dd5a854c Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri May 3 15:04:27 2024 +0100 Removed attributes also need to be removed from MBeans. Based on PR #719 provided by Shawn Q. --- .../apache/tomcat/util/net/mbeans-descriptors.xml | 23 ---------------------- webapps/docs/changelog.xml | 4 ++++ webapps/docs/config/ajp.xml | 8 -------- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml index 38713f8922..d5e52527db 100644 --- a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml +++ b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml @@ -29,17 +29,9 @@ <attribute name="acceptCount" type="int"/> - <attribute name="acceptorThreadCount" - type="int"/> - <attribute name="acceptorThreadPriority" type="int"/> - <attribute name="alpnSupported" - type="boolean" - writeable="false" - is="true"/> - <attribute name="bindOnInit" type="boolean"/> @@ -112,9 +104,6 @@ writeable="false" is="true"/> - <attribute name="pollerThreadCount" - type="int"/> - <attribute name="pollerThreadPriority" type="int"/> @@ -259,17 +248,9 @@ <attribute name="acceptCount" type="int"/> - <attribute name="acceptorThreadCount" - type="int"/> - <attribute name="acceptorThreadPriority" type="int"/> - <attribute name="alpnSupported" - type="boolean" - writeable="false" - is="true"/> - <attribute name="bindOnInit" type="boolean"/> @@ -297,10 +278,6 @@ <attribute name="defaultSSLHostConfigName" type="java.lang.String"/> - <attribute name="deferAccept" - type="boolean" - writeable="false"/> - <attribute name="domain" type="java.lang.String"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index deaadfd97e..146b88150e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -136,6 +136,10 @@ <fix> Extend <code>Asn1Parser</code> to parse <code>UTF8String</code>s. (michaelo) </fix> + <fix> + Remove MBean metadata for attibutes that have been removed. Based on + <pr>719</pr> by Shawn Q. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml index aff9f44a6a..ee56883fc5 100644 --- a/webapps/docs/config/ajp.xml +++ b/webapps/docs/config/ajp.xml @@ -323,14 +323,6 @@ value is 100.</p> </attribute> - <attribute name="acceptorThreadCount" required="false"> - <p>The number of threads to be used to accept connections. Increase this - value on a multi CPU machine, although you would never really need more - than <code>2</code>. Also, with a lot of non keep alive connections, you - might want to increase this value as well. Default value is - <code>1</code>.</p> - </attribute> - <attribute name="acceptorThreadPriority" required="false"> <p>The priority of the acceptor threads. The threads used to accept new connections. The default value is <code>5</code> (the value of the --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org