From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 13 Jun 2010 21:25:34 +0000 (+0000)
Subject: GSOC: MBean clean-up
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=cc06417f63e8de2d7e8a8e9deae23ca7a78fe5d8;p=tomcat7.0

GSOC: MBean clean-up
Patch provided by Chamith Buddhika

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@954311 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index 8035f4850..cdb28f8ba 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -24,20 +24,24 @@
     group="Valve"
     type="org.apache.catalina.ha.session.JvmRouteBinderValve">
     <attribute
+      name="asyncSupported"
+      description="Does this valve support async reporting? "
+      type="boolean"/>
+    <attribute
       name="className"
       description="Fully qualified class name of the managed object"
       type="java.lang.String"
       writeable="false"/>
     <attribute
+      name="enabled"
+      description="enable a jvm Route check"
+      type="boolean"/>
+    <attribute
       name="info"
       description="describe version"
       type="java.lang.String"
       writeable="false"/>
     <attribute
-      name="enabled"
-      description="enable a jvm Route check"
-      type="boolean"/>
-    <attribute
       name="numberOfSessions"
       description="number of jvmRoute session corrections"
       type="long"
@@ -81,18 +85,13 @@
     group="Manager"
     type="org.apache.catalina.ha.session.DeltaManager">
     <attribute
-      name="info"
-      description="describe version"
-      type="java.lang.String"
+      name="activeSessions"
+      description="Number of active sessions at this moment"
+      type="int"
       writeable="false"/>
     <attribute
       name="algorithm"
-      description="The message digest algorithm to be used when generating
-session identifiers"
-      type="java.lang.String"/>
-    <attribute
-      name="randomFile"
-      description="File source of random - /dev/urandom or a pipe"
+      description="The message digest algorithm to be used when generating session identifiers"
       type="java.lang.String"/>
     <attribute
       name="className"
@@ -100,92 +99,11 @@ session identifiers"
       type="java.lang.String"
       writeable="false"/>
     <attribute
-      name="distributable"
-      description="The distributable flag for Sessions created by this
-Manager"
-      type="boolean"/>
-    <attribute
-      name="entropy"
-      description="A String initialization parameter used to increase the
-entropy of the initialization of our random number
-generator"
-      type="java.lang.String"/>
-    <attribute
-      name="maxActiveSessions"
-      description="The maximum number of active Sessions allowed, or -1
-for no limit"
-      type="int"/>
-    <attribute
-      name="maxInactiveInterval"
-      description="The default maximum inactive interval for Sessions
-created by this Manager"
-      type="int"/>
-    <attribute
-      name="processExpiresFrequency"
-      description="The frequency of the manager checks (expiration and passivation)"
-      type="int"/>
-    <attribute
-      name="sessionIdLength"
-      description="The session id length (in bytes) of Sessions
-created by this Manager"
-      type="int"/>
-    <attribute
-      name="name"
-      description="The descriptive name of this Manager implementation
-(for logging)"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="activeSessions"
-      description="Number of active sessions at this moment"
+      name="counterNoStateTransfered"
+      description="Count the failed session transfers noStateTransfered"
       type="int"
       writeable="false"/>
     <attribute
-      name="sessionCounter"
-      description="Total number of sessions created by this manager"
-      type="long"/>
-    <attribute
-      name="sessionReplaceCounter"
-      description="Total number of replaced sessions that load from external nodes"
-      type="long"/>
-    <attribute
-      name="maxActive"
-      description="Maximum number of active sessions so far"
-      type="int"/>
-    <attribute
-      name="sessionMaxAliveTime"
-      description="Longest time an expired session had been alive"
-      type="int"/>
-    <attribute
-      name="sessionAverageAliveTime"
-      description="Average time an expired session had been alive"
-      type="int"/>
-    <attribute
-      name="sendClusterDomainOnly"
-      is="true"
-      description="The sendClusterDomainOnly flag send sessions only to members as same cluster domain"
-      type="boolean"/>
-    <attribute
-      name="rejectedSessions"
-      description="Number of sessions we rejected due to maxActive beeing reached"
-      type="int"/>
-    <attribute
-      name="expiredSessions"
-      description="Number of sessions that expired ( doesn't include explicit invalidations )"
-      type="long"/>
-    <attribute
-      name="stateTransferTimeout"
-      description="state transfer timeout in sec"
-      type="int"/>
-    <attribute
-      name="processingTime"
-      description="Time spent doing housekeeping and expiration"
-      type="long"/>
-    <attribute
-      name="duplicates"
-      description="Number of duplicated session ids generated"
-      type="int"/>
-    <attribute
       name="counterReceive_EVT_GET_ALL_SESSIONS"
       description="Count receive EVT_GET_ALL_SESSIONS messages"
       type="long"
@@ -256,21 +174,54 @@ created by this Manager"
       type="long"
       writeable="false"/>
     <attribute
-      name="counterNoStateTransfered"
-      description="Count the failed session transfers noStateTransfered"
-      type="int"
-      writeable="false"/>
+      name="distributable"
+      description="The distributable flag for Sessions created by this Manager"
+      type="boolean"/>
     <attribute
