[jboss-cvs] JBossAS SVN: r77325 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2008-08-21 14:28:48 -0400 (Thu, 21 Aug 2008)
New Revision: 77325

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java
Log:
Make mbean domain configurable, default to jboss.web instead of Catalina.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java	2008-08-21 15:52:20 UTC (rev 77324)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ObjectNamePatternLoadMetricSource.java	2008-08-21 18:28:48 UTC (rev 77325)
@@ -31,6 +31,8 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
+import org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetric;
+import org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricSource;
 import org.jboss.web.tomcat.service.modcluster.load.metric.LoadMetricSourceRegistration;
 
 /**
@@ -41,7 +43,9 @@
 public abstract class ObjectNamePatternLoadMetricSource extends AbstractLoadMetricSource
 {
    private final MBeanServer server;
-   private volatile ObjectName objectNamePattern;
+   private volatile String domain = "jboss.web";
+   private volatile String propertyPattern = this.defaultPropertyPattern();
+   
    private transient Set<ObjectName> objectNames;
    
    protected ObjectNamePatternLoadMetricSource(LoadMetricSourceRegistration registration)
@@ -54,28 +58,28 @@
       super(registration);
       
       this.server = server;
-      
-      try
-      {
-         this.objectNamePattern = ObjectName.getInstance(this.defaultObjectNamePattern());
-      }
-      catch (MalformedObjectNameException e)
-      {
-         // Won't happen
-         throw new RuntimeException(e);
-      }
    }
    
-   protected abstract String defaultObjectNamePattern();
+   protected abstract String defaultPropertyPattern();
    
+   public String getDomain()
+   {
+      return this.domain;
+   }
+   
+   public void setDomain(String domain)
+   {
+      this.domain = domain;
+   }
+   
    /**
     * Get the objectNamePattern.
     * 
     * @return the objectNamePattern.
     */
-   public ObjectName getObjectNamePattern()
+   public String getPropertyPattern()
    {
-      return this.objectNamePattern;
+      return this.propertyPattern;
    }
 
    /**
@@ -83,9 +87,9 @@
     * 
     * @param objectNamePattern The objectNamePattern to set.
     */
-   public void setObjectNamePattern(ObjectName objectNamePattern)
+   public void setPropertyPattern(String propertyPattern)
    {
-      this.objectNamePattern = objectNamePattern;
+      this.propertyPattern = propertyPattern;
    }
 
    /**
@@ -96,7 +100,17 @@
    @Override
    public void open()
    {
-      this.objectNames = this.server.queryNames(this.objectNamePattern, null);
+      try
+      {
+         ObjectName pattern = ObjectName.getInstance(this.domain + ":" + this.propertyPattern);
+         
+         this.objectNames = this.server.queryNames(pattern, null);         
+      }
+      catch (MalformedObjectNameException e)
+      {
+         // Should not happen
+         throw new RuntimeException(e);
+      }
    }
    
    public <T> List<T> getAttributes(String attribute, Class<T> targetClass) throws JMException

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java	2008-08-21 15:52:20 UTC (rev 77324)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/RequestProcessorLoadMetricSource.java	2008-08-21 18:28:48 UTC (rev 77325)
@@ -56,13 +56,13 @@
    
    /**
     * @{inheritDoc}
-    * @see org.jboss.web.tomcat.service.modcluster.load.metric.impl.ObjectNamePatternLoadMetricSource#defaultObjectNamePattern()
+    * @see org.jboss.web.tomcat.service.modcluster.load.metric.impl.ObjectNamePatternLoadMetricSource#defaultPropertyPattern()
     */
    @Override
-   protected String defaultObjectNamePattern()
+   protected String defaultPropertyPattern()
    {
       // return "Catalina:type=GlobalRequestProcessor,name=*";
       // Java 1.5 only allows primitive ObjectName patterns
-      return "Catalina:type=GlobalRequestProcessor,*";
+      return "type=GlobalRequestProcessor,*";
    }
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java	2008-08-21 15:52:20 UTC (rev 77324)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/SessionLoadMetricSource.java	2008-08-21 18:28:48 UTC (rev 77325)
@@ -59,10 +59,9 @@
     * @see org.jboss.web.tomcat.service.modcluster.load.metric.impl.ObjectNamePatternLoadMetricSource#defaultObjectNamePattern()
     */
    @Override
-   protected String defaultObjectNamePattern()
+   protected String defaultPropertyPattern()
    {
-      // return "Catalina:type=Manager,path=/*,host=*";
       // Java 1.5 only allows primitive ObjectName patterns
-      return "Catalina:type=Manager,*";
+      return "type=Manager,*";
    }
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java	2008-08-21 15:52:20 UTC (rev 77324)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/load/metric/impl/ThreadPoolLoadMetricSource.java	2008-08-21 18:28:48 UTC (rev 77325)
@@ -54,10 +54,14 @@
       super(registration, server);
    }
 
-   protected String defaultObjectNamePattern()
+   /**
+    * @{inheritDoc}
+    * @see org.jboss.web.tomcat.service.modcluster.load.metric.impl.ObjectNamePatternLoadMetricSource#defaultPropertyPattern()
+    */
+   @Override
+   protected String defaultPropertyPattern()
    {
-      // return "Catalina:type=ThreadPool,name=*";
       // Java 1.5 only allows primitive ObjectName patterns
-      return "Catalina:type=ThreadPool,*";
+      return "type=ThreadPool,*";
    }
 }