From 27f6f9c62a8498fe93befafce0001fc1864ecad1 Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Jul 2007 09:09:50 +0000
Subject: [PATCH] Remove invalid attribute "encoding" of MBean
 MemoryUserDatabase, which lead to errors in the manager webapp JMXProxy
 output.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@554579 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/users/mbeans-descriptors.xml | 4 ----
 webapps/docs/changelog.xml                            | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 47b478cbb..f906b42c0 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -136,10 +136,6 @@
                 group="UserDatabase"
                  type="org.apache.catalina.users.MemoryUserDatabase">
 
-    <attribute   name="encoding"
-          description="Character encoding to use when writing XML file"
-                 type="java.lang.String"/>
-
     <attribute   name="groups"
           description="MBean Names of all defined groups"
                  type="[Ljava.lang.String;"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 774a3dfce..a004ce3c4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -18,6 +18,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        Remove invalid attribute "encoding" of MBean MemoryUserDatabase,
+        which lead to errors in the manager webapp JMXProxy output. (rjung)
+      </fix>
+      <fix>
         <bug>33774</bug> Retry JNDI authentiction on ServiceUnavailableException
         as at least one provider throws this after an idle connection has been
         closed. (markt)
-- 
2.11.0