From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Jul 2010 21:55:46 +0000 (+0000)
Subject: GSOC 2010. Continue work to align MBean descriptors with reality. Patch provided... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c7b414bf21c813bbbf053b3d393f3af60282e5e5;p=tomcat7.0

GSOC 2010. Continue work to align MBean descriptors with reality. Patch provided by Chamith Buddhika.

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

diff --git a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
index 38d011f12..d3951a3d4 100644
--- a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
+++ b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
@@ -138,6 +138,11 @@ public class SimpleTcpReplicationManager extends StandardManager implements Clus
         this.defaultMode = defaultMode;
     }
     
+    public boolean getUseDirtyFlag()
+    {
+        return useDirtyFlag;
+    }
+    
     public void setUseDirtyFlag(boolean usedirtyflag)
     {
         this.useDirtyFlag = usedirtyflag;
@@ -158,6 +163,11 @@ public class SimpleTcpReplicationManager extends StandardManager implements Clus
     {
         return mExpireSessionsOnShutdown;
     }
+    
+    public boolean getPrintToScreen()
+    {
+        return mPrintToScreen;
+    }
 
     public void setPrintToScreen(boolean printtoscreen)
     {
@@ -165,6 +175,11 @@ public class SimpleTcpReplicationManager extends StandardManager implements Clus
             log.debug("Setting screen debug to:"+printtoscreen);
         mPrintToScreen = printtoscreen;
     }
+    
+    public boolean getSynchronousReplication()
+    {
+        return synchronousReplication;
+    }
 
     public void setSynchronousReplication(boolean flag)
     {
diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index d2168acd6..80cf8f2a6 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -311,78 +311,93 @@
       description="Number of sessions we rejected due to maxActive beeing reached"
       type="int"/>
     <operation
-      name="listSessionIds"
-      description="Return the list of active session ids"
-      impact="ACTION"
-      returnType="java.lang.String"/>
-    <operation
-      name="getSessionAttribute"
-      description="Return a session attribute"
+      name="expireSession"
+      description="Expired the given session"
       impact="ACTION"
-      returnType="java.lang.String">
+      returnType="void">
       <parameter
         name="sessionId"
-        description="Id of the session"
+        description="The session id for the session to be expired"
         type="java.lang.String"/>
+    </operation>
+    <operation
+      name="expireAllLocalSessions"
+      description="Exipre all active local sessions and replicate the invalid sessions"
+      impact="ACTION"
+      returnType="void"/>
+    <operation
+      name="findSession"
+      description="Return the active Session, associated with this Manager, with the specified session id (if any)"
+      impact="ACTION"
+      returnType="org.apache.catalina.Session">
       <parameter
-        name="key"
-        description="key of the attribute"
+        name="id"
+        description="The session id for the session to be returned"
         type="java.lang.String"/>
     </operation>
     <operation
-      name="expireSession"
-      description="Expire a session"
+      name="findSessions"
+      description="Return the set of active Sessions associated with this Manager."
       impact="ACTION"
-      returnType="void">
+      returnType="[Lorg.apache.catalina.Session;">
+    </operation>  
+    <operation
+      name="getAllClusterSessions"
+      description="send to oldest cluster member that this node need all cluster sessions (resync member)"
+      impact="ACTION"
+      returnType="void"/>
+    <operation
+      name="getCreationTime"
+      description="Return the creatio time for this session"
+      impact="ACTION"
+      returnType="java.lang.String">
       <parameter
         name="sessionId"
-        description="Id of the session"
+        description="The session id for the session "
         type="java.lang.String"/>
-    </operation>
+    </operation>   
     <operation
       name="getLastAccessedTime"
-      description="Get the last access time"
+      description="Get the last access time. This one gets updated whenever a request finishes. "
       impact="ACTION"
       returnType="java.lang.String">
       <parameter
         name="sessionId"
         description="Id of the session"
         type="java.lang.String"/>
-    </operation>
+    </operation> 
     <operation
-      name="getCreationTime"
-      description="Get the creation time"
+      name="getSessionAttribute"
+      description="Return a session attribute"
       impact="ACTION"
       returnType="java.lang.String">
       <parameter
         name="sessionId"
         description="Id of the session"
         type="java.lang.String"/>
-    </operation>
-    <operation   name="getLastAccessedTimestamp"
-          description="Get the last access timestamp"
-               impact="ACTION"
-           returnType="long">
-      <parameter name="sessionId"
-          description="Id of the session"
-                 type="java.lang.String"/>
-    </operation>
-    <operation   name="getCreationTimestamp"
-          description="Get the creation timestamp"
-               impact="ACTION"
-           returnType="long">
-      <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="expireAllLocalSessions"
-      description="Exipre all active local sessions and replicate the invalid sessions"
+      name="getThisAccessedTime"
+      description="Get the last access time. This one gets updated whenever a request starts. "
       impact="ACTION"
-      returnType="void"/>
+      returnType="java.lang.String">
+      <parameter
+        name="sessionId"
+        description="Id of the session"
+        type="java.lang.String"/>
+    </operation> 
+    <operation
+      name="listSessionIds"
+      description="Return the list of active primary session ids"
+      impact="ACTION"
+      returnType="java.lang.String"/>
     <operation
       name="processExpires"
-      description="force process to expire sessions"
+      description="Invalidate all sessions that have expired.s"
       impact="ACTION"
       returnType="void"/>
     <operation
@@ -390,57 +405,6 @@
       description="Reset all statistics"
       impact="ACTION"
       returnType="void"/>
-    <operation
-      name="getAllClusterSessions"
-      description="send to oldest cluster member that this node need all cluster sessions (resync member)"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="SimpleTcpReplicationManager"
-    className="org.apache.catalina.mbeans.ClassNameMBean"
-    description="Clustered implementation of the Manager interface"
-    domain="Catalina"
-    group="Manager"
-    type="org.apache.catalina.ha.tcp.SimpleTcpReplicationManager">
-    <attribute
-      name="algorithm"
-      description="The message digest algorithm to be used when generating session identifiers"
-      type="java.lang.String"/>
-    <attribute
-      name="checkInterval"
-      description="The interval (in seconds) between checks for expired sessions"
-      type="int"/>
-    <attribute
-      name="className"
-      description="Fully qualified class name of the managed object"
-      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="managedResource"
-      description="The managed resource this MBean is associated with"
-      type="java.lang.Object"/>
-    <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"/>
   </mbean>
   <mbean
     name="BackupManager"
@@ -560,15 +524,51 @@
       description="Number of sessions we rejected due to maxActive beeing reached"
       type="int"/>
     <operation
-      name="listSessionIds"
-      description="Return the list of active primary session ids"
+      name="expireSession"
+      description="Expired the given session"
       impact="ACTION"
-      returnType="java.lang.String"/>
+      returnType="void">
+      <parameter
+        name="sessionId"
+        description="The session id for the session to be expired"
+        type="java.lang.String"/>
+    </operation>
     <operation
-      name="listSessionIdsFull"
-      description="Return the list of active session ids"
+      name="findSession"
+      description="Return the active Session, associated with this Manager, with the specified session id (if any)"
       impact="ACTION"
-      returnType="java.lang.String"/>
+      returnType="org.apache.catalina.Session">
+      <parameter
+        name="id"
+        description="The session id for the session to be returned"
+        type="java.lang.String"/>
+    </operation>
+    <operation
+      name="findSessions"
+      description="Return the set of active Sessions associated with this Manager."
+      impact="ACTION"
+      returnType="[Lorg.apache.catalina.Session;">
+    </operation>  
+    <operation
+      name="getCreationTime"
+      description="Return the creatio time for this session"
+      impact="ACTION"
+      returnType="java.lang.String">
+      <parameter
+        name="sessionId"
+        description="The session id for the session "
+        type="java.lang.String"/>
+    </operation>   
+    <operation
+      name="getLastAccessedTime"
+      description="Get the last access time. This one gets updated whenever a request finishes. "
+      impact="ACTION"
+      returnType="java.lang.String">
+      <parameter
+        name="sessionId"
+        description="Id of the session"
+        type="java.lang.String"/>
+    </operation> 
     <operation
       name="getSessionAttribute"
       description="Return a session attribute"
@@ -584,34 +584,251 @@
         type="java.lang.String"/>
     </operation>
     <operation
+      name="getThisAccessedTime"
+      description="Get the last access time. This one gets updated whenever a request starts. "
+      impact="ACTION"
+      returnType="java.lang.String">
+      <parameter
+        name="sessionId"
+        description="Id of the session"
+        type="java.lang.String"/>
+    </operation> 
+    <operation
+      name="listSessionIds"
+      description="Return the list of active primary session ids"
+      impact="ACTION"
+      returnType="java.lang.String"/>
+    <operation
+      name="listSessionIdsFull"
+      description="Return the list of active session ids"
+      impact="ACTION"
+      returnType="java.lang.String"/>
+    <operation
+      name="processExpires"
+      description="Invalidate all sessions that have expired.s"
+      impact="ACTION"
+      returnType="void"/>
+  </mbean>
+  <mbean
+    name="SimpleTcpReplicationManager"
+    className="org.apache.catalina.mbeans.ClassNameMBean"
+    description="Clustered implementation of the Manager interface"
+    domain="Catalina"
+    group="Manager"
+    type="org.apache.catalina.ha.tcp.SimpleTcpReplicationManager">
+    <attribute
+      name="activeSessions"
+      description="The number of active sessions"
+      type="int"/>
+    <attribute
+      name="algorithm"
+      description="The message digest algorithm to be used when generating session identifiers"
+      type="java.lang.String"/>
+    <attribute
+      name="className"
+      description="Fully qualified class name of the managed object"
+      type="java.lang.String"
+      writeable="false"/>
+    <attribute
+      name="defaultMode"
+      description="The default mode"
+      type="boolean"/>
+    <attribute
+      name="distributable"
+      description="The distributable flag for Sessions created by this Manager"
+      type="boolean"/>
+    <attribute
+      name="duplicates"
+      description="The number of duplicated session IDs generated by the random source."
+      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="The number of sessions that have expired"
+      type="int"/>  
+    <attribute
+      name="expireSessionsOnShutdown"
+      description="Should the sessions be expired on shutdown?"
+      type="boolean"/> 
+    <attribute
+      name="info"
+      description="The descriptive information about this Manager implementation"
+      type="java.lang.String"
+      writeable="false"/> 
+    <attribute
+      name="invalidatedSessions"
+      description="Invalidated sessions"
+      type="[Ljava.lang.String;"
+      writeable="false"/> 
+    <attribute
+      name="jvmRoute"
+      description="The JvmRoute for the enclosing Engine."
+      type="java.lang.String"
+      writeable="false"/>     
+    <attribute
+      name="managedResource"
+      description="The managed resource this MBean is associated with"
+      type="java.lang.Object"/>
+    <attribute
+      name="maxActive"
+      description="The highest number of concurrent active sessions"
+      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="notifyListenersOnReplication"
+      description="Should listeners be notified on replication?"
+      type="boolean"/>
+    <attribute
+      name="name"
+      description="The descriptive short name of this Manager implementation"
+      type="java.lang.String"
+      writeable="false"/>
+    <attribute
+      name="pathName"
+      description="The session persistence pathname, if any."
+      type="java.lang.String"/>
+    <attribute
+      name="printToScreen"
+      description="Log to screen"
+      type="boolean"/>
+    <attribute
+      name="processExpiresFrequency"
+      description="The manager checks frequency."
+      type="int"/>
+    <attribute
+      name="processingTime"
+      description="The processing time during session expiration"
+      type="long"/>
+    <attribute
+      name="randomClass"
+      description="The Java class name of the random number generator class to be used when generating session identifiers."
+      type="java.lang.String"/>
+    <attribute
+      name="randomFile"
+      description="The path to a random generator file, and default to java Random if not found "
+      type="java.lang.String"/>
+    <attribute
+      name="rejectedSessions"
+      description="The number of session creations that failed due to maxActiveSessions"
+      type="long"/>
+    <attribute
+      name="sessionAverageAliveTime"
+      description="The average time (in seconds) that expired sessions had been alive."
+      type="int"/>
+    <attribute
+      name="sessionCounter"
+      description="Total sessions created by this manager"
+      type="long"/>
+    <attribute
+      name="sessionIdLength"
+      description="The session id length (in bytes) for Sessions created by this Manager."
+      type="int"/>
+    <attribute
+      name="sessionMaxAliveTime"
+      description="The longest time (in seconds) that an expired session had been alive."
+      type="int"/>
+    <attribute
+      name="stateTransfered"
+      description="Is session state transfered complete? "
+      type="boolean"
+      writeable="false"/> 
+    <attribute
+      name="synchronousReplication"
+      description="Use synchronous rather than asynchronous replication."
+      type="boolean"/> 
+    <attribute
+      name="useDirtyFlag"
+      description="Use dirty flag"
+      type="boolean"/>   
+    <operation
       name="expireSession"
-      description="Expire a session"
+      description="Expired the given session"
       impact="ACTION"
       returnType="void">
       <parameter
         name="sessionId"
-        description="Id of the session"
+        description="The session id for the session to be expired"
+        type="java.lang.String"/>
+    </operation>
+    <operation
+      name="findSession"
+      description="Return the active Session, associated with this Manager, with the specified session id (if any)"
+      impact="ACTION"
+      returnType="org.apache.catalina.Session">
+      <parameter
+        name="id"
+        description="The session id for the session to be returned"
         type="java.lang.String"/>
     </operation>
     <operation
+      name="findSessions"
+      description="Return the set of active Sessions associated with this Manager."
+      impact="ACTION"
+      returnType="[Lorg.apache.catalina.Session;">
+    </operation>  
+    <operation
+      name="getCreationTime"
+      description="Return the creatio time for this session"
+      impact="ACTION"
+      returnType="java.lang.String">
+      <parameter
+        name="sessionId"
+        description="The session id for the session "
+        type="java.lang.String"/>
+    </operation>   
+    <operation
       name="getLastAccessedTime"
-      description="Get the last access time"
+      description="Get the last access time. This one gets updated whenever a request finishes. "
       impact="ACTION"
       returnType="java.lang.String">
       <parameter
         name="sessionId"
         description="Id of the session"
         type="java.lang.String"/>
-    </operation>
+    </operation> 
     <operation
-      name="getCreationTime"
-      description="Get the creation time"
+      name="getSessionAttribute"
+      description="Return a session attribute"
       impact="ACTION"
       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="getThisAccessedTime"
+      description="Get the last access time. This one gets updated whenever a request starts. "
+      impact="ACTION"
+      returnType="java.lang.String">
+      <parameter
+        name="sessionId"
+        description="Id of the session"
+        type="java.lang.String"/>
+    </operation> 
+    <operation
+      name="listSessionIds"
+      description="Return the list of active primary session ids"
+      impact="ACTION"
+      returnType="java.lang.String"/>
+    <operation
+      name="processExpires"
+      description="Invalidate all sessions that have expired.s"
+      impact="ACTION"
+      returnType="void"/>
   </mbean>
 </mbeans-descriptors>
diff --git a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
index 8b5c7d27c..03c9296a1 100644
--- a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
@@ -100,1072 +100,6 @@
       returnType="void"/>
   </mbean>
   <mbean
-    name="ClusterReceiverBase"
-    description="Tcp Cluster ReplicationListener implementation"
-    domain="Catalina"
-    group="Cluster"
-    type="org.apache.catalina.ha.tcp.ClusterReceiverBase">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="tcpListenAddress"
-      description="tcp listener address"
-      type="java.lang.String"/>
-    <attribute
-      name="tcpListenPort"
-      description="tcp listener port"
-      type="int"/>
-    <attribute
-      name="tcpThreadCount"
-      description="number of tcp listener worker threads"
-      type="int"/>
-    <attribute
-      name="tcpSelectorTimeout"
-      description="tcp listener Selector timeout"
-      type="long"/>
-    <attribute
-      name="nrOfMsgsReceived"
-      description="number of messages received from other nodes"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedTime"
-      description="total time message send time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedProcessingTime"
-      description="received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minReceivedProcessingTime"
-      description="minimal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgReceivedProcessingTime"
-      description="received processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxReceivedProcessingTime"
-      description="maximal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doReceivedProcessingStats"
-      description="create received processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="avgTotalReceivedBytes"
-      description="received totalReceivedBytes / nrOfMsgsReceived"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalReceivedBytes"
-      description="number of bytes received"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="sendAck"
-      description="send ack after data received"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="compress"
-      description="data received compressed"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="doListen"
-      description="is port really started"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="SocketReplicationListener"
-    description="Tcp Cluster SocketReplicationListener implementation"
-    domain="Catalina"
-    group="Cluster"
-    type="org.apache.catalina.ha.tcp.SocketReplicationListener">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="tcpListenAddress"
-      description="tcp listener address"
-      type="java.lang.String"/>
-    <attribute
-      name="tcpListenPort"
-      description="tcp listener port"
-      type="int"/>
-    <attribute
-      name="tcpListenMaxPort"
-      description="max tcp listen used port"
-      type="int"/>
-    <attribute
-      name="tcpListenTimeout"
-      description="max tcp listen timeout (sec) wait for ServerSocket start"
-      type="int"/>
-    <attribute
-      name="nrOfMsgsReceived"
-      description="number of messages received from other nodes"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedTime"
-      description="total time message send time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedProcessingTime"
-      description="received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minReceivedProcessingTime"
-      description="minimal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgReceivedProcessingTime"
-      description="received processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxReceivedProcessingTime"
-      description="maximal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doReceivedProcessingStats"
-      description="create received processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="avgTotalReceivedBytes"
-      description="received totalReceivedBytes / nrOfMsgsReceived"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalReceivedBytes"
-      description="number of bytes received"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="sendAck"
-      description="send ack after data received"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="compress"
-      description="data received compressed"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="doListen"
-      description="is port really started"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="ReplicationTransmitter"
-    description="Tcp replication transmitter"
-    domain="Catalina"
-    group="ClusterSender"
-    type="org.apache.catalina.ha.tcp.ReplicationTransmitter">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="replicationMode"
-      description="replication mode (synchnous,pooled.asynchnous,fastasyncqueue)"
-      type="java.lang.String"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="autoConnect"
-      description="is sender disabled, fork a new socket"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doTransmitterProcessingStats"
-      description="create processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="failureCounter"
-      description="number of wrong transfers"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="senderObjectNames"
-      description="get all sender object names"
-      type="[Ljavax.management.ObjectName;"
-      writeable="false"/>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check all sender connection for close socket (keepalive)"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="AsyncSocketSender"
-    description="Async Cluster Sender"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.AsyncSocketSender">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="queueSize"
-      writeable="false"
-      description="queue size"
-      type="int"/>
-    <attribute
-      name="queuedNrOfBytes"
-      writeable="false"
-      description="number of bytes over all queued messages"
-      type="long"/>
-    <attribute
-      name="messageTransferStarted"
-      description="message is in transfer"
-      type="boolean"
-      is="true"
-      writeable="false"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="keepAliveCount"
-      description="keep Alive request count"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="keepAliveConnectTime"
-      description="Connect time for keep alive"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doProcessingStats"
-      description="create processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitAckTime"
-      description="sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minWaitAckTime"
-      description="minimal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgWaitAckTime"
-      description="waitAck time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxWaitAckTime"
-      description="maximal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doWaitAckStats"
-      description="create waitAck time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenCounter"
-      description="counts open socket (KeepAlive and connects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenFailureCounter"
-      description="counts open socket failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketCloseCounter"
-      description="counts closed socket (KeepAlive and disconnects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="missingAckCounter"
-      description="counts missing ack"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataResendCounter"
-      description="counts data resends"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataFailureCounter"
-      description="counts data send failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="inQueueCounter"
-      description="counts all queued messages"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="outQueueCounter"
-      description="counts all successfully sended messages"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="connect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="disconnect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check connection for close socket"
-      impact="ACTION"
-      returnType="boolean"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="FastAsyncSocketSender"
-    description="Fast Async Cluster Sender"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.FastAsyncSocketSender">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="threadPriority"
-      description="change queue thread priority"
-      type="int"/>
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="queueSize"
-      writeable="false"
-      description="queue size"
-      type="int"/>
-    <attribute
-      name="queuedNrOfBytes"
-      writeable="false"
-      description="number of bytes over all queued messages"
-      type="long"/>
-    <attribute
-      name="messageTransferStarted"
-      description="message is in transfer"
-      type="boolean"
-      is="true"
-      writeable="false"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="queueAddWaitTimeout"
-      description="add wait timeout (default 10000 msec)"
-      type="long"/>
-    <attribute
-      name="queueRemoveWaitTimeout"
-      description="remove wait timeout (default 30000 msec)"
-      type="long"/>
-    <attribute
-      name="maxQueueLength"
-      description="max queue length"
-      type="int"/>
-    <attribute
-      name="queueTimeWait"
-      description="remember queue wait times"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="queueCheckLock"
-      description="check to lost locks"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="queueDoStats"
-      description="activated queue stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="keepAliveCount"
-      description="keep Alive request count"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="keepAliveConnectTime"
-      description="Connect time for keep alive"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doProcessingStats"
-      description="create Processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitAckTime"
-      description="sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minWaitAckTime"
-      description="minimal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgWaitAckTime"
-      description="waitAck time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxWaitAckTime"
-      description="maximal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doWaitAckStats"
-      description="create waitAck time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenCounter"
-      description="counts open socket (KeepAlive and connects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenFailureCounter"
-      description="counts open socket failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketCloseCounter"
-      description="counts closed socket (KeepAlive and disconnects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="missingAckCounter"
-      description="counts missing ack"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataResendCounter"
-      description="counts data resends"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataFailureCounter"
-      description="counts data send failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="inQueueCounter"
-      description="counts all queued messages"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="outQueueCounter"
-      description="counts all successfully sended messages"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="queueAddWaitTime"
-      description="queue add wait time (tomcat thread waits)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="queueRemoveWaitTime"
-      description="queue remove wait time (queue thread waits)"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="connect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="disconnect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check connection for close socket"
-      impact="ACTION"
-      returnType="boolean"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="PooledSocketSender"
-    description="Pooled Cluster Sender"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.PooledSocketSender">
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="maxPoolSocketLimit"
-      description="Max parallel sockets"
-      type="int"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="start Queue to connect to ohter replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="stop Queue to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="SocketSender"
-    description="Sync Cluster Sender"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.SocketSender">
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="messageTransferStarted"
-      description="message is in transfer"
-      type="boolean"
-      is="true"
-      writeable="false"/>
-    <attribute
-      name="keepAliveCount"
-      description="keep Alive request count"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="keepAliveConnectTime"
-      description="Connect time for keep alive"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doProcessingStats"
-      description="create Processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitAckTime"
-      description="sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minWaitAckTime"
-      description="minimal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgWaitAckTime"
-      description="waitAck time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxWaitAckTime"
-      description="maximal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doWaitAckStats"
-      description="create waitAck time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketCloseCounter"
-      description="counts closed socket (KeepAlive and disconnects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenFailureCounter"
-      description="counts open socket failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenCounter"
-      description="counts open socket (KeepAlive and connects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="missingAckCounter"
-      description="counts missing ack"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataResendCounter"
-      description="counts data resends"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataFailureCounter"
-      description="counts data send failures"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="connect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="disconnect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check connection for close socket"
-      impact="ACTION"
-      returnType="boolean"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
     name="ReplicationValve"
     description="Valve for simple tcp replication"
     domain="Catalina"
diff --git a/java/org/apache/catalina/tribes/mbeans-descriptors.xml b/java/org/apache/catalina/tribes/mbeans-descriptors.xml
deleted file mode 100644
index 3cc658346..000000000
--- a/java/org/apache/catalina/tribes/mbeans-descriptors.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<mbeans-descriptors>
-  <mbean
-    name="SimpleTcpCluster"
-    className="org.apache.catalina.mbeans.ClassNameMBean"
-    description="Tcp Cluster implementation"
-    domain="Catalina"
-    group="Cluster"
-    type="org.apache.catalina.ha.tcp.SimpleTcpCluster">
-    <attribute
-      name="protocolStack"
-      description="JavaGroups protocol stack selection"
-      type="java.lang.String"/>
-  </mbean>
-  <mbean
-    name="SimpleTcpReplicationManager"
-    className="org.apache.catalina.mbeans.ClassNameMBean"
-    description="Clustered implementation of the Manager interface"
-    domain="Catalina"
-    group="Manager"
-    type="org.apache.catalina.ha.tcp.SimpleTcpReplicationManager">
-    <attribute
-      name="algorithm"
-      description="The message digest algorithm to be used when generating
-                       session identifiers"
-      type="java.lang.String"/>
-    <attribute
-      name="checkInterval"
-      description="The interval (in seconds) between checks for expired
-                       sessions"
-      type="int"/>
-    <attribute
-      name="className"
-      description="Fully qualified class name of the managed object"
-      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="managedResource"
-      description="The managed resource this MBean is associated with"
-      type="java.lang.Object"/>
-    <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"/>
-  </mbean>
-  <mbean
-    name="ReplicationValve"
-    className="org.apache.catalina.mbeans.ClassNameMBean"
-    description="Valve for simple tcp replication"
-    domain="Catalina"
-    group="Valve"
-    type="org.apache.catalina.ha.tcp.ReplicationValve">
-    <attribute
-      name="className"
-      description="Fully qualified class name of the managed object"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="debug"
-      description="The debugging detail level for this component"
-      type="int"/>
-  </mbean>
-</mbeans-descriptors>
diff --git a/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml b/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
deleted file mode 100644
index ca0722c37..000000000
--- a/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
+++ /dev/null
@@ -1,991 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE mbeans-descriptors PUBLIC
-   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
-   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
-<mbeans-descriptors>
-  <mbean
-    name="SimpleTcpCluster"
-    description="Tcp Cluster implementation"
-    domain="Catalina"
-    group="Cluster"
-    type="org.apache.catalina.ha.tcp.SimpleTcpCluster">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="notifyLifecycleListenerOnFailure"
-      description="notify lifecycleListener from message transfer failure"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="clusterName"
-      description="name of cluster"
-      type="java.lang.String"/>
-    <attribute
-      name="managerClassName"
-      description="session mananager classname"
-      type="java.lang.String"/>
-    <attribute
-      name="clusterLogName"
-      description="Name of cluster transfer log device"
-      type="java.lang.String"/>
-    <attribute
-      name="doClusterLog"
-      is="true"
-      description="enable cluster log transfer logging"
-      type="boolean"/>
-    <operation
-      name="setProperty"
-      description="set a property to all cluster managers (with prefix 'manager.')"
-      impact="ACTION"
-      returnType="void">
-      <parameter
-        name="key"
-        description="Property name"
-        type="java.lang.String"/>
-      <parameter
-        name="value"
-        description="Property value"
-        type="java.lang.String"/>
-    </operation>
-    <operation
-      name="send"
-      description="send message to all cluster members"
-      impact="ACTION"
-      returnType="void">
-      <parameter
-        name="message"
-        description="replication message"
-        type="org.apache.catalina.ha.ClusterMessage"/>
-    </operation>
-    <operation
-      name="sendClusterDomain"
-      description="send message to all cluster members with same domain"
-      impact="ACTION"
-      returnType="void">
-      <parameter
-        name="message"
-        description="replication message"
-        type="org.apache.catalina.ha.ClusterMessage"/>
-    </operation>
-    <operation
-      name="sendToMember"
-      description="send message to one cluster member"
-      impact="ACTION"
-      returnType="void">
-      <parameter
-        name="message"
-        description="replication message"
-        type="org.apache.catalina..cluster.ClusterMessage"/>
-      <parameter
-        name="member"
-        description="cluster member"
-        type="java.lang.String"/>
-    </operation>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="ClusterReceiverBase"
-    description="Tcp Cluster NioReceiver implementation"
-    domain="Catalina"
-    group="Cluster"
-    type="org.apache.catalina.ha.tcp.ClusterReceiverBase">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="tcpListenAddress"
-      description="tcp listener address"
-      type="java.lang.String"/>
-    <attribute
-      name="tcpListenPort"
-      description="tcp listener port"
-      type="int"/>
-    <attribute
-      name="tcpThreadCount"
-      description="number of tcp listener worker threads"
-      type="int"/>
-    <attribute
-      name="tcpSelectorTimeout"
-      description="tcp listener Selector timeout"
-      type="long"/>
-    <attribute
-      name="nrOfMsgsReceived"
-      description="number of messages received from other nodes"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedTime"
-      description="total time message send time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedProcessingTime"
-      description="received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minReceivedProcessingTime"
-      description="minimal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgReceivedProcessingTime"
-      description="received processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxReceivedProcessingTime"
-      description="maximal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doReceivedProcessingStats"
-      description="create received processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="avgTotalReceivedBytes"
-      description="received totalReceivedBytes / nrOfMsgsReceived"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalReceivedBytes"
-      description="number of bytes received"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="sendAck"
-      description="send ack after data received"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="compress"
-      description="data received compressed"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="doListen"
-      description="is port really started"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="SocketReplicationListener"
-    description="Tcp Cluster SocketReplicationListener implementation"
-    domain="Catalina"
-    group="Cluster"
-    type="org.apache.catalina.ha.tcp.SocketReplicationListener">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="tcpListenAddress"
-      description="tcp listener address"
-      type="java.lang.String"/>
-    <attribute
-      name="tcpListenPort"
-      description="tcp listener port"
-      type="int"/>
-    <attribute
-      name="tcpListenMaxPort"
-      description="max tcp listen used port"
-      type="int"/>
-    <attribute
-      name="tcpListenTimeout"
-      description="max tcp listen timeout (sec) wait for ServerSocket start"
-      type="int"/>
-    <attribute
-      name="nrOfMsgsReceived"
-      description="number of messages received from other nodes"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedTime"
-      description="total time message send time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="receivedProcessingTime"
-      description="received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minReceivedProcessingTime"
-      description="minimal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgReceivedProcessingTime"
-      description="received processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxReceivedProcessingTime"
-      description="maximal received processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doReceivedProcessingStats"
-      description="create received processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="avgTotalReceivedBytes"
-      description="received totalReceivedBytes / nrOfMsgsReceived"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalReceivedBytes"
-      description="number of bytes received"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="sendAck"
-      description="send ack after data received"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="compress"
-      description="data received compressed"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="doListen"
-      description="is port really started"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="ReplicationTransmitter"
-    description="Tcp replication transmitter"
-    domain="Catalina"
-    group="ClusterSender"
-    type="org.apache.catalina.ha.tcp.ReplicationTransmitter">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="replicationMode"
-      description="replication mode (synchnous,pooled.asynchnous,fastasyncqueue)"
-      type="java.lang.String"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="autoConnect"
-      description="is sender disabled, fork a new socket"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doTransmitterProcessingStats"
-      description="create processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="failureCounter"
-      description="number of wrong transfers"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="senderObjectNames"
-      description="get all sender object names"
-      type="[Ljavax.management.ObjectName;"
-      writeable="false"/>
-    <operation
-      name="start"
-      description="Start the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="stop"
-      description="Stop the cluster"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check all sender connection for close socket (keepalive)"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="AsyncSocketSender"
-    description="Async Cluster Sender"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.AsyncSocketSender">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="queueSize"
-      writeable="false"
-      description="queue size"
-      type="int"/>
-    <attribute
-      name="queuedNrOfBytes"
-      writeable="false"
-      description="number of bytes over all queued messages"
-      type="long"/>
-    <attribute
-      name="messageTransferStarted"
-      description="message is in transfer"
-      type="boolean"
-      is="true"
-      writeable="false"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="keepAliveCount"
-      description="keep Alive request count"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="keepAliveConnectTime"
-      description="Connect time for keep alive"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doProcessingStats"
-      description="create processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitAckTime"
-      description="sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minWaitAckTime"
-      description="minimal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgWaitAckTime"
-      description="waitAck time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxWaitAckTime"
-      description="maximal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doWaitAckStats"
-      description="create waitAck time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenCounter"
-      description="counts open socket (KeepAlive and connects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenFailureCounter"
-      description="counts open socket failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketCloseCounter"
-      description="counts closed socket (KeepAlive and disconnects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="missingAckCounter"
-      description="counts missing ack"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataResendCounter"
-      description="counts data resends"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataFailureCounter"
-      description="counts data send failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="inQueueCounter"
-      description="counts all queued messages"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="outQueueCounter"
-      description="counts all successfully sended messages"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="connect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="disconnect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check connection for close socket"
-      impact="ACTION"
-      returnType="boolean"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="MultiSocketSender"
-    description="Multi Socket Sender, more than one socket per member"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.PooledSocketSender">
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="maxPoolSocketLimit"
-      description="Max parallel sockets"
-      type="int"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="start Queue to connect to ohter replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="stop Queue to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="SocketSender"
-    description="Sync Cluster Sender"
-    domain="Catalina"
-    group="IDataSender"
-    type="org.apache.catalina.ha.tcp.SocketSender">
-    <attribute
-      name="address"
-      description="sender ip address"
-      type="java.net.InetAddress"
-      writeable="false"/>
-    <attribute
-      name="port"
-      description="sender port"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="suspect"
-      description="Socket is gone"
-      type="boolean"/>
-    <attribute
-      name="ackTimeout"
-      description="acknowledge timeout"
-      type="long"/>
-    <attribute
-      name="waitForAck"
-      description="Wait for ack after data send"
-      is="true"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="keepAliveTimeout"
-      description="active socket keep alive timeout"
-      type="long"/>
-    <attribute
-      name="keepAliveMaxRequestCount"
-      description="max request over this socket"
-      type="int"/>
-    <attribute
-      name="messageTransferStarted"
-      description="message is in transfer"
-      type="boolean"
-      is="true"
-      writeable="false"/>
-    <attribute
-      name="keepAliveCount"
-      description="keep Alive request count"
-      type="int"
-      writeable="false"/>
-    <attribute
-      name="keepAliveConnectTime"
-      description="Connect time for keep alive"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="resend"
-      description="after send failure make a resend"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connected"
-      is="true"
-      description="socket connected"
-      type="boolean"
-      writeable="false"/>
-    <attribute
-      name="avgMessageSize"
-      writeable="false"
-      description="avg message size (totalbytes/nrOfRequests"
-      type="long"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of send messages to other members"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalBytes"
-      description="number of bytes transfered"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="processingTime"
-      description="sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minProcessingTime"
-      description="minimal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgProcessingTime"
-      description="processing time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxProcessingTime"
-      description="maximal sending processing time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doProcessingStats"
-      description="create Processing time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="waitAckTime"
-      description="sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="minWaitAckTime"
-      description="minimal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="avgWaitAckTime"
-      description="waitAck time / nrOfRequests"
-      type="double"
-      writeable="false"/>
-    <attribute
-      name="maxWaitAckTime"
-      description="maximal sending waitAck time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="doWaitAckStats"
-      description="create waitAck time stats"
-      is="true"
-      type="boolean"/>
-    <attribute
-      name="connectCounter"
-      description="counts connects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="disconnectCounter"
-      description="counts disconnects"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketCloseCounter"
-      description="counts closed socket (KeepAlive and disconnects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenFailureCounter"
-      description="counts open socket failures"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="socketOpenCounter"
-      description="counts open socket (KeepAlive and connects)"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="missingAckCounter"
-      description="counts missing ack"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataResendCounter"
-      description="counts data resends"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="dataFailureCounter"
-      description="counts data send failures"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="connect"
-      description="connect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="disconnect"
-      description="disconnect to other replication node"
-      impact="ACTION"
-      returnType="void"/>
-    <operation
-      name="checkKeepAlive"
-      description="Check connection for close socket"
-      impact="ACTION"
-      returnType="boolean"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-  <mbean
-    name="ReplicationValve"
-    description="Valve for simple tcp replication"
-    domain="Catalina"
-    group="Valve"
-    type="org.apache.catalina.ha.tcp.ReplicationValve">
-    <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="filter"
-      description="resource filter to disable session replication check"
-      type="java.lang.String"/>
-    <attribute
-      name="primaryIndicator"
-      is="true"
-      description="set indicator that request processing is at primary session node"
-      type="boolean"/>
-    <attribute
-      name="primaryIndicatorName"
-      description="Request attribute name to indicate that request processing is at primary session node"
-      type="java.lang.String"/>
-    <attribute
-      name="doProcessingStats"
-      is="true"
-      description="active statistics counting"
-      type="boolean"/>
-    <attribute
-      name="nrOfRequests"
-      description="number of replicated requests"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="nrOfFilterRequests"
-      description="number of filtered requests"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="nrOfSendRequests"
-      description="number of send requests"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="nrOfCrossContextSendRequests"
-      description="number of send cross context session requests"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalRequestTime"
-      description="total replicated request time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalSendTime"
-      description="total replicated send time"
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="lastSendTime"
-      description="last replicated request time"
-      type="long"
-      writeable="false"/>
-    <operation
-      name="resetStatistics"
-      description="Reset all statistics"
-      impact="ACTION"
-      returnType="void"/>
-  </mbean>
-</mbeans-descriptors>
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 08de55605..504f70631 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -16,135 +16,6 @@
   limitations under the License.
 -->
 <mbeans-descriptors>
-
-  <mbean         name="JDBCUserDatabase"
-            className="org.apache.catalina.mbeans.JDBCUserDatabaseMBean"
-          description="JDBC based user and group database"
-               domain="Users"
-                group="UserDatabase"
-                 type="org.apache.catalina.users.JDBCUserDatabase">
-
-    <attribute   name="groups"
-          description="MBean Names of all defined groups"
-                 type="[Ljava.lang.String;"
-            writeable="false"/>
-
-    <attribute   name="roles"
-          description="MBean Names of all defined roles"
-                 type="[Ljava.lang.String;"
-            writeable="false"/>
-
-    <attribute   name="users"
-          description="MBean Names of all defined users"
-                 type="[Ljava.lang.String;"
-            writeable="false"/>
-
-    <operation   name="createGroup"
-          description="Create new group and return MBean name"
-               impact="ACTION"
-           returnType="java.lang.String">
-      <parameter name="groupname"
-          description="Group name of the new group"
-                 type="java.lang.String"/>
-      <parameter name="description"
-          description="Description of the new group"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="createRole"
-          description="Create new role and return MBean name"
-               impact="ACTION"
-           returnType="java.lang.String">
-      <parameter name="rolename"
-          description="Role name of the new role"
-                 type="java.lang.String"/>
-      <parameter name="description"
-          description="Description of the new role"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="createUser"
-          description="Create new user and return MBean name"
-               impact="ACTION"
-           returnType="java.lang.String">
-      <parameter name="username"
-          description="User name of the new user"
-                 type="java.lang.String"/>
-      <parameter name="password"
-          description="Password of the new user"
-                 type="java.lang.String"/>
-      <parameter name="fullName"
-          description="Full name of the new user"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="findGroup"
-          description="Return MBean Name of the specified group (if any)"
-               impact="INFO"
-           returnType="java.lang.String">
-      <parameter name="groupname"
-          description="Group name of the requested group"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="findRole"
-          description="Return MBean Name of the specified role (if any)"
-               impact="INFO"
-           returnType="java.lang.String">
-      <parameter name="rolename"
-          description="Role name of the requested role"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="findUser"
-          description="Return MBean Name of the specified user (if any)"
-               impact="INFO"
-           returnType="java.lang.String">
-      <parameter name="username"
-          description="User name of the requested user"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="removeGroup"
-          description="Remove existing group (and all user memberships)"
-               impact="ACTION"
-           returnType="void">
-      <parameter name="groupname"
-          description="Group name of the group to remove"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="removeRole"
-          description="Remove existing role"
-               impact="ACTION"
-           returnType="void">
-      <parameter name="rolename"
-          description="Role name of the role to remove"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="removeUser"
-          description="Remove existing user (and all group memberships)"
-               impact="ACTION"
-           returnType="void">
-      <parameter name="username"
-          description="User name of the user to remove"
-                 type="java.lang.String"/>
-    </operation>
-
-    <operation   name="save"
-          description="Save current users and groups to persistent storage"
-               impact="ACTION"
-           returnType="void">
-    </operation>
-
-
-    <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>
-
   <mbean         name="MemoryUserDatabase"
             className="org.apache.catalina.mbeans.MemoryUserDatabaseMBean"
           description="In-memory user and group database"
@@ -280,13 +151,5 @@
                impact="ACTION"
            returnType="void">
     </operation>
-
-
-    <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>
-
-
 </mbeans-descriptors>
diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml
index d6adb0f41..ea60cd7fd 100644
--- a/java/org/apache/catalina/valves/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml
@@ -22,29 +22,51 @@
          domain="Catalina"
          group="Valve"
          type="org.apache.catalina.valves.AccessLogValve">
+         
+    <attribute name="asyncSupported"
+               description="Does this valve support async reporting."
+               type="boolean"/>
+
+    <attribute name="buffered"
+               description="Flag to buffering."
+               is="true"
+               type="boolean"/>
+
+    <attribute name="checkExists"
+               description="Check for file existence before logging."
+               is="true"
+               type="boolean"/>
 
     <attribute name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
                writeable="false"/>
 
-    <attribute name="info"
-               description="Information about this implementation"
-               type="java.lang.String"
-               writeable="false"/>
-
-     <attribute name="enabled"
-               description="Enable Access Logging"
-               is="true"
-               type="boolean"/>
-
+    <attribute name="condition"
+               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"
+               description="Enable Access Logging"
+               is="true"
+               type="boolean"/>
+
+    <attribute name="fileDateFormat"
+               description="The format for the date date based log rotation."
+               type="java.lang.String"/>
+               
+    <attribute name="info"
+               description="Information about this implementation"
+               type="java.lang.String"
+               writeable="false"/>
 
     <attribute   name="pattern"
                description="The pattern used to format our access log lines"
@@ -67,24 +89,6 @@
     <attribute name="suffix"
                description="The suffix that is added to log file filenames"
                type="java.lang.String"/>
-
-    <attribute name="condition"
-               description="The value to look for conditional logging."
-               type="java.lang.String"/>
-
-    <attribute name="fileDateFormat"
-               description="The format for the date date based log rotation."
-               type="java.lang.String"/>
-
-    <attribute name="buffered"
-               description="Flag to buffering."
-               is="true"
-               type="boolean"/>
-
-    <attribute name="checkExists"
-               description="Check for file existence before logging."
-               is="true"
-               type="boolean"/>
     
     <operation name="rotate"
                description="Move the existing log file to a new name"
@@ -103,6 +107,10 @@
          group="Valve"
          type="org.apache.catalina.valves.ErrorReportValve">
 
+    <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"
@@ -112,6 +120,11 @@
                description="Object name of the container"
                type="javax.management.ObjectName"/>
 
+    <attribute name="info"
+               description="Information about this implementation"
+               type="java.lang.String"
+               writeable="false"/>
+
   </mbean>
 
   <mbean name="ExtendedAccessLogValve"
@@ -120,101 +133,53 @@
          group="Valve"
          type="org.apache.catalina.valves.ExtendedAccessLogValve">
 
-    <attribute name="className"
-               description="Fully qualified class name of the managed object"
-               type="java.lang.String"
-               writeable="false"/>
-
-    <attribute name="info"
-               description="Information about this implementation"
-               type="java.lang.String"
-               writeable="false"/>
-
-     <attribute name="enabled"
-               description="Enable Access Logging"
-               is="true"
+    <attribute name="asyncSupported"
+               description="Does this valve support async reporting."
                type="boolean"/>
- 
-    <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="pattern"
-               description="The pattern used to format our access log lines"
-               type="java.lang.String"/>
-
-    <attribute name="prefix"
-               description="The prefix that is added to log file filenames"
-               type="java.lang.String"/>
-
-    <attribute name="rotatable"
-               description="Rotate log"
+    <attribute name="buffered"
+               description="Flag to buffering."
                is="true"
                type="boolean"/>
 
-    <attribute name="condition"
-               description="The value to look for conditional logging."
-               type="java.lang.String"/>
-
     <attribute name="checkExists"
-               description="Check for file existence before each logging."
-               is="true"
-               type="boolean"/>
-
-    <attribute name="suffix"
-               description="The suffix that is added to log file filenames"
-               type="java.lang.String"/>
-
-    <attribute name="fileDateFormat"
-               description="The format for the date date based log rotation."
-               type="java.lang.String"/>
-
-    <attribute name="buffered"
-               description="Flag to buffering."
+               description="Check for file existence before logging."
                is="true"
                type="boolean"/>
 
-    <operation name="rotate"
-               description="Move the existing log file to a new name"
-               impact="ACTION"
-               returnType="boolean">
-      <parameter name="newFileName"
-                 description="File name to move the log file to."
-                 type="java.lang.String"/>
-    </operation>
-
-  </mbean>
-
-  <mbean name="FastCommonAccessLogValve"
-         description="Valve that generates a web server access log"
-         domain="Catalina"
-         group="Valve"
-         type="org.apache.catalina.valves.FastCommonAccessLogValve">
-
     <attribute name="className"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"
                writeable="false"/>
 
-    <attribute name="enabled"
-               description="Enable Access Logging"
-               is="true"
-               type="boolean"/>
-
+    <attribute name="condition"
+               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"
+               description="Enable Access Logging"
+               is="true"
+               type="boolean"/>
+
+    <attribute name="fileDateFormat"
+               description="The format for the date date based log rotation."
+               type="java.lang.String"/>
+               
+    <attribute name="info"
+               description="Information about this implementation"
+               type="java.lang.String"
+               writeable="false"/>
 
     <attribute   name="pattern"
-               description="The pattern used to format our access log lines, which must be either common or combined"
+               description="The pattern used to format our access log lines"
                type="java.lang.String"/>
 
     <attribute name="prefix"
@@ -235,13 +200,15 @@
                description="The suffix that is added to log file filenames"
                type="java.lang.String"/>
 
-    <attribute name="condition"
-               description="The value to look for conditional logging."
-               type="java.lang.String"/>
+    <operation name="rotate"
+               description="Move the existing log file to a new name"
+               impact="ACTION"
+               returnType="boolean">
+      <parameter name="newFileName"
+                 description="File name to move the log file to."
+                 type="java.lang.String"/>
+    </operation>
 
-    <attribute name="fileDateFormat"
-               description="The format for the date date based log rotation."
-               type="java.lang.String"/>
   </mbean>
 
   <mbean name="SemaphoreValve"
@@ -249,6 +216,14 @@
          domain="Catalina"
          group="Valve"
          type="org.apache.catalina.valves.SemaphoreValve">
+         
+    <attribute name="asyncSupported"
+               description="Does this valve support async reporting."
+               type="boolean"/>
+               
+    <attribute name="block"
+               description="Should this be blocked until a permit is available?"
+               type="boolean"/>
 
     <attribute name="className"
                description="Fully qualified class name of the managed object"
@@ -266,7 +241,16 @@
     <attribute name="fairness"
                description="Use a fair semaphore"
                type="boolean"/>
-
+               
+    <attribute name="info"
+               description="Information about this implementation"
+               type="java.lang.String"
+               writeable="false"/>
+               
+    <attribute name="interruptible"
+               description="Should this be blocked interruptibly until a permit is availabl?"
+               type="boolean"/>
+               
   </mbean>
 
   <mbean name="RemoteAddrValve"
@@ -278,6 +262,10 @@
     <attribute name="allow"
                description="The comma-delimited set of allow expressions"
                type="java.lang.String"/>
+               
+    <attribute name="asyncSupported"
+               description="Does this valve support async reporting."
+               type="boolean"/>
 
     <attribute name="containerName"
                description="Object name of the container"
@@ -291,20 +279,27 @@
     <attribute   name="deny"
                description="The comma-delimited set of deny expressions"
                type="java.lang.String"/>
+               
+    <attribute name="info"
+               description="Information about this implementation"
+               type="java.lang.String"
+               writeable="false"/>
 
   </mbean>
 
   <mbean name="RemoteHostValve"
-         description="Concrete implementation of RequestFilterValve that
-         filters based on the string representation of the remote
-         client's host name"
+         description="Concrete implementation of RequestFilterValve that filters based on the string representation of the remote client's host name"
          domain="Catalina"
          group="Valve"
          type="org.apache.catalina.valves.RemoteHostValve">
 
-    <attribute   name="allow"
+    <attribute name="allow"
                description="The comma-delimited set of allow expressions"
                type="java.lang.String"/>
+               
+    <attribute name="asyncSupported"
+               description="Does this valve support async reporting."
+               type="boolean"/>
 
     <attribute name="containerName"
                description="Object name of the container"
@@ -318,41 +313,12 @@
     <attribute   name="deny"
                description="The comma-delimited set of deny expressions"
                type="java.lang.String"/>
-
-  </mbean>
-
-  <mbean name="RequestDumperValve"
-         description="Implementation of a Valve that logs interesting contents from the specified Request and the corresponding Response"
-         domain="Catalina"
-         group="Valve"
-         type="org.apache.catalina.valves.RequestDumperValve">
-
-    <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"
-               writeable="false"/>
-
-  </mbean>
-
-  <mbean name="RequestListenerValve"
-         description="Valve that handles request initialization and destroy events"
-         domain="Catalina"
-         group="Valve"
-         type="org.apache.catalina.valves.RequestListenerValve">
-
-    <attribute   name="className"
-               description="Fully qualified class name of the managed object"
+               
+    <attribute name="info"
+               description="Information about this implementation"
                type="java.lang.String"
                writeable="false"/>
 
-    <attribute name="containerName"
-               description="Object name of the container"
-               type="javax.management.ObjectName"/>
-
   </mbean>
 
   <mbean name="RemoteIpValve"
@@ -360,11 +326,10 @@
          domain="Catalina"
          group="Valve"
          type="org.apache.catalina.valves.RemoteIpValve">
-    
-    <attribute name="internalProxies"
-               description="Comma delimited list of internal proxies"
-               type="java.lang.String"
-               writeable="false" />
+         
+    <attribute name="asyncSupported"
+               description="Does this valve support async reporting."
+               type="boolean"/>
 
     <attribute name="httpServerPort"
                description="Value returned by ServletRequest.getServerPort() when the protocolHeader indicates http protocol"
@@ -375,6 +340,16 @@
                description="Value returned by ServletRequest.getServerPort() when the protocolHeader indicates https protocol"
                type="java.lang.String"
                writeable="false" />
+               
+    <attribute name="info"
+               description="Information about this implementation"
+               type="java.lang.String"
+               writeable="false"/>
+               
+    <attribute name="internalProxies"
+               description="Comma delimited list of internal proxies"
+               type="java.lang.String"
+               writeable="false" />
     
     <attribute name="protocolHeader"
                description="The protocol header (e.g. &quot;X-Forwarded-Proto&quot;)"