activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1439910 - in /activemq/trunk: activemq-leveldb-store/pom.xml activemq-osgi/pom.xml
Date Tue, 29 Jan 2013 14:36:39 GMT
Author: chirino
Date: Tue Jan 29 14:36:39 2013
New Revision: 1439910

URL: http://svn.apache.org/viewvc?rev=1439910&view=rev
Log:
Improve the osgi module so that the leveldb store can be loaded.


Modified:
    activemq/trunk/activemq-leveldb-store/pom.xml
    activemq/trunk/activemq-osgi/pom.xml

Modified: activemq/trunk/activemq-leveldb-store/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/pom.xml?rev=1439910&r1=1439909&r2=1439910&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/pom.xml (original)
+++ activemq/trunk/activemq-leveldb-store/pom.xml Tue Jan 29 14:36:39 2013
@@ -389,6 +389,8 @@
               <include>org.fusesource.leveldbjni:leveldbjni-osx</include>
               <include>org.fusesource.leveldbjni:leveldbjni-linux32</include>
               <include>org.fusesource.leveldbjni:leveldbjni-linux64</include>
+              <include>org.fusesource.leveldbjni:leveldbjni-win32</include>
+              <include>org.fusesource.leveldbjni:leveldbjni-win64</include>
               <include>org.fusesource.hawtjni:hawtjni-runtime</include>
 
               <!-- include bits need to access hdfs as a client -->

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1439910&r1=1439909&r2=1439910&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Tue Jan 29 14:36:39 2013
@@ -185,9 +185,25 @@
         <configuration>
           <instructions>
             <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
-            <Embed-Dependency>*;groupId=org.apache.activemq;inline=META-INF/services/*</Embed-Dependency>
+            <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>
-          </instructions>
+            <Bundle-NativeCode>
+              META-INF/native/windows32/leveldbjni.dll;osname=Win32;processor=x86,
+              META-INF/native/windows64/leveldbjni.dll;osname=Win32;processor=x86-64,
+              META-INF/native/osx/libleveldbjni.jnilib;osname=macosx,
+              META-INF/native/linux32/libleveldbjni.so;osname=Linux;processor=x86,
+              META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64,
+              org/xerial/snappy/native/Linux/i386/libsnappyjava.so;osname=Linux;processor=x86,
+              org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib;osname=macosx;processor=x86,
+              org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;osname=macosx;processor=x86-64,
+              org/xerial/snappy/native/Windows/amd64/snappyjava.dll;osname=Win32;processor=x86-64,
+              org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=Win32;processor=x86
+            </Bundle-NativeCode>
+         </instructions>
         </configuration>
       </plugin>
     </plugins>



Mime
View raw message