[jboss-cvs] JBossAS SVN: r97295 - in projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing: internal and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-12-02 09:55:02 -0500 (Wed, 02 Dec 2009)
New Revision: 97295

Modified:
   projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java
   projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java
   projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java
   projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
Log:
Add access to OSGiRuntime from OSGiBundle

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java	2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java	2009-12-02 14:55:02 UTC (rev 97295)
@@ -36,6 +36,11 @@
 public abstract class OSGiBundle
 {
    /**
+    * Get the runtime associated with this bundle.
+    */
+   public abstract OSGiRuntime getRuntime();
+   
+   /**
     * Returns this bundle's unique identifier.
     */
    public abstract long getBundleId();

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java	2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java	2009-12-02 14:55:02 UTC (rev 97295)
@@ -133,7 +133,9 @@
          {
             bundle.uninstall();
          }
-         getRuntime().unregisterBundle(this);
+         
+         OSGiRuntimeImpl runtimeImpl = (OSGiRuntimeImpl)getRuntime();
+         runtimeImpl.unregisterBundle(this);
          setUninstalled(true);
       }
       catch (RuntimeException rte)

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java	2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java	2009-12-02 14:55:02 UTC (rev 97295)
@@ -24,6 +24,7 @@
 // $Id$
 
 import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
 
 /**
  * An abstract implementation of a {@link OSGiBundle}
@@ -41,7 +42,7 @@
       this.runtime = runtime;
    }
 
-   OSGiRuntimeImpl getRuntime()
+   public OSGiRuntime getRuntime()
    {
       return runtime;
    }

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java	2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java	2009-12-02 14:55:02 UTC (rev 97295)
@@ -143,8 +143,9 @@
       assertNotUninstalled();
       try
       {
-         getRuntime().undeploy(bundleInfo.getRootURL());
-         getRuntime().unregisterBundle(this);
+         OSGiRuntimeImpl runtimeImpl = (OSGiRuntimeImpl)getRuntime();
+         runtimeImpl.undeploy(bundleInfo.getRootURL());
+         runtimeImpl.unregisterBundle(this);
          setUninstalled(true);
       }
       catch (RuntimeException rte)