From 56c909a099a4ce687437a29ddfa6fafdfe850ac4 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 12 Sep 2010 01:38:30 +0000
Subject: [PATCH] Fix typos. Remove attributes that don't exist. Add a missing
 attribute.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@996235 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/catalina/core/mbeans-descriptors.xml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml
index 7c18bf37f..beb2ff323 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -107,18 +107,22 @@
                description="Object names of all children"
                type="[Ljavax.management.ObjectName;"/>
                
-    <attribute name="clearReferenceStatic"
+    <attribute name="clearReferencesStatic"
                description="Should Tomcat attempt to null out any static or final fields from loaded classes when a web application is stopped as a work around for apparent garbage collection bugs and application coding errors?"
                type="boolean"/>
                
-    <attribute name="clearReferenceStopThreads"
+    <attribute name="clearReferencesStopThreads"
                description="Should Tomcat attempt to terminate threads that have been started by the web application? Advisable to be used only in a development environment."
                type="boolean"/>
                
-    <attribute name="clearReferenceStopThreadLocals"
+    <attribute name="clearReferencesThreadLocals"
                description="Should Tomcat attempt to clear any ThreadLocal objects that are instances of classes loaded by this class loader. "
                type="boolean"/>
                
+    <attribute name="clearReferencesStopTimerThreads"
+               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"
                description="Location of the context.xml resource or file"
                type="java.lang.String"/>
@@ -174,21 +178,12 @@
                type="java.lang.String"
                writeable="false" />
       
-    <attribute name="engineName"
-               description="Name of the engine domain, if different from the context domain"
-               type="java.lang.String"/>
-
     <attribute name="eventProvider"
                description="Event provider support for this managed object"
                is="true"
                type="boolean"
                writeable="false" />
           
-    <attribute name="hostName"
-               description="The host name."
-               type="java.lang.String"
-               writeable="false" />
-          
     <attribute name="ignoreAnnotations"
                description="Ignore annotations flag."
                type="boolean" />
@@ -205,7 +200,7 @@
                description="Associated loader."
                type="org.apache.catalina.Loader" />
                
-    <attribute name="logEffectiveWebxml"
+    <attribute name="logEffectiveWebXml"
                description="Should the effective web.xml be logged when the context starts?"
                type="boolean" />
       
-- 
2.11.0