From 76b4f1fa5e1871dc627cf201b7c0a76234a44cb1 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Oct 2010 21:24:55 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49945
 More JMX improvements. Patch provided by Chamith Buddhika.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1004437 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/core/mbeans-descriptors.xml    | 48 +++-------------------
 .../apache/catalina/startup/mbeans-descriptors.xml | 11 ++---
 webapps/docs/changelog.xml                         |  5 +++
 3 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml
index beb2ff323..fb6879545 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -123,9 +123,9 @@
                description="Should Tomcat attempt to terminate TimerThreads that have been started by the web application? Advisable to be used only in a development environment."
                type="boolean"/>
                
-    <attribute name="configFilePath"
+    <attribute name="configFile"
                description="Location of the context.xml resource or file"
-               type="java.lang.String"/>
+               type="java.net.URL"/>
                
     <attribute name="configured"
                description="The correctly configured flag for this Context."
@@ -364,11 +364,6 @@
                description="Create a JNDI naming context for this application?"
                is="true"
                type="boolean"/>
-               
-    <attribute name="valveObjectNames"
-               description="ObjectNames for the valves associated with this container"
-               type="[Ljavax.management.ObjectName;"
-               writeable="false"/>
 
     <attribute name="welcomeFiles"
                description="The welcome files for this context"
@@ -936,6 +931,7 @@
     
     <attribute name="asyncSupported"
                description="Does this valve support async reporting?"
+               is="true"
                type="boolean"/>
 
     <attribute name="className"
@@ -974,10 +970,6 @@
     <attribute name="managedResource"
                description="The managed resource this MBean is associated with"
                type="java.lang.Object"/>
-               
-    <attribute name="mbeansFile"
-               description="Optional mbeans config file."
-               type="java.lang.String"/>
       
     <attribute name="name"
                description="Unique name of this Engine"
@@ -995,11 +987,6 @@
                description="The name of the LifecycleState that this component is currently in"
                type="java.lang.String"/>
                
-    <attribute name="valveObjectNames"
-               description="ObjectNames for the valves associated with this container"
-               type="[Ljavax.management.ObjectName;"
-               writeable="false"/>  
-               
     <operation name="addChild"
                description="Add a virtual host"
                impact="ACTION"
@@ -1139,6 +1126,7 @@
           
     <attribute name="copyXML"
                description="Should XML files be copied to $CATALINA_BASE/conf/{engine}/{host} by default when a web application is deployed?"
+               is="true"
                type="boolean"/>
                
     <attribute name="createDirs"
@@ -1187,10 +1175,6 @@
     <attribute name="valveNames"
                description="Return the MBean Names of the Valves associated with this Host"
                type="[Ljava.lang.String;"/>
-      
-    <attribute name="valveObjectNames"
-               description="Return the MBean ObjectNames of the Valves associated with this Host"
-               type="[Ljavax.management.ObjectName;"/>
                
     <attribute name="workDir"
                description="Work Directory base for applications"
@@ -1199,14 +1183,6 @@
     <attribute name="xmlBase"
                description="The XML root for this Host."
                type="java.lang.String"/>   
-      
-    <attribute name="xmlNamespaceAware"
-               description="Attribute value used to turn on/off XML namespace awareness"
-               type="boolean"/>
-      
-    <attribute name="xmlValidation"
-               description="Attribute value used to turn on/off XML validation"
-               type="boolean"/> 
                
     <operation name="addAlias"
                description="Add an alias name that should be mapped to this Host"
@@ -1398,11 +1374,6 @@
                description="ObjectNames of the connectors"
                type="[Ljavax.management.ObjectName;"
                writeable="false" />
-      
-    <attribute name="containerName"
-               description="ObjectNames of the engine"
-               type="javax.management.ObjectName"
-               writeable="false" />
 
     <attribute name="managedResource"
                description="The managed resource this MBean is associated with"
@@ -1561,6 +1532,7 @@
          
     <attribute name="asyncSupported"
                description="Async support"
+               is="true"
                type="boolean"/>  
                
     <attribute name="available"
@@ -1580,11 +1552,6 @@
                description="The count of allocations that are currently active (even if they  are for the same instance, as will be true on a non-STM servlet)."
                type="int"
                writeable="false" />             
-           
-    <attribute name="engineName"
-               description="Fully qualified class name of the managed object"
-               type="java.lang.String"
-               writeable="false"/>
                
     <attribute name="errorCount"
                description="Error count"
@@ -1651,11 +1618,8 @@
     <attribute name="singleThreadModel"
                description="Does this servlet implement the SingleThreadModel interface?"
                type="boolean"
+               is="true"
                writeable="false" />
-          
-    <attribute name="startChildern"
-               description="Will children be started automatically when they are added?"
-               type="boolean" />
 
     <attribute name="stateManageable"
                description="State management support for this managed object"
diff --git a/java/org/apache/catalina/startup/mbeans-descriptors.xml b/java/org/apache/catalina/startup/mbeans-descriptors.xml
index f4ca0fda1..cffff348c 100644
--- a/java/org/apache/catalina/startup/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/startup/mbeans-descriptors.xml
@@ -78,22 +78,17 @@
                
      <attribute name="copyXML"
                description="The copy XML config file flag for this component"
+               is="true"
                type="boolean"/>
                
      <attribute name="deployXML"
                description="The deploy XML config file flag for this component"
+               is="true"
                type="boolean"/>
                
      <attribute name="unpackWARs"
                description="The unpack WARs flag"
-               type="boolean"/>
-               
-    <attribute name="xmlNamespaceAware"
-               description="The Java class name of the Context configuration class we should use"
-               type="boolean"/>
-               
-    <attribute name="xmlValidation"
-               description="Set the validation feature of the XML parser used when parsing xml instances."
+               is="true"
                type="boolean"/>
                
     <operation name="addServiced"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 493ac2c2c..b762f57f7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,11 @@
         removed from the createStandardHost definition 
         of mbeans-descriptors.xml. (kfujino)
       </fix>
+      <fix>
+        <bug>49945</bug>: Continue improvements to JMX. Fix a handful of
+        attributes that were showing as Unavailable in JConsole. Patch provided
+        by Chamith Buddhika. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0