[jboss-osgi-commits] JBoss-OSGI SVN: r96950 - in projects/jboss-osgi/projects/spi/trunk: src/main/java/org/jboss/osgi/spi/capability and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-11-25 09:00:49 -0500 (Wed, 25 Nov 2009)
New Revision: 96950

Modified:
   projects/jboss-osgi/projects/spi/trunk/pom.xml
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java
Log:
Add org.eclipse.osgi.utils to compendium capability

Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml	2009-11-25 13:54:08 UTC (rev 96949)
+++ projects/jboss-osgi/projects/spi/trunk/pom.xml	2009-11-25 14:00:49 UTC (rev 96950)
@@ -20,7 +20,7 @@
   <artifactId>jboss-osgi-spi</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   
   <!-- Parent -->
   <parent>

Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java	2009-11-25 13:54:08 UTC (rev 96949)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java	2009-11-25 14:00:49 UTC (rev 96950)
@@ -39,9 +39,32 @@
    {
       super(null);
       
-      if ("equinox".equals(System.getProperty("framework")))
+      if (isFrameworkEquinox())
+      {
          addBundle("bundles/org.eclipse.osgi.services.jar");
+         addBundle("bundles/org.eclipse.osgi.util.jar");
+      }
       else
+      {
          addBundle("bundles/org.osgi.compendium.jar");
+      }
    }
+
+   private boolean isFrameworkEquinox()
+   {
+      boolean isEquinox = "equinox".equals(System.getProperty("framework"));
+      if (isEquinox == false)
+      {
+         try
+         {
+            getClass().getClassLoader().loadClass("org.jboss.osgi.equinox.EquinoxBootstrapProvider");
+            isEquinox = true;
+         }
+         catch (ClassNotFoundException e)
+         {
+            // ignore
+         }
+      }
+      return isEquinox;
+   }
 }
\ No newline at end of file