You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/24 21:54:22 UTC
svn commit: r1038810 - in /tomcat/trunk:
java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/
java/org/apache/catalina/core/ java/org/apache/catalina/ha/session/
java/org/apache/catalina/ha/tcp/ java/org/apache/catalina/loader/ j...
Author: markt
Date: Wed Nov 24 20:54:21 2010
New Revision: 1038810
URL: http://svn.apache.org/viewvc?rev=1038810&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50106
Correct several MBean descriptors.
Patch provided by Eiji Takahashi.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -42,7 +42,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -71,7 +72,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
<mbean name="FormAuthenticator"
@@ -99,7 +101,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
<mbean name="NonLoginAuthenticator"
@@ -127,7 +130,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -152,7 +156,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -181,7 +186,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
</mbeans-descriptors>
Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -44,10 +44,6 @@
description="Allow disabling TRACE method"
type="boolean"/>
- <attribute name="bufferSize"
- description="The input buffer size we should create on input streams"
- type="int"/>
-
<attribute name="className"
description="Fully qualified class name of the managed object"
type="java.lang.String"
@@ -103,6 +99,10 @@
type="int"/>
<!-- Common -->
+ <attribute name="packetSize"
+ description="The ajp packet size."
+ type="int"/>
+
<attribute name="port"
description="The port number on which we listen for ajp13 requests"
type="int"/>
@@ -152,7 +152,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<!-- Common -->
<attribute name="tcpNoDelay"
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -172,7 +172,7 @@
<attribute name="distributable"
description="The distributable flag for this web application."
- type="java.lang.String"/>
+ type="boolean"/>
<attribute name="docBase"
description="The document root for this web application"
@@ -328,7 +328,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="staticResources"
description="Static resources associated with the context."
@@ -967,7 +968,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
<mbean name="StandardEngine"
@@ -1011,7 +1013,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<operation name="addChild"
description="Add a virtual host"
@@ -1112,7 +1115,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
<mbean name="StandardHost"
@@ -1192,7 +1196,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="unpackWARs"
description="Unpack WARs property"
@@ -1337,7 +1342,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
<mbean name="StandardServer"
@@ -1374,7 +1380,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<operation name="await"
description="Wait for the shutdown message"
@@ -1413,7 +1420,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<operation name="addConnector"
description="Add a new connector"
@@ -1544,7 +1552,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="threadPriority"
description="The thread priority for threads in this thread pool"
@@ -1608,7 +1617,7 @@
<attribute name="maxInstances"
description="Maximum number of STM instances."
- type="long" />
+ type="int" />
<attribute name="minTime"
description="Minimum processing time of a request"
@@ -1652,7 +1661,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="statisticsProvider"
description="Performance statistics support for this managed object"
@@ -1817,7 +1827,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
</mbeans-descriptors>
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -52,7 +52,8 @@
type="java.lang.String"/>
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<operation
name="start"
description="Stops the Cluster JvmRouteBinderValve"
@@ -292,7 +293,8 @@
writeable="false"/>
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute
name="stateTransfered"
is="true"
@@ -519,7 +521,8 @@
type="int"/>
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute
name="randomFile"
description="File source of random - /dev/urandom or a pipe"
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -57,7 +57,8 @@
<attribute
name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<operation
name="setProperty"
description="set a property to all cluster managers (with prefix 'manager.')"
@@ -154,7 +155,8 @@
<attribute
name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute
name="totalSendTime"
description="total replicated send time"
Modified: tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -51,7 +51,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="loaderRepositories"
description="Repositories set in the real loader"
@@ -105,7 +106,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="loaderRepositories"
description="Repositories set in the real loader"
@@ -155,7 +157,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="URLs"
description="The URLs of this loader"
Modified: tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -59,7 +59,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="userCredCol"
description="The column in the user table that holds the user's credentials"
@@ -126,7 +127,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="userClassNames"
description="Comma-delimited list of javax.security.Principal classes that represent individual users"
@@ -197,7 +199,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="userCredCol"
description="The column in the user table that holds the user's credentials"
@@ -319,7 +322,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="userBase"
description="The base element for user searches"
@@ -389,7 +393,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="validate"
description="The 'validate certificate chains' flag."
@@ -435,7 +440,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="validate"
description="The 'validate certificate chains' flag."
@@ -482,7 +488,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="validate"
description="The 'validate certificate chains' flag."
Modified: tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -339,7 +339,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="randomFile"
description="File source of random - /dev/urandom or a pipe"
Modified: tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -85,7 +85,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="suffix"
description="The suffix that is added to log file filenames"
@@ -125,7 +126,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -249,7 +251,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -284,7 +287,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -319,7 +323,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
</mbean>
@@ -376,7 +381,8 @@
<attribute name="stateName"
description="The name of the LifecycleState that this component is currently in"
- type="java.lang.String"/>
+ type="java.lang.String"
+ writeable="false"/>
<attribute name="trustedProxies"
description="Comma delimited list of trusted proxies"
Modified: tomcat/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010
@@ -25,7 +25,8 @@
<attribute name="jspCount"
description="The number of JSPs that have been loaded into a webapp"
- type="int"/>
+ type="int"
+ writeable="false"/>
<attribute name="jspReloadCount"
description="The number of JSPs that have been reloaded"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038810&r1=1038809&r2=1038810&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 20:54:21 2010
@@ -54,6 +54,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>50106</bug>: Correct several MBean descriptors. Patch provided by
+ Eiji Takahashi. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org