-      name="receivedQueueSize"
-      description="length of receive queue size when session received from other node"
-      type="int"
-      writeable="false"/>
+      name="duplicates"
+      description="Number of duplicated session ids generated"
+      type="int"/>
+    <attribute
+      name="entropy"
+      description="A String initialization parameter used to increase the entropy of the initialization of our random number generator"
+      type="java.lang.String"/>
+    <attribute
+      name="expiredSessions"
+      description="Number of sessions that expired ( doesn't include explicit invalidations )"
+      type="long"/>
     <attribute
       name="expireSessionsOnShutdown"
       is="true"
       description="exipre all sessions cluster wide as one node goes down"
       type="boolean"/>
     <attribute
+      name="info"
+      description="describe version"
+      type="java.lang.String"
+      writeable="false"/>
+    <attribute
+      name="invalidatedSessions"
+      description="describe version"
+      type="[Ljava.lang.String;"
+      writeable="false"/>
+    <attribute
+      name="maxActive"
+      description="Maximum number of active sessions so far"
+      type="int"/>
+    <attribute
+      name="maxActiveSessions"
+      description="The maximum number of active Sessions allowed, or -1 for no limit"
+      type="int"/>
+    <attribute
+      name="maxInactiveInterval"
+      description="The default maximum inactive interval for Sessions created by this Manager"
+      type="int"/>
+    <attribute
+      name="name"
+      description="The descriptive name of this Manager implementation (for logging)"
+      type="java.lang.String"
+      writeable="false"/>
+    <attribute
       name="notifyListenersOnReplication"
       is="true"
       description="Send session attribute change events on backup nodes"
@@ -281,6 +232,18 @@ created by this Manager"
       description="Send session start/stop events on backup nodes"
       type="boolean"/>
     <attribute
+      name="processExpiresFrequency"
+      description="The frequency of the manager checks (expiration and passivation)"
+      type="int"/>
+    <attribute
+      name="processingTime"
+      description="Time spent doing housekeeping and expiration"
+      type="long"/>
+    <attribute
+      name="randomFile"
+      description="File source of random - /dev/urandom or a pipe"
+      type="java.lang.String"/>
+    <attribute
       name="sendAllSessions"
       is="true"
       description="Send all sessions at one big block"
@@ -293,6 +256,50 @@ created by this Manager"
       name="sendAllSessionsWaitTime"
       description="wait time between send session block (default 2 sec)"
       type="int"/>
+    <attribute
+      name="sessionAverageAliveTime"
+      description="Average time an expired session had been alive"
+      type="int"/>
+    <attribute
+      name="sessionCounter"
+      description="Total number of sessions created by this manager"
+      type="long"/>
+    <attribute
+      name="sendClusterDomainOnly"
+      is="true"
+      description="The sendClusterDomainOnly flag send sessions only to members as same cluster domain"
+      type="boolean"/>
+    <attribute
+      name="sessionIdLength"
+      description="The session id length (in bytes) of Sessions created by this Manager"
+      type="int"/>
+    <attribute
+      name="sessionMaxAliveTime"
+      description="Longest time an expired session had been alive"
+      type="int"/>
+    <attribute
+      name="sessionReplaceCounter"
+      description="Total number of replaced sessions that load from external nodes"
+      type="long"
+      writeable="false"/>
+    <attribute
+      name="stateTransfered"
+      is="true"
+      description="Is session state transfered complete? "
+      type="boolean"/>  
+    <attribute
+      name="stateTransferTimeout"
+      description="state transfer timeout in sec"
+      type="int"/>
+    <attribute
+      name="receivedQueueSize"
+      description="length of receive queue size when session received from other node"
+      type="int"
+      writeable="false"/>
+    <attribute
+      name="rejectedSessions"
+      description="Number of sessions we rejected due to maxActive beeing reached"
+      type="int"/>
     <operation
       name="listSessionIds"
       description="Return the list of active session ids"
@@ -432,13 +439,18 @@ created by this Manager"
     group="Manager"
     type="org.apache.catalina.ha.session.BackupManager">
     <attribute
-      name="algorithm"
-      description="The message digest algorithm to be used when generating
-session identifiers"
-      type="java.lang.String"/>
+      name="activeSessions"
+      description="Number of active primary sessions at this moment"
+      type="int"
+      writeable="false"/>
     <attribute
-      name="randomFile"
-      description="File source of random - /dev/urandom or a pipe"
+      name="activeSessionsFull"
+      description="Number of active sessions at this moment"
+      type="int"
+      writeable="false"/>
+    <attribute
+      name="algorithm"
+      description="The message digest algorithm to be used when generating session identifiers"
       type="java.lang.String"/>
     <attribute
       name="className"
@@ -447,101 +459,96 @@ session identifiers"
       writeable="false"/>
     <attribute
       name="distributable"
-      description="The distributable flag for Sessions created by this
-Manager"
+      description="The distributable flag for Sessions created by this Manager"
       type="boolean"/>
     <attribute
+      name="duplicates"
+      description="Number of duplicated session ids generated"
+      type="int"/>
+    <attribute
       name="entropy"
-      description="A String initialization parameter used to increase the
-entropy of the initialization of our random number
-generator"
+      description="A String initialization parameter used to increase the entropy of the initialization of our random number generator"
       type="java.lang.String"/>
     <attribute
-      name="maxActiveSessions"
-      description="The maximum number of active Sessions allowed, or -1
-for no limit"
-      type="int"/>
+      name="expiredSessions"
+      description="Number of sessions that expired ( doesn't include explicit invalidations )"
+      type="long"/>
     <attribute
