[jboss-osgi-commits] JBoss-OSGI SVN: r91002 - in projects/jboss-osgi: projects/bundles/microcontainer/trunk and 3 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-07-09 09:58:40 -0400 (Thu, 09 Jul 2009)
New Revision: 91002

Modified:
   projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
   projects/jboss-osgi/trunk/blueprint/impl/pom.xml
   projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
   projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd
Log:
Fix bundle exports and wiring for BP

Modified: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml	2009-07-09 13:34:57 UTC (rev 91001)
+++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml	2009-07-09 13:58:40 UTC (rev 91002)
@@ -68,6 +68,9 @@
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.jboss.osgi.jbossxb.internal.XMLBindingActivator</Bundle-Activator>
             <Embed-Transitive>true</Embed-Transitive>
+            <Export-Package>
+              org.jboss.osgi.jbossxb;version=${version}
+            </Export-Package>
             <Import-Package>
               <!-- system -->
               javax.activation, 

Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml	2009-07-09 13:34:57 UTC (rev 91001)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml	2009-07-09 13:58:40 UTC (rev 91002)
@@ -115,6 +115,7 @@
               org.jboss.joinpoint.*, 
               org.jboss.logging, 
               org.jboss.osgi.common.log;version="1.0",
+              org.jboss.osgi.jbossxb;version="2.0",
               org.jboss.osgi.spi;version="1.0",
               org.jboss.osgi.spi.management;version="1.0",
               org.jboss.osgi.spi.util;version="1.0",

Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/pom.xml	2009-07-09 13:34:57 UTC (rev 91001)
+++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml	2009-07-09 13:58:40 UTC (rev 91002)
@@ -49,6 +49,7 @@
               org.jboss.osgi.blueprint.*
             </Private-Package>
             <Export-Package>
+              org.jboss.osgi.blueprint;version=${version},
               org.osgi.service.blueprint.*;version=1.0
             </Export-Package>
             <Import-Package>

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml	2009-07-09 13:34:57 UTC (rev 91001)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml	2009-07-09 13:58:40 UTC (rev 91002)
@@ -46,7 +46,7 @@
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
 
-    <!-- Bundle Dependencies -->
+    <!-- Bundle Dependencies --> 
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.log</artifactId>
@@ -54,16 +54,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-apache-xerces</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-common-core</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -72,26 +62,6 @@
       <artifactId>jboss-osgi-husky-harness</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-jaxb</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-jmx</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-microcontainer</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-xml-binding</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
   </dependencies>
 

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd	2009-07-09 13:34:57 UTC (rev 91001)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd	2009-07-09 13:58:40 UTC (rev 91002)
@@ -8,7 +8,7 @@
 
 Import-Package: \
 	javax.management, \
-    org.jboss.osgi.blueprint, \
+	org.jboss.osgi.blueprint, \
 	org.jboss.osgi.husky, \
 	org.jboss.osgi.husky.annotation, \
 	org.jboss.osgi.spi.capability, \