From 4e5b72b7f19d75da8cdd5fe49d85ec37bb63c44f Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Nov 2010 20:54:21 +0000
Subject: [PATCH] https://issues.apache.org/bugzilla/show_bug.cgi?id=50106
 Correct several MBean descriptors. Patch provided by Eiji Takahashi.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1038810 13f79535-47bb-0310-9956-ffa450edef68
---
 .../catalina/authenticator/mbeans-descriptors.xml  | 18 +++++++----
 .../catalina/connector/mbeans-descriptors.xml      | 11 ++++---
 .../apache/catalina/core/mbeans-descriptors.xml    | 37 ++++++++++++++--------
 .../catalina/ha/session/mbeans-descriptors.xml     |  9 ++++--
 .../apache/catalina/ha/tcp/mbeans-descriptors.xml  |  6 ++--
 .../apache/catalina/loader/mbeans-descriptors.xml  |  9 ++++--
 .../apache/catalina/realm/mbeans-descriptors.xml   | 21 ++++++++----
 .../apache/catalina/session/mbeans-descriptors.xml |  3 +-
 .../apache/catalina/valves/mbeans-descriptors.xml  | 18 +++++++----
 .../apache/jasper/servlet/mbeans-descriptors.xml   |  3 +-
 webapps/docs/changelog.xml                         |  8 +++++
 11 files changed, 96 insertions(+), 47 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index ef2a9c539..ff3e1ab73 100644
--- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
@@ -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>
diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index 738d5460f..b37d32e29 100644
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -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"
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml
index 240defe34..510b5c684 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -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>
diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index 68c3816eb..d0d1743f4 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -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"
diff --git a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
index 7bea2224b..fe6a12ee9 100644
--- a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
@@ -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"
diff --git a/java/org/apache/catalina/loader/mbeans-descriptors.xml b/java/org/apache/catalina/loader/mbeans-descriptors.xml
index 65bbee411..818488275 100644
--- a/java/org/apache/catalina/loader/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/loader/mbeans-descriptors.xml
@@ -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"
diff --git a/java/org/apache/catalina/realm/mbeans-descriptors.xml b/java/org/apache/catalina/realm/mbeans-descriptors.xml
index b0002cbef..de1405d93 100644
--- a/java/org/apache/catalina/realm/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/realm/mbeans-descriptors.xml
@@ -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."
diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml
index 8d30a712d..bbf4da1e6 100644
--- a/java/org/apache/catalina/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/session/mbeans-descriptors.xml
@@ -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"
diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml
index 4af41161c..3137d3329 100644
--- a/java/org/apache/catalina/valves/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml
@@ -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"
diff --git a/java/org/apache/jasper/servlet/mbeans-descriptors.xml b/java/org/apache/jasper/servlet/mbeans-descriptors.xml
index d784537d8..5c6aafcde 100644
--- a/java/org/apache/jasper/servlet/mbeans-descriptors.xml
+++ b/java/org/apache/jasper/servlet/mbeans-descriptors.xml
@@ -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"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e50e571c6..29a1b1485 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>
-- 
2.11.0