Author: pferraro Date: 2008-11-13 17:08:21 -0500 (Thu, 13 Nov 2008) New Revision: 2061 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/SessionLoadMetricSource.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java Log: Support default Tomcat object names. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java 2008-11-13 00:00:27 UTC (rev 2060) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java 2008-11-13 22:08:21 UTC (rev 2061) @@ -165,6 +165,11 @@ return (serverType == ServerType.JBOSSWEB) ? new MCMPJBURLEncoder() : new MCMPTCURLEncoder(); } + public static String defaultObjectNameDomain() + { + return (serverType == ServerType.JBOSSWEB) ? "jboss.web" : "Catalina"; + } + public static void establishJvmRouteAndConnectorAddress(Engine engine, MCMPHandler mcmpHandler) throws IOException { Connector connector = findProxyConnector(engine.getService().findConnectors()); Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java 2008-11-13 00:00:27 UTC (rev 2060) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java 2008-11-13 22:08:21 UTC (rev 2061) @@ -24,6 +24,7 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; +import org.jboss.modcluster.Utils; import org.jboss.modcluster.load.metric.LoadMetricSource; /** @@ -34,7 +35,7 @@ */ public class RequestProcessorLoadMetricSource extends MBeanQueryLoadMetricSource { - public static final String DEFAULT_PATTERN = "jboss.web:type=GlobalRequestProcessor,*"; + public static final String DEFAULT_PATTERN = Utils.defaultObjectNameDomain() + ":type=GlobalRequestProcessor,*"; /** * Create a new GlobalRequestProcessorLoadMetricSource. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/SessionLoadMetricSource.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/SessionLoadMetricSource.java 2008-11-13 00:00:27 UTC (rev 2060) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/SessionLoadMetricSource.java 2008-11-13 22:08:21 UTC (rev 2061) @@ -24,6 +24,7 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; +import org.jboss.modcluster.Utils; import org.jboss.modcluster.load.metric.LoadMetricSource; /** @@ -34,7 +35,7 @@ */ public class SessionLoadMetricSource extends MBeanQueryLoadMetricSource { - public static final String DEFAULT_PATTERN = "jboss.web:type=Manager,*"; + public static final String DEFAULT_PATTERN = Utils.defaultObjectNameDomain() + ":type=Manager,*"; /** * Create a new SessionLoadMetricSource. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java 2008-11-13 00:00:27 UTC (rev 2060) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java 2008-11-13 22:08:21 UTC (rev 2061) @@ -24,6 +24,7 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; +import org.jboss.modcluster.Utils; import org.jboss.modcluster.load.metric.LoadMetricSource; /** @@ -34,7 +35,7 @@ */ public class ThreadPoolLoadMetricSource extends MBeanQueryLoadMetricSource { - public static final String DEFAULT_PATTERN = "jboss.web:type=ThreadPool,*"; + public static final String DEFAULT_PATTERN = Utils.defaultObjectNameDomain() + ":type=ThreadPool,*"; /** * Create a new ThreadPoolLoadMetricSource.