BZ-1042867 - Some drools-osgi modules fail to install into Fuse

(cherry picked from commit cb3bd92)
kiegroup · Jan 8, 2014 · b482148 · b482148
1 parent 9645cf0
commit b482148
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/jbpm-human-task/jbpm-human-task-audit/pom.xml b/jbpm-human-task/jbpm-human-task-audit/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <artifactId>jbpm-human-task-audit</artifactId>
+    <packaging>bundle</packaging>
 
     <name>jBPM :: Human Task Audit</name>
 
@@ -121,4 +122,25 @@
         </dependency>
         -->
     </dependencies>
+    <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.jbpm.services.task.audit</Bundle-SymbolicName>
+            <Import-Package>
+              !org.jbpm.services.task,
+              *
+            </Import-Package>
+            <Private-Package></Private-Package>
+            <Export-Package>
+              org.jbpm.services.task*
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jbpm-human-task/jbpm-human-task-jpa/pom.xml b/jbpm-human-task/jbpm-human-task-jpa/pom.xml
@@ -6,6 +6,7 @@
     <version>6.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>jbpm-human-task-jpa</artifactId>
+  <packaging>bundle</packaging>
 
   <name>jBPM :: JPA Human Task Persistence</name>
   <description>jBPM JPA Human Task Persistence</description>
@@ -46,7 +47,8 @@
               *
             </Import-Package>
             <Export-Package>
-              org.jbpm.services.task.*
+              org.jbpm.services.task.*,
+              org.jbpm.services.task.persistence.*
             </Export-Package>
           </instructions>
         </configuration>

diff --git a/jbpm-runtime-manager/pom.xml b/jbpm-runtime-manager/pom.xml
@@ -123,15 +123,15 @@
       <artifactId>jbpm-human-task-workitems</artifactId>
     </dependency>
     <dependency>
-    	<groupId>org.jbpm</groupId>
-    	<artifactId>jbpm-human-task-audit</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-human-task-audit</artifactId>
     </dependency>
     <!-- disabling human task module to avoid new modules in 6.0.x -->
     <!-- 
     <dependency>
-    	<groupId>org.jbpm</groupId>
-    	<artifactId>jbpm-human-task-jpa</artifactId>
-    	<scope>runtime</scope>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-human-task-jpa</artifactId>
+      <scope>runtime</scope>
     </dependency>
     -->
   </dependencies>
@@ -154,8 +154,10 @@
             <Bundle-SymbolicName>org.jbpm.runtime.manager</Bundle-SymbolicName>
             <Import-Package>
               !org.jbpm.runtime.manager*,
+              org.sonatype.aether.artifact;resolution:=optional,
+              org.kie.scanner;resolution:=optional,
               org.jboss.solder.core;resolution:=optional,
-              org.jboss.seam.transaction;resolution:=optional,
+              org.jbpm.services.task.audit;resolution:=optional,
               *,
             </Import-Package>
             <Private-Package></Private-Package>