368157 Medic now registers the Platform MBean server in the service registry
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/MedicActivator.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/MedicActivator.java
index e4a2880..2588294 100644
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/MedicActivator.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/MedicActivator.java
@@ -11,6 +11,10 @@
package org.eclipse.virgo.medic.impl;
+import java.lang.management.ManagementFactory;
+
+import javax.management.MBeanServer;
+
import org.eclipse.equinox.log.ExtendedLogReaderService;
import org.eclipse.virgo.medic.dump.DumpGenerator;
import org.eclipse.virgo.medic.impl.config.ConfigurationAdminConfigurationProvider;
@@ -56,6 +60,9 @@
logController.eventLogStart();
DumpGenerator dumpGenerator = logController.dumpStart();
+ //Register the platformMBeanServer with
+ MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
+ context.registerService(MBeanServer.class, platformMBeanServer, null);
this.medicMBeanExporter = new MedicMBeanExporter(configurationProvider, dumpGenerator);
this.logReaderReference = context.getServiceReference(ExtendedLogReaderService.class);
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/MedicActivatorTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/MedicActivatorTests.java
index 2d75076..b990e75 100644
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/MedicActivatorTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/MedicActivatorTests.java
@@ -76,7 +76,7 @@
assertFalse(this.server.isRegistered(new ObjectName("org.eclipse.virgo.kernel:type=Medic,name=DumpInspector")));
- assertEquals(1, bundleContext.getServiceRegistrations().size());
+ assertEquals(2, bundleContext.getServiceRegistrations().size());
}
@Test