-      name="maxInactiveInterval"
-      description="The default maximum inactive interval for Sessions
-created by this Manager"
+      name="expireSessionsOnShutdown"
+      is="true"
+      description="exipre all sessions cluster wide as one node goes down"
+      type="boolean"/>
+    <attribute
+      name="invalidatedSessions"
+      description="Get the list of invalidated session."
+      type="[Ljava.lang.String;"/>
+    <attribute
+      name="mapName"
+      description="mapName"
+      type="java.lang.String"
+      writeable="false"/>
+    <attribute
+      name="mapSendOptions"
+      description="mapSendOptions"
+      type="int"
+      writeable="false"/>
+    <attribute
+      name="maxActive"
+      description="Maximum number of active sessions so far"
       type="int"/>
     <attribute
-      name="processExpiresFrequency"
-      description="The frequency of the manager checks (expiration and passivation)"
+      name="maxActiveSessions"
+      description="The maximum number of active Sessions allowed, or -1 for no limit"
       type="int"/>
     <attribute
-      name="sessionIdLength"
-      description="The session id length (in bytes) of Sessions
-created by this Manager"
+      name="maxInactiveInterval"
+      description="The default maximum inactive interval for Sessions created by this Manager"
       type="int"/>
     <attribute
       name="name"
-      description="The descriptive name of this Manager implementation
-(for logging)"
-      type="java.lang.String"
-      writeable="false"/>
+      description="The name of component. "
+      type="java.lang.String"/>
+    <attribute
+      name="notifyListenersOnReplication"
+      is="true"
+      description="Send session attribute change events on backup nodes"
+      type="boolean"/>
     <attribute
       name="pathname"
       description="Path name of the disk file in which active sessions"
       type="java.lang.String"/>
     <attribute
-      name="activeSessions"
-      description="Number of active primary sessions at this moment"
-      type="int"
-      writeable="false"/>
+      name="processExpiresFrequency"
+      description="The frequency of the manager checks (expiration and passivation)"
+      type="int"/>
     <attribute
-      name="activeSessionsFull"
-      description="Number of active sessions at this moment"
-      type="int"
-      writeable="false"/>
+      name="processingTime"
+      description="Time spent doing housekeeping and expiration"
+      type="long"/>
+    <attribute
+      name="sessionAverageAliveTime"
+      description="Average time an expired session had been alive"
+      type="int"/>
     <attribute
       name="sessionCounter"
       description="Total number of sessions created by this manager"
       type="long"/>
     <attribute
-      name="maxActive"
-      description="Maximum number of active sessions so far"
+      name="sessionIdLength"
+      description="The session id length (in bytes) of Sessions created by this Manager"
       type="int"/>
     <attribute
       name="sessionMaxAliveTime"
       description="Longest time an expired session had been alive"
       type="int"/>
     <attribute
-      name="sessionAverageAliveTime"
-      description="Average time an expired session had been alive"
-      type="int"/>
+      name="randomFile"
+      description="File source of random - /dev/urandom or a pipe"
+      type="java.lang.String"/>
     <attribute
       name="rejectedSessions"
       description="Number of sessions we rejected due to maxActive beeing reached"
       type="int"/>
-    <attribute
-      name="expiredSessions"
-      description="Number of sessions that expired ( doesn't include explicit invalidations )"
-      type="long"/>
-    <attribute
-      name="processingTime"
-      description="Time spent doing housekeeping and expiration"
-      type="long"/>
-    <attribute
-      name="duplicates"
-      description="Number of duplicated session ids generated"
-      type="int"/>
-    <attribute
-      name="expireSessionsOnShutdown"
-      is="true"
-      description="exipre all sessions cluster wide as one node goes down"
-      type="boolean"/>
-    <attribute
-      name="notifyListenersOnReplication"
-      is="true"
-      description="Send session attribute change events on backup nodes"
-      type="boolean"/>
-    <attribute
-      name="mapSendOptions"
-      description="mapSendOptions"
-      type="int"
-      writeable="false"/>
     <operation
       name="listSessionIds"
       description="Return the list of active primary session ids"
diff --git a/java/org/apache/catalina/mbeans/mbeans-descriptors.xml b/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
index 6b23013c4..dbcbc41dc 100644
--- a/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
@@ -137,18 +137,21 @@
           description="MBean Name of the associated parent component"
                  type="java.lang.String"/>
     </operation>
-
-    <operation   name="createRemoteAddrValve"
-          description="Create a new Remote Address Filter Valve"
+    
+    <operation   name="createUserDatabaseRealm"
+          description="Create a new  UserDatabaseRealm"
                impact="ACTION"
            returnType="java.lang.String">
       <parameter name="parent"
           description="MBean Name of the associated parent component"
                  type="java.lang.String"/>
+      <parameter name="resourceName"
+          description="Global JNDI resource name of the associated"
+                 type="java.lang.String"/>
     </operation>
 
-    <operation   name="createRemoteHostValve"
-          description="Create a new Remote Host Filter Valve"
+    <operation   name="createRemoteAddrValve"
+          description="Create a new Remote Address Filter Valve"
                impact="ACTION"
            returnType="java.lang.String">
       <parameter name="parent"
@@ -156,8 +159,8 @@
                  type="java.lang.String"/>
     </operation>
 
-    <operation   name="createRequestDumperValve"
-          description="Create a new Request Dumper Valve"
+    <operation   name="createRemoteHostValve"
+          description="Create a new Remote Host Filter Valve"
                impact="ACTION"
            returnType="java.lang.String">
       <parameter name="parent"
