You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/16 15:31:28 UTC
svn commit: r1326611 - in /karaf/cellar/trunk/management: pom.xml
src/main/resources/OSGI-INF/blueprint/blueprint.xml
Author: jbonofre
Date: Mon Apr 16 13:31:27 2012
New Revision: 1326611
URL: http://svn.apache.org/viewvc?rev=1326611&view=rev
Log:
[KARAF-1355] Use the MBean registration as service instead of the MBeanRegistrer
Modified:
karaf/cellar/trunk/management/pom.xml
karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: karaf/cellar/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/management/pom.xml?rev=1326611&r1=1326610&r2=1326611&view=diff
==============================================================================
--- karaf/cellar/trunk/management/pom.xml (original)
+++ karaf/cellar/trunk/management/pom.xml Mon Apr 16 13:31:27 2012
@@ -41,8 +41,7 @@
!org.apache.karaf.cellar.management*,
javax.management,
javax.management.loading,
- org.apache.karaf.management*;version="[2,4)",
- org.apache.karaf.features*;version="[2,4)",
+ org.apache.karaf.features*;version="[3,4)",
org.apache.karaf.cellar*;version="${project.version}",
org.apache.karaf.cellar.config*;version="${project.version}",
org.apache.karaf.cellar.core*;version="${project.version}",
Modified: karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1326611&r1=1326610&r2=1326611&view=diff
==============================================================================
--- karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/management/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Apr 16 13:31:27 2012
@@ -20,10 +20,6 @@
<reference id="eventTransportFactory" interface="org.apache.karaf.cellar.core.event.EventTransportFactory"/>
<reference id="executionContext" interface="org.apache.karaf.cellar.core.command.ExecutionContext"/>
- <reference id="mbeanServer" interface="javax.management.MBeanServer">
- <reference-listener ref="mbeanRegister" bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer"/>
- </reference>
-
<bean id="cellarMBean" class="org.apache.karaf.cellar.management.internal.CellarMBeanImpl">
<property name="clusterManager" ref="clusterManager"/>
<property name="executionContext" ref="executionContext"/>
@@ -50,16 +46,34 @@
<property name="groupManager" ref="groupManager"/>
</bean>
- <bean id="mbeanRegister" class="org.apache.karaf.management.MBeanRegistrer">
- <property name="mbeans">
- <map>
- <entry value="org.apache.karaf.cellar:type=core,name=${karaf.name}" key-ref="cellarMBean"/>
- <entry value="org.apache.karaf.cellar:type=node,name=${karaf.name}" key-ref="cellarNodeMBean"/>
- <entry value="org.apache.karaf.cellar:type=config,name=${karaf.name}" key-ref="cellarConfigMBean"/>
- <entry value="org.apache.karaf.cellar:type=feature,name=${karaf.name}" key-ref="cellarFeaturesMBean"/>
- <entry value="org.apache.karaf.cellar:type=group,name=${karaf.name}" key-ref="cellarGroupMBean"/>
- </map>
- </property>
- </bean>
+ <service ref="cellarMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf.cellar:type=core,name=${karaf.name}"/>
+ </service-properties>
+ </service>
+
+ <service ref="cellarNodeMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf.cellar:type=node,name=${karaf.name}"/>
+ </service-properties>
+ </service>
+
+ <service ref="cellarConfigMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf.cellar:type=config,name=${karaf.name}"/>
+ </service-properties>
+ </service>
+
+ <service ref="cellarFeaturesMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf.cellar:type=feature,name=${karaf.name}"/>
+ </service-properties>
+ </service>
+
+ <service ref="cellarGroupMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf.cellar:type=group,name=${karaf.name}"/>
+ </service-properties>
+ </service>
</blueprint>
\ No newline at end of file