[jboss-cvs] JBossAS SVN: r58185 - in projects/microcontainer/trunk/aop-mc-int/src: main/org/jboss/aop/microcontainer/aspects/jmx resources/tests/org/jboss/test/microcontainer/test

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

Author: kabir.khan at jboss.com
Date: 2006-11-07 12:41:54 -0500 (Tue, 07 Nov 2006)
New Revision: 58185

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
Log:
Inject MBeanServer into JMXIntroduction instead of looking up by name

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java	2006-11-07 17:24:38 UTC (rev 58184)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java	2006-11-07 17:41:54 UTC (rev 58185)
@@ -44,11 +44,17 @@
 public class JMXIntroduction implements Interceptor
 {
    private static final Logger log = Logger.getLogger(JMXIntroduction.class);
+   private MBeanServer server;
    
    public String getName()
    {
       return getClass().getName();
    }
+   
+   public void setMbeanServer(MBeanServer server)
+   {
+      this.server = server;
+   }
  
    public Object invoke(Invocation invocation) throws Throwable
    {
@@ -66,11 +72,11 @@
             objectName = new ObjectName(jmxName);
       }
       
-      ControllerContext mbc = context.getController().getInstalledContext("MBeanServer");
-      if (mbc == null)
-         return null;
-      MBeanServer server = (MBeanServer) mbc.getTarget();
-
+      if (server == null)
+      {
+         throw new RuntimeException("No MBeanServer was injected");
+      }
+      
       if ("setKernelControllerContext".equals(mi.getMethod().getName()))
       {
          Class intfClass = null;

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml	2006-11-07 17:24:38 UTC (rev 58184)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml	2006-11-07 17:41:54 UTC (rev 58185)
@@ -12,7 +12,9 @@
       <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
    </bean>
 
-   <beanfactory name="JMXAdvice" class="org.jboss.aop.microcontainer.aspects.jmx.JMXIntroduction"/>
+   <beanfactory name="JMXAdvice" class="org.jboss.aop.microcontainer.aspects.jmx.JMXIntroduction">
+      <property name="mbeanServer"><inject bean="MBeanServer"/></property>
+   </beanfactory>
 
    <beanfactory name="MetaDataContextAdvice" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
       <property name="annotation">org.jboss.aop.microcontainer.aspects.jmx.JMX</property>