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/trunk@554577 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 47b478c..f906b42 100644 (file)
--- 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 207cb4b..2a6b307 100644 (file)
--- 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>42449</bug>:
          JNDIRealm does not catch NullPointerException for Sun's
          LDAP provider (See bug for details) (funkman)