From 960481c7e881d58a7509b765a2a4dffcdd22bd2a Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Tue, 29 Jan 2013 14:36:39 +0000
Subject: [PATCH] Improve the osgi module so that the leveldb store can be
 loaded.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439910 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-leveldb-store/pom.xml |  2 ++
 activemq-osgi/pom.xml          | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 97692eb073..f765d7133e 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -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 -->
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 0b450ecc18..1240d4ebb4 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -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>