activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject git commit: Tweaking the activemq osgi jar so that it does not re-bundle the leveldbjni lib since the pure java version works fine.
Date Tue, 08 Oct 2013 15:33:36 GMT
Updated Branches:
  refs/heads/trunk 25f70ad48 -> 26092f5a8


Tweaking the activemq osgi jar so that it does not re-bundle the leveldbjni lib since the
pure java version works fine.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/26092f5a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/26092f5a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/26092f5a

Branch: refs/heads/trunk
Commit: 26092f5a829b069b8e9a537087d61f1c6c1a9b06
Parents: 25f70ad
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Tue Oct 8 11:33:29 2013 -0400
Committer: Hiram Chirino <hiram@hiramchirino.com>
Committed: Tue Oct 8 11:33:29 2013 -0400

----------------------------------------------------------------------
 activemq-osgi/pom.xml | 70 ++++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/26092f5a/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index fa1ee9c..6b7c245 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -32,33 +32,35 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-        !org.apache.commons.daemon,
-        !org.apache.maven*,
-        sun.misc*;resolution:=optional,
-        sun.nio*;resolution:=optional,
-        javax.jmdns*;resolution:=optional,
-        javax.resource*;resolution:=optional,
-        javax.servlet*;resolution:=optional,
-        com.thoughtworks.xstream*;resolution:=optional,
-        org.apache.activeio*;resolution:=optional,
-        org.apache.camel*;resolution:=optional,
-        org.apache.derby.jdbc*;resolution:=optional,
-        org.apache.geronimo.transaction.manager*;resolution:=optional,
-        org.apache.hadoop*;resolution:=optional,
-        org.apache.http*;resolution:=optional,
-        org.apache.xpath*;resolution:=optional,
-        org.bouncycastle*;resolution:=optional,
-        org.codehaus.jackson*;resolution:=optional,
-        org.codehaus.jettison*;resolution:=optional,
-        org.jasypt*;resolution:=optional,
-        org.eclipse.jetty*;resolution:=optional,
-        org.apache.zookeeper;resolution:=optional,
-        org.linkedin*;resolution:=optional,
-        org.springframework.jms*;version="[3,4]";resolution:=optional,
-        org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
-        org.springframework.transaction*;version="[3,4]";resolution:=optional,
-        org.xmlpull*;resolution:=optional,
-        scala*;resolution:=optional,
+      !org.apache.commons.daemon,
+      !org.apache.maven*,
+      sun.misc*;resolution:=optional,
+      sun.nio*;resolution:=optional,
+      javax.jmdns*;resolution:=optional,
+      javax.resource*;resolution:=optional,
+      javax.servlet*;resolution:=optional,
+      com.thoughtworks.xstream*;resolution:=optional,
+      org.apache.activeio*;resolution:=optional,
+      org.apache.camel*;resolution:=optional,
+      org.apache.derby.jdbc*;resolution:=optional,
+      org.apache.geronimo.transaction.manager*;resolution:=optional,
+      org.apache.hadoop*;resolution:=optional,
+      org.apache.http*;resolution:=optional,
+      org.apache.xpath*;resolution:=optional,
+      org.bouncycastle*;resolution:=optional,
+      org.codehaus.jackson*;resolution:=optional,
+      org.codehaus.jettison*;resolution:=optional,
+      org.linkedin*;resolution:=optional,
+      org.jasypt*;resolution:=optional,
+      org.eclipse.jetty*;resolution:=optional,
+      org.apache.zookeeper*;resolution:=optional,
+      org.fusesource.leveldbjni*;resolution:=optional,
+      org.linkedin*;resolution:=optional,
+      org.springframework.jms*;version="[3,4]";resolution:=optional,
+      org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
+      org.springframework.transaction*;version="[3,4]";resolution:=optional,
+      org.xmlpull*;resolution:=optional,
+      scala*;resolution:=optional,
       org.springframework*;version="[3,4]";resolution:=optional,
       org.apache.xbean.spring*;resolution:=optional,
       javax.annotation*,
@@ -77,7 +79,9 @@
       org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first,
     </activemq.osgi.export>
     <activemq.osgi.private.pkg>
-         org.fusesource*,
+         org.fusesource.hawtdispatch*,
+         org.fusesource.mqtt*,
+         org.fusesource.hawtbuf*,
          org.apache.qpid*,
          com.google.common*,
          org.iq80*
@@ -125,6 +129,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-http</artifactId>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-partition</artifactId>
+    </dependency>
 
     <!-- Additional Dependencies. -->
     <dependency>
@@ -267,12 +275,13 @@
         <configuration>
           <instructions>
             <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
+            <!-- 
             <Embed-Dependency>
               *;
               groupId=org.apache.activemq;inline=META-INF/services/*,
               groupId=org.fusesource.leveldbjni;inline=META-INF/native/*,
               groupId=org.xerial.snappy;inline=org/xerial/snappy/*</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
+            <Embed-Transitive>true</Embed-Transitive> 
             <Bundle-NativeCode>
               META-INF/native/windows32/leveldbjni.dll;osname=Win32;processor=x86,
               META-INF/native/windows64/leveldbjni.dll;osname=Win32;processor=x86-64,
@@ -286,7 +295,8 @@
               org/xerial/snappy/native/Linux/i386/libsnappyjava.so;osname=linux;processor=x86,
               org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm,
               *
-            </Bundle-NativeCode>
+            </Bundle-NativeCode> 
+            -->
          </instructions>
         </configuration>
       </plugin>


Mime
View raw message