From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 2 Jul 2010 18:25:54 +0000 (+0000)
Subject: Further MBean improvements.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=33fb39a611567756e1a42d3421cdc6fc657e063f;p=tomcat7.0

Further MBean improvements.
Patch provided by chamith buddhika

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

diff --git a/java/org/apache/catalina/ha/mbeans-descriptors.xml b/java/org/apache/catalina/ha/mbeans-descriptors.xml
deleted file mode 100644
index 68243bc95..000000000
--- a/java/org/apache/catalina/ha/mbeans-descriptors.xml
+++ /dev/null
@@ -1,149 +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="className"
-      description="Fully qualified class name of the managed object"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="channelSendOptions"
-      description="Flag to indicate trigger behaviour when message is being sent through the channel"
-      type="int"/>
-    <attribute
-      name="channelStartOptions"
-      description="This flag indicates desired start and stop sequences of the channel"
-      type="int"/>
-    <attribute
-      name="clusterName"
-      description="The name of the cluster that this Server is currently configured to operate within."
-      type="java.lang.String"/>
-    <attribute
-      name="heartbeatBackgroundEnabled"
-      description="Heartbeat enable flag (default false)"
-      type="boolean"/>
-    <attribute
-      name="notifyLifecycleListenerOnFailure"
-      description="Whether to notify LifecycleListener on faliure?"
-      type="boolean"/>
-  </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="asyncSupported"
-      description="Does this valve support async reporting? "
-      type="boolean"/>
-    <attribute
-      name="className"
-      description="Fully qualified class name of the managed object"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="nrOfCrossContextSendRequests"
-      description="The number of cross context send requests."
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="nrOfFilterRequests"
-      description="The number of filter requests. "
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="primaryIndicator"
-      description="Is this the primary indicator? "
-      type="boolean"/>
-    <attribute
-      name="primaryIndicatorName"
-      description="The primary indicator name."
-      type="java.lang.String"/>
-    <attribute
-      name="totalRequestTime"
-      description="The total request time."
-      type="long"
-      writeable="false"/>
-    <attribute
-      name="totalSendTime"
-      description="The total send time."
-      type="long"
-      writeable="false"/>
-  </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 2a8eda174..8b5c7d27c 100644
--- a/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
@@ -24,36 +24,35 @@
     group="Cluster"
     type="org.apache.catalina.ha.tcp.SimpleTcpCluster">
     <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
+      name="channelSendOptions"
+      description="This sets channel behaviour on sent messages."
+      type="int"/>
     <attribute
-      name="notifyLifecycleListenerOnFailure"
-      description="notify lifecycleListener from message transfer failure"
-      is="true"
-      type="boolean"/>
+      name="channelStartOptions"
+      description="This sets channel start behaviour."
+      type="java.lang.String"/>
+    <attribute
+      name="clusterName"
+      description="name of cluster"
+      type="java.lang.String"/>
     <attribute
       name="heartbeatBackgroundEnabled"
       description="enable that container background thread call channel heartbeat, default is that channel mangage heartbeat itself."
       is="true"
       type="boolean"/>
     <attribute
-      name="clusterName"
-      description="name of cluster"
-      type="java.lang.String"/>
+      name="info"
+      description="Class version info"
+      type="java.lang.String"
+      writeable="false"/>
     <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"
+      name="notifyLifecycleListenerOnFailure"
+      description="notify lifecycleListener from message transfer failure"
       is="true"
-      description="enable cluster log transfer logging"
       type="boolean"/>
     <operation
       name="setProperty"
@@ -1173,31 +1172,31 @@
     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"
+      name="asyncSupported"
+      description="Does this valve support async reporting?"
       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"
+      name="filter"
+      description="resource filter to disable session replication check"
+      type="java.lang.String"/>
+    <attribute
+      name="info"
+      description="Class version info"
+      type="java.lang.String"
+      writeable="false"/>
+    <attribute
+      name="lastSendTime"
+      description="last replicated request time"
+      type="long"
+      writeable="false"/>
+    <attribute
+      name="nrOfCrossContextSendRequests"
+      description="number of send cross context session requests"
       type="long"
       writeable="false"/>
     <attribute
@@ -1211,23 +1210,27 @@
       type="long"
       writeable="false"/>
     <attribute
-      name="nrOfCrossContextSendRequests"
-      description="number of send cross context session requests"
+      name="nrOfRequests"
+      description="number of replicated requests"
       type="long"
       writeable="false"/>
     <attribute
-      name="totalRequestTime"
-      description="total replicated request time"
-      type="long"
-      writeable="false"/>
+      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="totalSendTime"
       description="total replicated send time"
       type="long"
       writeable="false"/>
     <attribute
