[jboss-osgi-commits] JBoss-OSGI SVN: r93835 - in projects/jboss-osgi/projects: bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal and 2 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Mon Sep 21 16:57:36 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-09-21 16:57:35 -0400 (Mon, 21 Sep 2009)
New Revision: 93835
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
Log:
Update dependencies
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-09-21 20:53:24 UTC (rev 93834)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-09-21 20:57:35 UTC (rev 93835)
@@ -27,14 +27,14 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<!-- Properties -->
<properties>
- <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core>
+ <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.jndi>1.0.1-SNAPSHOT</version.jboss.osgi.jndi>
- <version.osgi>r4v42-20090728</version.osgi>
+ <version.osgi>r4v42</version.osgi>
</properties>
<!-- Dependencies -->
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2009-09-21 20:53:24 UTC (rev 93834)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2009-09-21 20:57:35 UTC (rev 93835)
@@ -66,9 +66,9 @@
ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
if (serverArr.size() > 1)
- throw new IllegalStateException("Multiple MBeanServer instances not supported");
+ log.log(LogService.LOG_WARNING, "Multiple MBeanServer instances: " + serverArr);
- if (serverArr.size() == 1)
+ if (serverArr.size() > 0)
{
mbeanServer = serverArr.get(0);
log.log(LogService.LOG_DEBUG, "Found MBeanServer: " + mbeanServer.getDefaultDomain());
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-21 20:53:24 UTC (rev 93834)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-09-21 20:57:35 UTC (rev 93835)
@@ -26,12 +26,12 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<properties>
<version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer>
- <version.osgi>r4v42-20090728</version.osgi>
+ <version.osgi>r4v42</version.osgi>
</properties>
<!-- Dependencies -->
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-21 20:53:24 UTC (rev 93834)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-21 20:57:35 UTC (rev 93835)
@@ -31,7 +31,6 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
-import org.jboss.osgi.jbossxb.XMLBindingService;
import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
import org.jboss.osgi.spi.service.DeployerService;
import org.jboss.osgi.spi.service.MicrocontainerService;
@@ -89,11 +88,6 @@
Kernel kernel = getKernel();
KernelController controller = kernel.getController();
- // Register the XMLBindingService
- //XMLBindingService xbService = new XMLBindingService(){};
- //bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
- //log.debug("XMLBindingService registered");
-
// Preregister some MC beans
installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, bundleContext);
installBean(controller, BEAN_KERNEL, kernel);
More information about the jboss-osgi-commits
mailing list