diff --git a/java/org/apache/catalina/realm/mbeans-descriptors.xml b/java/org/apache/catalina/realm/mbeans-descriptors.xml
index a4c9aec35..ce4c6f295 100644
--- a/java/org/apache/catalina/realm/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/realm/mbeans-descriptors.xml
@@ -23,6 +23,10 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.DataSourceRealm">
+                
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
@@ -36,10 +40,18 @@
     <attribute   name="digest"
           description="Digest algorithm used in storing passwords in a non-plaintext format"
                  type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>       
 
     <attribute   name="localDataSource"
           description="Configures if the DataSource is local to the webapp"
                  type="boolean"/>
+                 
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
 
     <attribute   name="roleNameCol"
           description="The column in the user role table that names a role"
@@ -60,6 +72,10 @@
     <attribute   name="userTable"
           description="The table that holds user data"
                  type="java.lang.String"/>
+                 
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
 
 
     <operation name="start" description="Start" impact="ACTION" returnType="void" />
@@ -74,6 +90,10 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.JAASRealm">
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
 
     <attribute   name="appName"
           description="The application name passed to the JAAS LoginContext, which uses it to select the set of relevant LoginModules"
@@ -87,18 +107,30 @@
     <attribute   name="digest"
           description="Digest algorithm used in storing passwords in a non-plaintext format"
                  type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
 
     <attribute   name="roleClassNames"
           description="Comma-delimited list of javax.security.Principal classes that represent security roles"
                  type="java.lang.String"/>
+                 
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
 
     <attribute   name="userClassNames"
           description="Comma-delimited list of javax.security.Principal classes that represent individual users"
                  type="java.lang.String"/>
+                 
+    <attribute   name="useContextClassLoader"
+          description="Sets whether to use the context or default ClassLoader."
+                 type="boolean"/>
 
     <attribute   name="validate"
           description="Should we validate client certificate chains when they are presented?"
-                 type="java.lang.String"/>
+                 type="boolean"/>
 
 
     <operation name="start" description="Start" impact="ACTION" returnType="void" />
@@ -113,6 +145,10 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.JDBCRealm">
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
@@ -134,6 +170,10 @@
     <attribute   name="digest"
           description="Digest algorithm used in storing passwords in a non-plaintext format"
                  type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
 
     <attribute   name="driverName"
           description="The JDBC driver to use"
@@ -142,6 +182,10 @@
     <attribute   name="roleNameCol"
           description="The column in the user role table that names a role"
                  type="java.lang.String"/>
+                 
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
 
     <attribute   name="userCredCol"
           description="The column in the user table that holds the user's credentials"
@@ -158,6 +202,10 @@
     <attribute   name="userTable"
           description="The table that holds user data"
                  type="java.lang.String"/>
+                 
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
 
 
     <operation name="start" description="Start" impact="ACTION" returnType="void" />
@@ -171,11 +219,31 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.JNDIRealm">
+                 
+    <attribute   name="adCompat"
+          description=" The current settings for handling PartialResultExceptions"
+                 type="boolean"/>
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
+
+    <attribute   name="alternateURL"
+          description="The Alternate URL"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="authentication"
+          description="The type of authentication to use"
+                 type="java.lang.String"/>
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
             writeable="false"/>
+            
+    <attribute   name="commonRole"
+          description="The common role"
+                 type="java.lang.String"/>
 
     <attribute   name="connectionName"
           description="The connection username for the server we will contact"
@@ -184,6 +252,10 @@
     <attribute   name="connectionPassword"
           description="The connection password for the server we will contact"
                  type="java.lang.String"/>
+                 
+    <attribute   name="connectionTimeout"
+          description="The connection timeout"
+                 type="java.lang.String"/>
 
     <attribute   name="connectionURL"
           description="The connection URL for the server we will contact"
@@ -196,6 +268,22 @@
     <attribute   name="digest"
           description="Digest algorithm used in storing passwords in a non-plaintext format"
                  type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
+                 
+    <attribute   name="protocol"
+          description="The protocol to be used"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="referrals"
+          description="The current setting for handling JNDI referrals."
+                 type="java.lang.String"/>
 
     <attribute   name="roleBase"
           description="The base element for role searches"
@@ -204,6 +292,10 @@
     <attribute   name="roleName"
           description="The name of the attribute containing roles held elsewhere"
                  type="java.lang.String"/>
+                 
+    <attribute   name="roleNested"
+          description="The 'The nested group search flag' flag"
+                 type="boolean"/>
 
     <attribute   name="roleSearch"
           description="The message format used to select roles for a user"
@@ -236,6 +328,10 @@
     <attribute   name="userSubtree"
           description="Should we search the entire subtree for matching users?"
                  type="boolean"/>
+                 
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
 
 
     <operation name="start" description="Start" impact="ACTION" returnType="void" />
@@ -249,15 +345,35 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.MemoryRealm">
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
             writeable="false"/>
+            
+    <attribute   name="digest"
+          description="Digest algorithm used in storing passwords in a non-plaintext format"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
 
     <attribute   name="pathname"
           description="The pathname of the XML file containing our database information"
                  type="java.lang.String"/>
+                 
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
+
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
 
     <operation name="start" description="Start" impact="ACTION" returnType="void" />
     <operation name="stop" description="Stop" impact="ACTION" returnType="void" />
@@ -271,15 +387,40 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.UserDatabaseRealm">
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
             writeable="false"/>
