From 2bc0806e8c426ca3f8a7715e448c0119cea76f5c Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 2 Nov 2010 10:57:26 +0000
Subject: [PATCH] Fix some MBean descriptors: - "asyncSupported" needs
 is="true" for Valves - "containerName" is gone in valves since r940802 -
 "enabled" uses "get" instead of "is"

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1030000 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/core/mbeans-descriptors.xml    |  2 ++
 .../apache/catalina/valves/mbeans-descriptors.xml  | 34 +++++-----------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml
index a2bc8fe25..240defe34 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -1102,6 +1102,7 @@
     
     <attribute name="asyncSupported"
                description="Does this valve support async reporting?"
+               is="true"
                type="boolean"/>
     
     <attribute name="className"
@@ -1326,6 +1327,7 @@
          
     <attribute name="asyncSupported"
                description="Does this valve support async reporting?"
+               is="true"
                type="boolean"/>
     
     <attribute name="className"
diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml
index bf8b3b540..6cce96931 100644
--- a/java/org/apache/catalina/valves/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml
@@ -25,6 +25,7 @@
          
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
 
     <attribute name="buffered"
@@ -46,17 +47,12 @@
                description="The value to look for conditional logging."
                type="java.lang.String"/>
                
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-               
     <attribute name="directory"
                description="The directory in which log files are created"
                type="java.lang.String"/>
                
-     <attribute name="enabled"
+    <attribute name="enabled"
                description="Enable Access Logging"
-               is="true"
                type="boolean"/>
 
     <attribute name="fileDateFormat"
@@ -113,6 +109,7 @@
 
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
 
     <attribute name="className"
@@ -120,10 +117,6 @@
                type="java.lang.String"
                writeable="false"/>
 
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-
     <attribute name="info"
                description="Information about this implementation"
                type="java.lang.String"
@@ -143,6 +136,7 @@
 
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
 
     <attribute name="buffered"
@@ -164,10 +158,6 @@
                description="The value to look for conditional logging."
                type="java.lang.String"/>
                
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-               
     <attribute name="directory"
                description="The directory in which log files are created"
                type="java.lang.String"/>
@@ -227,6 +217,7 @@
          
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
                
     <attribute name="block"
@@ -238,10 +229,6 @@
                type="java.lang.String"
                writeable="false"/>
 
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-
     <attribute name="concurrency"
                description="Desired concurrency level"
                type="int"/>
@@ -277,12 +264,9 @@
                
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
 
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-
     <attribute   name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
@@ -315,12 +299,9 @@
                
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
 
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-
     <attribute   name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
@@ -349,6 +330,7 @@
          
     <attribute name="asyncSupported"
                description="Does this valve support async reporting."
+               is="true"
                type="boolean"/>
 
     <attribute name="httpServerPort"
-- 
2.11.0