[jboss-osgi-commits] JBoss-OSGI SVN: r100939 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: src/main/java/org/jboss/osgi/blueprint/internal and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-13 11:16:28 -0500 (Sat, 13 Feb 2010)
New Revision: 100939

Modified:
   projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
Log:
Embed Blueprint API

Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml	2010-02-13 15:50:12 UTC (rev 100938)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml	2010-02-13 16:16:28 UTC (rev 100939)
@@ -22,7 +22,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>JBossOSGi Reactor - Blueprint</name>
+  <name>JBossOSGi Bundles - Blueprint</name>
 
   <groupId>org.jboss.osgi.bundles</groupId>
   <artifactId>jboss-osgi-blueprint</artifactId>
@@ -155,7 +155,7 @@
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.jboss.osgi.blueprint.internal.BlueprintActivator</Bundle-Activator>
             <Export-Package>
-              org.jboss.osgi.blueprint;version=${version}
+              org.jboss.osgi.blueprint;version=${version},
             </Export-Package>
             <Import-Package>
               javax.xml.parsers, 
@@ -166,7 +166,7 @@
                
               org.jboss.logging;version="[2.1,3.0)",
               
-              org.jboss.osgi.deployment.interceptor;version="[1.0,2.0)",
+              org.jboss.osgi.deployment.interceptor;version="[1.0,2.0)";resolution:=optional,
               org.jboss.osgi.spi*;version="[1.0,2.0)",
               
               org.osgi.framework,
@@ -181,9 +181,14 @@
               !net.sf.cglib*, 
               !org.objectweb*, 
             </Import-Package>
+            <Embed-Transitive>true</Embed-Transitive>
             <Embed-Dependency>
+              org.apache.aries.blueprint.api;inline=false,
               org.apache.aries.blueprint.core;inline=false,
             </Embed-Dependency>
+            <_exportcontents>
+              org.osgi.service.blueprint*;version="1.0",
+            </_exportcontents>
           </instructions>
         </configuration>
       </plugin>

Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java	2010-02-13 15:50:12 UTC (rev 100938)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java	2010-02-13 16:16:28 UTC (rev 100939)
@@ -26,7 +26,6 @@
 import org.apache.aries.blueprint.container.BlueprintExtender;
 import org.jboss.logging.Logger;
 import org.jboss.osgi.blueprint.BlueprintService;
-import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -51,7 +50,7 @@
       BlueprintService service = new BlueprintService(){};
       context.registerService(BlueprintService.class.getName(), service, null);
       
-      ServiceReference sref = context.getServiceReference(LifecycleInterceptorService.class.getName());
+      ServiceReference sref = context.getServiceReference("org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService");
       if (sref != null)
       {
          log.debug("Start: " + BlueprintInterceptor.class.getName());