[jboss-cvs] JBoss Messaging SVN: r4771 - branches/Branch_JBMESSAGING-1303/src/config.

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

Author: jmesnil
Date: 2008-08-05 04:46:31 -0400 (Tue, 05 Aug 2008)
New Revision: 4771

Modified:
   branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml
   branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml
Log:
JBMESSAGING-1303: Revisit management interfaces

* renamed JMSManagementRegistration to JMSManagementService
* inject it into JMSServerManager using JBoss microcontainer

Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml	2008-08-05 08:40:55 UTC (rev 4770)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml	2008-08-05 08:46:31 UTC (rev 4771)
@@ -30,7 +30,6 @@
 
    <bean name="MessagingServerManagement"
          class="org.jboss.messaging.core.management.impl.MessagingServerManagementImpl">
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.messaging:service=MessagingServerManagement",exposedInterface=org.jboss.messaging.core.management.MessagingServerManagement.class)</annotation>
       <constructor factoryMethod="getServerManagement">
          <factory bean="MessagingServer"/>
       </constructor>
@@ -71,11 +70,13 @@
    </bean>
 
    <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.messaging:service=JMSServerManager",exposedInterface=org.jboss.messaging.jms.server.JMSServerManager.class)</annotation>
       <constructor>
          <parameter>
             <inject bean="MessagingServer" property="serverManagement"/>
          </parameter>
+         <parameter>
+            <inject bean="JMSManagementService"/>
+         </parameter>
       </constructor>
    </bean>
 
@@ -120,6 +121,14 @@
       </constructor>
    </bean>
    
+   <bean name="JMSManagementService" class="org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl">
+      <constructor>
+         <parameter>
+            <inject bean="MBeanServer"/>
+         </parameter>
+      </constructor>
+   </bean>
+   
    <bean name="MBeanServer" class="javax.management.MBeanServer">
       <constructor factoryClass="java.lang.management.ManagementFactory"
                    factoryMethod="getPlatformMBeanServer"/>

Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml	2008-08-05 08:40:55 UTC (rev 4770)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml	2008-08-05 08:46:31 UTC (rev 4771)
@@ -1,3 +1,4 @@
+
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
@@ -48,7 +49,6 @@
 
    <bean name="MessagingServerManagement"
          class="org.jboss.messaging.core.management.impl.MessagingServerManagementImpl">
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.messaging:service=MessagingServerManagement",exposedInterface=org.jboss.messaging.core.management.MessagingServerManagement.class)</annotation>      
       <constructor factoryMethod="getServerManagement">
          <factory bean="MessagingServer"/>
       </constructor>
@@ -90,11 +90,13 @@
    </bean>
    
    <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.messaging:service=JMSServerManager",exposedInterface=org.jboss.messaging.jms.server.JMSServerManager.class)</annotation>
       <constructor>
          <parameter>
             <inject bean="MessagingServer" property="serverManagement"/>
          </parameter>
+         <parameter>
+            <inject bean="JMSManagementService"/>
+         </parameter>
       </constructor>
    </bean>
 
@@ -139,6 +141,14 @@
       </constructor>
    </bean>
    
+   <bean name="JMSManagementService" class="org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl">
+      <constructor>
+         <parameter>
+            <inject bean="MBeanServer"/>
+         </parameter>
+      </constructor>
+   </bean>
+   
    <bean name="MBeanServer" class="javax.management.MBeanServer">
       <constructor factoryClass="java.lang.management.ManagementFactory"
                    factoryMethod="getPlatformMBeanServer"/>