[jboss-cvs] JBossAS SVN: r84812 - in projects/jboss-osgi/trunk: testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-02-26 11:09:03 -0500 (Thu, 26 Feb 2009)
New Revision: 84812

Modified:
   projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java
Log:
wip

Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java	2009-02-26 15:51:11 UTC (rev 84811)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java	2009-02-26 16:09:03 UTC (rev 84812)
@@ -66,14 +66,15 @@
 
    public OSGiFramework getFramework(AttributeProvider attributeProvider, String beanName)
    {
-      kernel = attributeProvider.getAttribute(KernelConstants.KERNEL_NAME, Kernel.class);
-
-      if (kernel == null)
+      OSGiFramework framework = attributeProvider.getAttribute(DEFAULT_FRAMEWORK_NAME, OSGiFramework.class);
+      
+      if (framework == null)
+      {
          configure(DEFAULT_FRAMEWORK_BEANS);
-
-      Controller controller = kernel.getController();
-      ControllerContext context = controller.getInstalledContext(beanName);
-      return (OSGiFramework)context.getTarget();
+         framework = attributeProvider.getAttribute(DEFAULT_FRAMEWORK_NAME, OSGiFramework.class);
+      }
+      
+      return framework;
    }
 
    public void configure(InputStream streamConfig)
@@ -112,20 +113,29 @@
       URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_BOOTSTRAP_BEANS);
       if (urlBootstrap != null)
          deployer.deploy(urlBootstrap);
-      
+
       kernel = deployer.getKernel();
    }
 
    public Object getAttribute(String name)
    {
+      Object retObj = null;
+
       if (kernel == null)
          bootstrapKernel();
 
       if (KernelConstants.KERNEL_NAME.equals(name))
-         return kernel;
+      {
+         retObj = kernel;
+      }
+      else
+      {
+         Controller controller = kernel.getController();
+         ControllerContext context = controller.getInstalledContext(name);
+         if (context != null)
+            retObj = context.getTarget();
+      }
 
-      Controller controller = kernel.getController();
-      ControllerContext context = controller.getInstalledContext(name);
-      return context.getTarget();
+      return retObj;
    }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java	2009-02-26 15:51:11 UTC (rev 84811)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java	2009-02-26 16:09:03 UTC (rev 84812)
@@ -26,7 +26,6 @@
 import junit.framework.Test;
 
 import org.jboss.osgi.spi.framework.AttributeProvider;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
 import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
 import org.jboss.osgi.spi.jmx.MBeanProxy;
 import org.jboss.osgi.spi.jmx.MBeanProxyException;
@@ -48,12 +47,15 @@
 
    public static Test suite()
    {
-      IntegrationTestSetup setup = new IntegrationTestSetup(JBOSGI36Test.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar");
-      if (setup.isRemoteIntegration() == false)
+      IntegrationTestSetup setup = new IntegrationTestSetup(JBOSGI36Test.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar")
       {
-         configProvider = OSGiConfiguration.getConfigurationProvider();
-         setup.setConfigurationProvider(configProvider);
-      }
+         public OSGiConfigurationProvider getConfigurationProvider()
+         {
+            configProvider = super.getConfigurationProvider();
+            configProvider.getFramework();
+            return configProvider;
+         }
+      };
       return setup;
    }