+            
+    <attribute   name="digest"
+          description="Digest algorithm used in storing passwords in a non-plaintext format"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
 
     <attribute   name="resourceName"
           description="The global JNDI name of the UserDatabase resource to use"
                  type="java.lang.String"/>
+                 
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
+
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
+                 
+    <operation name="start" description="Start" impact="ACTION" returnType="void" />
+    <operation name="stop" description="Stop" impact="ACTION" returnType="void" />
+    <operation name="init" description="Init" impact="ACTION" returnType="void" />
+    <operation name="destroy" description="Destroy" impact="ACTION" returnType="void" />
 
   </mbean>
 
@@ -288,16 +429,36 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.CombinedRealm">
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
             writeable="false"/>
+            
+    <attribute   name="digest"
+          description="Digest algorithm used in storing passwords in a non-plaintext format"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
 
     <attribute   name="realms"
           description="The set of realms that the combined realm is wrapping"
                  type="[Ljavax.management.ObjectName;"
             writeable="false"/>
+            
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
+
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
 
     <operation   name="addRealm"
           description="Add a new Realm to the set of Realms wrapped by this realm"
@@ -308,15 +469,10 @@
                  type="org.apache.catalina.Realm"/>
     </operation>
 
-    <operation   name="start"
-          description="Start"
-               impact="ACTION"
-           returnType="void" />
-
-    <operation   name="stop"
-          description="Stop"
-               impact="ACTION"
-           returnType="void" />
+    <operation name="start" description="Start" impact="ACTION" returnType="void" />
+    <operation name="stop" description="Stop" impact="ACTION" returnType="void" />
+    <operation name="init" description="Init" impact="ACTION" returnType="void" />
+    <operation name="destroy" description="Destroy" impact="ACTION" returnType="void" />
 
   </mbean>
 
@@ -325,25 +481,28 @@
                domain="Catalina"
                 group="Realm"
                  type="org.apache.catalina.realm.LockOutRealm">
+                 
+    <attribute   name="allRolesMode"
+          description="The all roles mode."
+                 type="java.lang.String"/>
+                
+    <attribute   name="cacheSize"
+          description="Number of users that have failed authentication to keep in cache. Over time the cache will grow to this size and may not shrink. Defaults to 1000."
+                 type="int" />
+                 
+    <attribute   name="cacheRemovalWarningTime"
+          description="If a failed user is removed from the cache because the cache is too big before it has been in the cache for at least this period of time (in seconds) a warning message will be logged. Defaults to 3600 (1 hour)."
+                 type="int" />
 
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
             writeable="false"/>
-
-    <attribute   name="realms"
-          description="The set of realms that the lockout realm is wrapping"
-                 type="[Ljavax.management.ObjectName;"
-            writeable="false"/>
-
-    <attribute   name="cacheRemovalWarningTime"
-          description="If a failed user is removed from the cache because the cache is too big before it has been in the cache for at least this period of time (in seconds) a warning message will be logged. Defaults to 3600 (1 hour)."
-                 type="int" />
-
-    <attribute   name="cacheSize"
-          description="Number of users that have failed authentication to keep in cache. Over time the cache will grow to this size and may not shrink. Defaults to 1000."
-                 type="int" />
-
+            
+    <attribute   name="digest"
+          description="Digest algorithm used in storing passwords in a non-plaintext format"
+                 type="java.lang.String"/>
+                 
     <attribute   name="failureCount"
           description="The number of times in a row a user has to fail authentication to be locked out. Defaults to 5."
                  type="int" />
@@ -351,7 +510,24 @@
     <attribute   name="lockOutTime"
           description="The time (in seconds) a user is locked out for after too many authentication failures. Defaults to 300 (5 minutes)."
                  type="int" />
+                 
+    <attribute   name="digestEncoding"
+          description="The digest encoding charset."
+                 type="java.lang.String"/>
+
+    <attribute   name="realms"
+          description="The set of realms that the lockout realm is wrapping"
+                 type="[Ljavax.management.ObjectName;"
+            writeable="false"/>
+            
+    <attribute   name="realmPath"
+          description="The realm path"
+                 type="java.lang.String"/>
 
+    <attribute   name="validate"
+          description="The 'validate certificate chains' flag."
+                 type="boolean"/>
+                 
     <operation   name="addRealm"
           description="Add a new Realm to the set of Realms wrapped by this realm"
                impact="ACTION"
@@ -370,15 +546,10 @@
                  type="java.lang.String"/>
     </operation>
 
-    <operation   name="start"
-          description="Start"
-               impact="ACTION"
-           returnType="void" />
-
-    <operation   name="stop"
-          description="Stop"
-               impact="ACTION"
-           returnType="void" />
+    <operation name="start" description="Start" impact="ACTION" returnType="void" />
+    <operation name="stop" description="Stop" impact="ACTION" returnType="void" />
+    <operation name="init" description="Init" impact="ACTION" returnType="void" />
+    <operation name="destroy" description="Destroy" impact="ACTION" returnType="void" />
 
   </mbean>
 
diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml
index 67e81f177..a42454cdc 100644
--- a/java/org/apache/catalina/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/session/mbeans-descriptors.xml
@@ -22,17 +22,17 @@
                domain="Catalina"
                 group="Manager"
                  type="org.apache.catalina.session.StandardManager">
+                 
+    <attribute   name="activeSessions"
+          description="Number of active sessions at this moment"
+                 type="int" 
+            writeable="false"/>
 
     <attribute   name="algorithm"
           description="The message digest algorithm to be used when generating
                        session identifiers"
                  type="java.lang.String"/>
 