-      name="lastSendTime"
-      description="last replicated request time"
+      name="totalRequestTime"
+      description="total replicated request time"
       type="long"
       writeable="false"/>
     <operation
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java b/java/org/apache/catalina/tribes/membership/McastService.java
index 2d8c5c4f3..5b1ba707a 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -241,18 +241,50 @@ public class McastService implements MembershipService,MembershipListener,Messag
     public void setRecoveryCounter(int recoveryCounter) {
         properties.setProperty("recoveryCounter", String.valueOf(recoveryCounter));
     }
+    
+    public int getRecoveryCounter(){
+    	String p = properties.getProperty("recoveryCounter");
+    	if(p != null){
+    		return new Integer(p).intValue();
+    	}
+    	return -1;
+    }
 
     public void setRecoveryEnabled(boolean recoveryEnabled) {
         properties.setProperty("recoveryEnabled", String.valueOf(recoveryEnabled));
     }
+    
+    public boolean getRecoveryEnabled() {
+    	String p = properties.getProperty("recoveryEnabled");
+    	if(p != null){
+    		return new Boolean(p).booleanValue();
+    	}
+    	return false;
+    }
 
     public void setRecoverySleepTime(long recoverySleepTime) {
         properties.setProperty("recoverySleepTime", String.valueOf(recoverySleepTime));
     }
+    
+    public long getRecoverySleepTime(){
+    	String p = properties.getProperty("recoverySleepTime");
+    	if(p != null){
+    		return new Long(p).longValue();
+    	}
+    	return -1;
+    }
 
     public void setLocalLoopbackDisabled(boolean localLoopbackDisabled) {
         properties.setProperty("localLoopbackDisabled",String.valueOf(localLoopbackDisabled));
     }
+    
+    public boolean getLocalLoopbackDisabled(boolean localLoopbackDisabled) {
+    	String p = properties.getProperty("localLoopbackDisabled");
+    	if(p != null){
+    		return new Boolean(p).booleanValue();
+    	}
+    	return false;
+    }
 
     /**
      * @deprecated use getPort()
diff --git a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
index 3ec5949ee..2a3ca35ad 100644
--- a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
@@ -24,41 +24,44 @@
     group="Cluster"
     type="org.apache.catalina.tribes.membership.McastService">
     <attribute
-      name="info"
-      description="Class version info"
-      type="java.lang.String"
-      writeable="false"/>
-    <attribute
-      name="mcastAddr"
+      name="address"
       description="Multicast IP Address"
       type="java.lang.String"/>
     <attribute
-      name="mcastBindAddress"
+      name="bind"
       description="Multicast IP Interface address (default auto)"
       type="java.lang.String"/>
     <attribute
-      name="mcastPort"
-      description="Multicast UDP Port"
-      type="int"/>
+      name="dropTime"
+      description="Timeout from frequency ping after member disapper notify"
+      type="long"/>
     <attribute
-      name="mcastFrequency"
+      name="frequency"
       description="Ping Frequency at msec"
       type="long"/>
     <attribute
-      name="mcastClusterDomain"
-      description="Cluster Domain of this member"
-      type="java.lang.String"/>
+      name="info"
+      description="Class version info"
+      type="java.lang.String"
+      writeable="false"/>
     <attribute
-      name="mcastDropTime"
-      description="Timeout from frequency ping after member disapper notify"
-      type="long"/>
+      name="localLoopbackDisabled"
+      description="Is local loopback disabled?"
+      is="true"
+      type="boolean"/>
     <attribute
-      name="mcastSoTimeout"
-      description="Multicast Socket Timeout"
-      type="int"/>
+      name="localMemberName"
+      description="Complete local receiver information"
+      type="java.lang.String"
+      writeable="false"/>
     <attribute
-      name="mcastTTL"
-      description=""
+      name="membersByName"
+      description="Complete remote sender information"
+      type="[Ljava.lang.String;"
+      writeable="false"/>
+    <attribute
+      name="port"
+      description="Multicast UDP Port"
       type="int"/>
     <attribute
       name="recoveryCounter"
@@ -74,15 +77,13 @@
       description="Sleep time between next socket recovery (5000 msec)"
       type="long"/>
     <attribute
-      name="localMemberName"
-      description="Complete local receiver information"
-      type="java.lang.String"
-      writeable="false"/>
+      name="soTimeout"
+      description="Multicast Socket Timeout"
+      type="int"/>
     <attribute
-      name="membersByName"
-      description="Complete remote sender information"
-      type="[Ljava.lang.String;"
-      writeable="false"/>
+      name="Ttl"
+      description=""
+      type="int"/>
     <operation
       name="start"
       description="Start the cluster membership"