[jboss-cvs] JBossAS SVN: r89591 - in projects/jboss-osgi/trunk: runtime/felix/src/main/resources and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-06-01 05:39:44 -0400 (Mon, 01 Jun 2009)
New Revision: 89591

Modified:
   projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/ExportedPackageHelper.java
Log:
Fix Equinox integration

Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:35:49 UTC (rev 89590)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 09:39:44 UTC (rev 89591)
@@ -26,7 +26,21 @@
         <entry>
           <key>org.osgi.framework.system.packages</key>
           <value>
-            org.osgi.service.log
+            <!-- system -->
+            javax.management,
+            javax.xml.parsers,
+            org.xml.sax,
+
+            <!-- jboss-osgi -->
+            org.jboss.osgi.spi;version=1.0,
+            org.jboss.osgi.spi.logging;version=1.0,
+            org.jboss.osgi.spi.management;version=1.0,
+            org.jboss.osgi.spi.service;version=1.0,
+            org.jboss.osgi.spi.testing;version=1.0,
+            org.jboss.osgi.spi.testing.capability;version=1.0,
+
+            <!-- jboss -->
+            org.jboss.logging
           </value>
         </entry>
         <!-- 

Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 08:35:49 UTC (rev 89590)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01 09:39:44 UTC (rev 89591)
@@ -27,15 +27,17 @@
           <value>
             <!-- system -->
             org.apache.xerces.dom,
-            org.jboss.logging,
             
-            <!-- jboss -->
+            <!-- jboss-osgi -->
             org.jboss.osgi.spi;version=1.0,
             org.jboss.osgi.spi.logging;version=1.0,
             org.jboss.osgi.spi.management;version=1.0,
             org.jboss.osgi.spi.service;version=1.0,
             org.jboss.osgi.spi.testing;version=1.0,
             org.jboss.osgi.spi.testing.capability;version=1.0,
+            
+            <!-- jboss -->
+            org.jboss.logging,
             org.jboss.xb.binding;version=2.0,
             org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
           </value>

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/ExportedPackageHelper.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/ExportedPackageHelper.java	2009-06-01 08:35:49 UTC (rev 89590)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/ExportedPackageHelper.java	2009-06-01 09:39:44 UTC (rev 89591)
@@ -70,12 +70,16 @@
    {
       log.debug("Exported-Packages: " + bundle.getSymbolicName());
       
-      List<String> packages = new ArrayList<String>();
-      for (ExportedPackage exp : packageAdmin.getExportedPackages(bundle))
-         packages.add("  " + exp.getName() + ";version=" + exp.getVersion());
-      
-      Collections.sort(packages);
-      for (String exp : packages)
-         log.debug(exp);
+      ExportedPackage[] exportedPackages = packageAdmin.getExportedPackages(bundle);
+      if (exportedPackages != null)
+      {
+         List<String> packages = new ArrayList<String>();
+         for (ExportedPackage exp : exportedPackages)
+            packages.add("  " + exp.getName() + ";version=" + exp.getVersion());
+         
+         Collections.sort(packages);
+         for (String exp : packages)
+            log.debug(exp);
+      }
    }
 }
\ No newline at end of file