[jboss-cvs] JBossAS SVN: r93482 - projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-14 10:54:14 -0400 (Mon, 14 Sep 2009)
New Revision: 93482

Modified:
   projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
Log:
Use setBundleContext()

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-14 14:52:02 UTC (rev 93481)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java	2009-09-14 14:54:14 UTC (rev 93482)
@@ -50,13 +50,13 @@
 {
    private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class);
 
-   private BundleContext context;
+   private BundleContext bundleContext;
    private MBeanServer mbeanServer;
    private Kernel kernel;
 
-   public void setSystemContext(BundleContext context)
+   public void setBundleContext(BundleContext bundleContext)
    {
-      this.context = context;
+      this.bundleContext = bundleContext;
    }
 
    public void setMbeanServer(MBeanServer mbeanServer)
@@ -92,34 +92,34 @@
       KernelController controller = kernel.getController();
 
       // Register the MBeanServer 
-      context.registerService(MBeanServer.class.getName(), mbeanServer, null);
+      bundleContext.registerService(MBeanServer.class.getName(), mbeanServer, null);
       log.debug("MBeanServer registered");
       
       // Register the InitialContext 
       InitialContext initialContext = getInitialContext();
-      context.registerService(InitialContext.class.getName(), initialContext, null);
+      bundleContext.registerService(InitialContext.class.getName(), initialContext, null);
       log.debug("InitialContext registered");
       
       // Register the XMLBindingService 
       XMLBindingService xbService = new XMLBindingService(){};
-      context.registerService(XMLBindingService.class.getName(), xbService, null);
+      bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
       log.debug("XMLBindingService registered");
       
       // Preregister some MC beans
-      installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, context);
+      installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, bundleContext);
       installBean(controller, BEAN_KERNEL, kernel);
       installBean(controller, BEAN_KERNEL_CONTROLLER, controller);
       installBean(controller, BEAN_MBEAN_SERVER, mbeanServer);
 
       // Register the MicrocontainerService
       log.debug("Register MicrocontainerService");
-      context.registerService(MicrocontainerService.class.getName(), this, null);
+      bundleContext.registerService(MicrocontainerService.class.getName(), this, null);
       log.debug("MicrocontainerService registered");
 
       // Register the DeployerService
       Properties props = new Properties();
       props.setProperty("provider", "microcontainer");
-      context.registerService(DeployerService.class.getName(), this, props);
+      bundleContext.registerService(DeployerService.class.getName(), this, props);
       log.debug("DeployerService registered");
 
       // Register the MicrocontainerServiceMBean