7:48 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-12-01 08:48:30 -0500 (Tue, 01 Dec 2009)
New Revision: 97228
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java
projects/jboss-osgi/trunk/pom.xml
Log:
Fix reference to BEAN_BUNDLE_CONTEXT
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-12-01 13:37:57 UTC
(rev 97227)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2009-12-01 13:48:30 UTC
(rev 97228)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-runtime-jbossas</artifactId>
<packaging>jar</packaging>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -38,8 +38,8 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
-
<version.jboss.osgi.microcontainer>2.0.9</version.jboss.osgi.microcontainer>
+ <version.jboss.osgi.jta>1.0.0-SNAPSHOT</version.jboss.osgi.jta>
+
<version.jboss.osgi.microcontainer>2.0.9-SNAPSHOT</version.jboss.osgi.microcontainer>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java 2009-12-01
13:37:57 UTC (rev 97227)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java 2009-12-01
13:48:30 UTC (rev 97228)
@@ -46,13 +46,13 @@
// Provide logging
private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class);
- private BundleContext bundleContext;
+ private BundleContext context;
private MBeanServer mbeanServer;
private Kernel kernel;
public void setBundleContext(BundleContext bundleContext)
{
- this.bundleContext = bundleContext;
+ this.context = bundleContext;
}
public void setMbeanServer(MBeanServer mbeanServer)
@@ -76,14 +76,14 @@
KernelController controller = kernel.getController();
// Preregister some MC beans
- installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, bundleContext);
+ installBean(controller, BEAN_BUNDLE_CONTEXT, context);
installBean(controller, BEAN_KERNEL, kernel);
installBean(controller, BEAN_KERNEL_CONTROLLER, controller);
installBean(controller, BEAN_MBEAN_SERVER, mbeanServer);
// Register the MicrocontainerService
log.debug("Register MicrocontainerService");
- bundleContext.registerService(MicrocontainerService.class.getName(), this, null);
+ context.registerService(MicrocontainerService.class.getName(), this, null);
log.debug("MicrocontainerService registered");
// Register the MicrocontainerServiceMBean
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-12-01 13:37:57 UTC (rev 97227)
+++ projects/jboss-osgi/trunk/pom.xml 2009-12-01 13:48:30 UTC (rev 97228)
@@ -66,7 +66,7 @@
<version.jboss.osgi.runtime.deployers>1.0.3-SNAPSHOT</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.runtime.equinox>3.5.1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
-
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
+
<version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webapp>0.7.2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>