-
-    <attribute   name="randomFile"
-          description="File source of random - /dev/urandom or a pipe"
-                 type="java.lang.String"/>
-
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
@@ -42,12 +42,29 @@
           description="The distributable flag for Sessions created by this
                        Manager"
                  type="boolean"/>
+                 
+    <attribute   name="duplicates"
+          description="Number of duplicated session ids generated"
+                 type="int" />
 
     <attribute   name="entropy"
           description="A String initialization parameter used to increase the
                        entropy of the initialization of our random number
                        generator"
                  type="java.lang.String"/>
+                 
+    <attribute   name="expiredSessions"
+          description="Number of sessions that expired ( doesn't include explicit invalidations )"
+                 type="long" />
+                 
+    <attribute   name="jvmRoute"
+          description="Retrieve the JvmRoute for the enclosing Engine"
+                 type="java.lang.String"
+           writeable = "false" />
+                 
+    <attribute   name="maxActive"
+          description="Maximum number of active sessions so far"
+                 type="int" />
 
     <attribute   name="maxActiveSessions"
           description="The maximum number of active Sessions allowed, or -1
@@ -59,100 +76,88 @@
                        created by this Manager"
                  type="int"/>
 
-    <attribute name="processExpiresFrequency"
-               description="The frequency of the manager checks (expiration and passivation)"
-               type="int"/>
-               
-    <attribute   name="sessionIdLength"
-          description="The session id length (in bytes) of Sessions
-                       created by this Manager"
-                 type="int"/>
-
     <attribute   name="name"
           description="The descriptive name of this Manager implementation
                        (for logging)"
                  type="java.lang.String"
             writeable="false"/>
-
+            
     <attribute   name="pathname"
           description="Path name of the disk file in which active sessions"
                  type="java.lang.String"/>
 
-    <attribute   name="activeSessions"
-          description="Number of active sessions at this moment"
-                 type="int" 
-            writeable="false"/>
+    <attribute name="processExpiresFrequency"
+               description="The frequency of the manager checks (expiration and passivation)"
+               type="int"/>
+
+    <attribute   name="processingTime"
+          description="Time spent doing housekeeping and expiration"
+                 type="long" />
+               
+    <attribute   name="sessionAverageAliveTime"
+          description="Average time an expired session had been alive"
+                 type="int" />
 
     <attribute   name="sessionCounter"
           description="Total number of sessions created by this manager"
                  type="long" />
-
-    <attribute   name="maxActive"
-          description="Maximum number of active sessions so far"
-                 type="int" />
+                 
+    <attribute   name="sessionIdLength"
+          description="The session id length (in bytes) of Sessions
+                       created by this Manager"
+                 type="int"/>
 
     <attribute   name="sessionMaxAliveTime"
           description="Longest time an expired session had been alive"
                  type="int" />
-
-    <attribute   name="sessionAverageAliveTime"
-          description="Average time an expired session had been alive"
-                 type="int" />
+                 
+    <attribute   name="randomFile"
+          description="File source of random - /dev/urandom or a pipe"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="randomClass"
+          description="The random number generator class name"
+                 type="java.lang.String"/>
 
     <attribute   name="rejectedSessions"
           description="Number of sessions we rejected due to maxActive beeing reached"
                  type="int" />
-
-    <attribute   name="expiredSessions"
-          description="Number of sessions that expired ( doesn't include explicit invalidations )"
-                 type="long" />
-
-    <attribute   name="processingTime"
-          description="Time spent doing housekeeping and expiration"
-                 type="long" />
-
-    <attribute   name="duplicates"
-          description="Number of duplicated session ids generated"
-                 type="int" />
-
-    <operation   name="listSessionIds"
-          description="Return the list of active session ids"
+                 
+    <operation   name="backgroundProcess"
+          description="Invalidate all sessions that have expired."
                impact="ACTION"
-           returnType="java.lang.String">
+           returnType="void">
     </operation>
-
-    <operation   name="getSessionAttribute"
-          description="Return a session attribute"
+                 
+    <operation   name="expireSession"
+          description="Expire a session"
                impact="ACTION"
-           returnType="java.lang.String">
+           returnType="void">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
-      <parameter name="key"
-          description="key of the attribute"
-                 type="java.lang.String"/>
     </operation>
-
-    <operation   name="expireSession"
-          description="Expire a session"
+    
+    <operation   name="getCreationTime"
+          description="Get the creation time"
                impact="ACTION"
-           returnType="void">
+           returnType="java.lang.String">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-
-    <operation   name="getLastAccessedTime"
-          description="Get the last access time"
+    
+    <operation   name="getCreationTimestamp"
+          description="Get the creation timestamp"
                impact="ACTION"
-           returnType="java.lang.String">
+           returnType="long">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-
-    <operation   name="getCreationTime"
-          description="Get the creation time"
+    
+    <operation   name="getLastAccessedTime"
+          description="Get the last access time"
                impact="ACTION"
            returnType="java.lang.String">
       <parameter name="sessionId"
@@ -168,14 +173,23 @@
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-
-    <operation   name="getCreationTimestamp"
-          description="Get the creation timestamp"
+    
+    <operation   name="getSessionAttribute"
+          description="Return a session attribute"
                impact="ACTION"
