svn commit: r359232 - /cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java

[gi...@apache.org]

Author: giacomo
Date: Tue Dec 27 08:26:34 2005
New Revision: 359232

URL: http://svn.apache.org/viewcvs?rev=359232&view=rev
Log:
make use of additional constructor signature (includes ComponentInfo)

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java?rev=359232&r1=359231&r2=359232&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/PoolableComponentHandlerMBean.java Tue Dec 27 08:26:34 2005
@@ -17,12 +17,11 @@
 package org.apache.cocoon.core.container.handler;
 
 
-import org.apache.cocoon.util.JMXUtils;
+import org.apache.cocoon.components.ComponentInfo;
 import org.mortbay.util.jmx.ModelMBeanImpl;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
-import javax.management.modelmbean.InvalidTargetObjectTypeException;
 
 /**
  * The ThreadSafeComponentHandlerMBean adds JMX managability for ThreadSafeComponentHandler.
@@ -33,7 +32,8 @@
 public class PoolableComponentHandlerMBean
 extends ModelMBeanImpl {
     
-    private PoolableComponentHandler handler;
+    private final PoolableComponentHandler handler;
+    private final ComponentInfo info;
     
     protected void defineManagedResource() {
         super.defineManagedResource();
@@ -49,18 +49,11 @@
      *
      * @param handler The managed PoolableComponentHandler instance
      */
-    public PoolableComponentHandlerMBean(final PoolableComponentHandler handler)
+    public PoolableComponentHandlerMBean(final PoolableComponentHandler handler, final ComponentInfo info)
         throws MBeanException, InstanceNotFoundException {
         super( handler );
         this.handler = handler;
-        try
-        {
-            super.setManagedResource( handler, "objectReference" );
-        }
-        catch( final InvalidTargetObjectTypeException e )
-        {
-            e.printStackTrace();
-        }
+        this.info = info;
     }
     
     public String[] getInterfaces()
@@ -99,11 +92,7 @@
     
     public String getJmxName() 
     {
-        return JMXUtils.genDefaultJmxName(handler.getInfo().getServiceClassName());
-    }
- 
-    public String getJmxNameAddition()
-    {
-        return "type=PoolableHandler"; 
+        //return JMXUtils.genDefaultJmxName(handler.getInfo().getServiceClassName());
+        return "subsys=ECM++,handler=poolable" + (info.getRole() != null ? ",role=" + info.getRole() : "");
     }
 }