[jboss-cvs] JBossAS SVN: r96312 - projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal.

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

Author: thomas.diesler at jboss.com
Date: 2009-11-12 14:30:30 -0500 (Thu, 12 Nov 2009)
New Revision: 96312

Modified:
   projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
Log:
Don't bootstrap the EmbeddedRuntime in RemoteRuntime

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java	2009-11-12 18:54:22 UTC (rev 96311)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java	2009-11-12 19:30:30 UTC (rev 96312)
@@ -33,7 +33,6 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
 import org.jboss.osgi.spi.management.MBeanProxy;
 import org.jboss.osgi.spi.management.MBeanProxyException;
 import org.jboss.osgi.spi.management.ManagedBundleMBean;
@@ -71,9 +70,9 @@
          BundleInfo bundleInfo = BundleInfo.createBundleInfo(bundleURL);
          String symbolicName = bundleInfo.getSymbolicName();
          String version = bundleInfo.getVersion().toString();
-         
+
          deployInternal(location, true);
-         
+
          // The remote framework uses a BundleTracker that works of an asynchronous 
          // event to register the installed bundle. It is not available immediately.
          int timeout = 50;
@@ -85,7 +84,7 @@
          }
          if (bundleMBean == null)
             throw new IllegalStateException("Cannot find installed bundle: " + symbolicName + "-" + version);
-         
+
          RemoteBundle bundle = new RemoteBundle(this, bundleMBean, location);
          return registerBundle(location, bundle);
       }
@@ -98,7 +97,7 @@
          Exception target = ex.getTargetException();
          if (target instanceof BundleException)
             throw (BundleException)target;
-         
+
          throw new BundleException("Cannot install: " + location, target);
       }
       catch (Exception ex)
@@ -106,12 +105,12 @@
          throw new BundleException("Cannot install: " + location, ex);
       }
    }
-   
+
    public void deploy(String location) throws Exception
    {
       deployInternal(location, false);
    }
-   
+
    private void deployInternal(String location, boolean isBundle) throws Exception
    {
       URL archiveURL = getTestHelper().getTestArchiveURL(location);
@@ -120,7 +119,7 @@
       else
          invokeMainDeployer("deploy", archiveURL);
    }
-   
+
    public void undeploy(String location) throws Exception
    {
       URL archiveURL = getTestHelper().getTestArchiveURL(location);
@@ -168,7 +167,7 @@
       ManagedBundleMBean bundle = getRemoteFramework().getBundle(bundleId);
       return bundle != null ? new RemoteBundle(this, bundle, null) : null;
    }
-   
+
    public OSGiServiceReference getServiceReference(String clazz)
    {
       ManagedServiceReference manref = getRemoteFramework().getServiceReference(clazz);
@@ -215,13 +214,8 @@
    @Override
    public void shutdown()
    {
-      OSGiBootstrapProvider bootProvider = getTestHelper().getBootstrapProvider();
-      if (bootProvider != null)
-      {
-         super.shutdown();
-         getPackageAdmin().refreshPackages(null);
-         getTestHelper().ungetBootstrapProvider();
-      }
+      super.shutdown();
+      getPackageAdmin().refreshPackages(null);
    }
 
    private RemoteFramework getRemoteFramework()