-           returnType="long">
+           returnType="java.lang.String">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
+      <parameter name="key"
+          description="key of the attribute"
+                 type="java.lang.String"/>
+    </operation>
+
+    <operation   name="listSessionIds"
+          description="Return the list of active session ids"
+               impact="ACTION"
+           returnType="java.lang.String">
     </operation>
 
   </mbean>
@@ -186,15 +200,16 @@
                 group="Manager"
                  type="org.apache.catalina.session.PersistentManager">
 
+    <attribute   name="activeSessions"
+          description="Number of active sessions at this moment"
+                 type="int" 
+            writeable="false"/>
+
     <attribute   name="algorithm"
           description="The message digest algorithm to be used when generating
                        session identifiers"
                  type="java.lang.String"/>
 
-    <attribute   name="randomFile"
-          description="File source of random - /dev/urandom or a pipe"
-                 type="java.lang.String"/>
-
     <attribute   name="className"
           description="Fully qualified class name of the managed object"
                  type="java.lang.String"
@@ -204,34 +219,55 @@
           description="The distributable flag for Sessions created by this
                        Manager"
                  type="boolean"/>
+                 
+    <attribute   name="duplicates"
+          description="Number of duplicated session ids generated"
+                 type="int" />
 
     <attribute   name="entropy"
           description="A String initialization parameter used to increase the
                        entropy of the initialization of our random number
                        generator"
                  type="java.lang.String"/>
- 
-    <attribute   name="managedResource"
-          description="The managed resource this MBean is associated with"
-                 type="java.lang.Object"/>
+                 
+    <attribute   name="expiredSessions"
+          description="Number of sessions that expired ( doesn't include explicit invalidations )"
+                 type="long" />
+                 
+    <attribute   name="loaded"
+          description="If the session id is loaded in memory?"
+                 type="boolean"
+           writeable = "false" />
+                 
+    <attribute   name="jvmRoute"
+          description="Retrieve the JvmRoute for the enclosing Engine"
+                 type="java.lang.String"
+           writeable = "false" />
+                 
+    <attribute   name="maxActive"
+          description="Maximum number of active sessions so far"
+                 type="int" />
 
     <attribute   name="maxActiveSessions"
           description="The maximum number of active Sessions allowed, or -1
                        for no limit"
                  type="int"/>
+                 
+    <attribute   name="maxIdleBackup"
+          description="Indicates how many seconds old a session can get, after its last use in a request, before it should be backed up to the store. -1 means sessions are not backed up."
+                 type="int"/>
+                 
+    <attribute   name="maxIdleSwap"
+          description="Indicates how many seconds old a session can get, after its last use in a request, before it should be backed up to the store. -1 means sessions are not backed up."
+                 type="int"/>
 
     <attribute   name="maxInactiveInterval"
           description="The default maximum inactive interval for Sessions
                        created by this Manager"
                  type="int"/>
                  
-    <attribute name="processExpiresFrequency"
-               description="The frequency of the manager checks (expiration and passivation)"
-               type="int"/>
-               
-    <attribute   name="sessionIdLength"
-          description="The session id length (in bytes) of Sessions
-                       created by this Manager"
+    <attribute   name="minIdleSwap"
+          description=" The minimum time in seconds that a session must be idle before it can be swapped out of memory, or -1 if it can be swapped out at any time."
                  type="int"/>
 
     <attribute   name="name"
@@ -240,91 +276,80 @@
                  type="java.lang.String"
             writeable="false"/>
 
-    <attribute   name="activeSessions"
-          description="Number of active sessions at this moment"
-                 type="int" 
-            writeable="false"/>
+    <attribute name="processExpiresFrequency"
+               description="The frequency of the manager checks (expiration and passivation)"
+               type="int"/>
 
-    <attribute   name="sessionCounter"
-          description="Total number of sessions created by this manager"
+    <attribute   name="processingTime"
+          description="Time spent doing housekeeping and expiration"
                  type="long" />
-
-    <attribute   name="maxActive"
-          description="Maximum number of active sessions so far"
-                 type="int" />
-
-    <attribute   name="maxIdleBackup"
-          description="How long a session must be idle before it should be backed up"
-                 type="int" />
-
-    <attribute   name="minIdleSwap"
-          description="Minimum time a session must be idle before it is swapped to disk"
+                 
+    <attribute   name="saveOnRestart"
+          description="Indicates whether sessions are saved when the Manager is shut down properly. This requires the unload() method to be called."
+                 type="boolean" />
+               
+    <attribute   name="sessionAverageAliveTime"
+          description="Average time an expired session had been alive"
                  type="int" />
 
-    <attribute   name="maxIdleSwap"
-          description="The maximum time a session may be idle before it should be swapped to file just on general principle"
-                 type="int" />
+    <attribute   name="sessionCounter"
+          description="Total number of sessions created by this manager"
+                 type="long" />
+                 
+    <attribute   name="sessionIdLength"
+          description="The session id length (in bytes) of Sessions
+                       created by this Manager"
+                 type="int"/>
 
     <attribute   name="sessionMaxAliveTime"
           description="Longest time an expired session had been alive"
                  type="int" />
-
-    <attribute   name="sessionAverageAliveTime"
-          description="Average time an expired session had been alive"
-                 type="int" />
+                 
+    <attribute   name="randomFile"
+          description="File source of random - /dev/urandom or a pipe"
+                 type="java.lang.String"/>
+                 
+    <attribute   name="randomClass"
+          description="The random number generator class name"
+                 type="java.lang.String"/>
 
     <attribute   name="rejectedSessions"
           description="Number of sessions we rejected due to maxActive beeing reached"
                  type="int" />
 
-    <attribute   name="expiredSessions"
-          description="Number of sessions that expired ( doesn't include explicit invalidations )"
-                 type="long" />
-
-    <attribute   name="processingTime"
-          description="Time spent doing housekeeping and expiration"
-                 type="long" />
-
-    <attribute   name="duplicates"
-          description="Number of duplicated session ids generated"
-                 type="int" />
-
-    <operation   name="listSessionIds"
-          description="Return the list of active session ids"
+    <operation   name="backgroundProcess"
+          description="Invalidate all sessions that have expired."
                impact="ACTION"
-           returnType="java.lang.String">
+           returnType="void">
     </operation>
-
-    <operation   name="getSessionAttribute"
-          description="Return a session attribute"
+                 
+    <operation   name="expireSession"
+          description="Expire a session"
                impact="ACTION"
-           returnType="java.lang.String">
+           returnType="void">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
-      <parameter name="key"
-          description="key of the attribute"
-                 type="java.lang.String"/>
     </operation>
-
-    <operation   name="getSession"
-          description="Get information about a session"
+    
+    <operation   name="getCreationTime"
+          description="Get the creation time"
                impact="ACTION"
-           returnType="java.util.HashMap">
+           returnType="java.lang.String">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-
-    <operation   name="expireSession"
-          description="Expire a session"
+    
+    <operation   name="getCreationTimestamp"
+          description="Get the creation timestamp"
                impact="ACTION"
-           returnType="void">
+           returnType="long">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-
+    
     <operation   name="getLastAccessedTime"
           description="Get the last access time"
                impact="ACTION"
@@ -334,31 +359,31 @@
                  type="java.lang.String"/>
     </operation>
 
-    <operation   name="getCreationTime"
-          description="Get the creation time"
+   <operation   name="getLastAccessedTimestamp"
+          description="Get the last access timestamp"
                impact="ACTION"
-           returnType="java.lang.String">
+           returnType="long">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
     </operation>
-
-    <operation   name="getLastAccessedTimestamp"
-          description="Get the last access timestamp"
+    
+    <operation   name="getSessionAttribute"
+          description="Return a session attribute"
                impact="ACTION"
-           returnType="long">
+           returnType="java.lang.String">
       <parameter name="sessionId"
           description="Id of the session"
                  type="java.lang.String"/>
+      <parameter name="key"
+          description="key of the attribute"
+                 type="java.lang.String"/>
     </operation>
 
-    <operation   name="getCreationTimestamp"
-          description="Get the creation timestamp"
+    <operation   name="listSessionIds"
+          description="Return the list of active session ids"
                impact="ACTION"
-           returnType="long">
-      <parameter name="sessionId"
-          description="Id of the session"
-                 type="java.lang.String"/>
+           returnType="java.lang.String">
     </operation>
 
   </mbean>
diff --git a/java/org/apache/catalina/startup/mbeans-descriptors.xml b/java/org/apache/catalina/startup/mbeans-descriptors.xml
index 5a2b3f700..f4ca0fda1 100644
--- a/java/org/apache/catalina/startup/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/startup/mbeans-descriptors.xml
@@ -27,7 +27,15 @@
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
                writeable="false"/>
-      
+               
+    <attribute name="defaultContextXml"
+               description="The location of the default context file"
+               type="java.lang.String"/>  
+
+    <attribute name="defaultWebXml"
+               description="The location of the default deployment descriptor"
+               type="java.lang.String"/>     
+
   </mbean>
 
   <mbean name="EngineConfig"
@@ -67,6 +75,35 @@
     <attribute name="contextClass"
                description="The Java class name of the Context implementation we should use"
                type="java.lang.String"/>
+               
+     <attribute name="copyXML"
+               description="The copy XML config file flag for this component"
+               type="boolean"/>
+               
+     <attribute name="deployXML"
+               description="The deploy XML config file flag for this component"
+               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."
+               type="boolean"/>
+               
+    <operation name="addServiced"
+               description="Add a web application to the serviced list to show it gets serviced by another component"
+               impact="ACTION"
+               returnType="void">
+      <parameter name="name"
+                 description="Application name"
+                 type="java.lang.String"/>
+    </operation>
       
     <operation name="check"
                description="Check a web application name for updates"
@@ -76,27 +113,27 @@
                  description="Application name"
                  type="java.lang.String"/>
     </operation>
-
-    <operation name="addServiced"
-               description="Add a web application to the serviced list to show it gets serviced by another component"
+    
+    <operation name="getDeploymentTime"
+               description="Get the instant where an application was deployed"
                impact="ACTION"
-               returnType="void">
+               returnType="long">
       <parameter name="name"
                  description="Application name"
                  type="java.lang.String"/>
     </operation>
 
-    <operation name="isServiced"
-               description="Is a web application serviced by another component"
+    <operation name="isDeployed"
+               description="Was this web application deployed by this component"
                impact="ACTION"
                returnType="boolean">
       <parameter name="name"
                  description="Application name"
                  type="java.lang.String"/>
     </operation>
-
-    <operation name="isDeployed"
-               description="Was this web application deployed by this component"
+    
+    <operation name="isServiced"
+               description="Is a web application serviced by another component"
                impact="ACTION"
                returnType="boolean">
       <parameter name="name"