From 4051799a6d4938bc4c21cd6e8574efe363bf9a53 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Tue, 25 Sep 2012 14:50:15 +0000
Subject: [PATCH] More work for AMQ-4080: Include the activemq-leveldb module
 in the assembly, don't use the fusesource leveldb module anymore.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389892 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-core/pom.xml                        | 17 +++++++++--------
 activemq-leveldb/pom.xml                     | 10 +++++-----
 assembly/pom.xml                             |  8 ++++----
 assembly/src/main/descriptors/common-bin.xml |  2 +-
 pom.xml                                      |  7 ++++++-
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index d87ca8a284..b079f80f69 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -54,7 +54,8 @@
       org.springframework.beans.factory.xml;resolution:=optional,
       org.w3c.dom.traversal*;resolution:=optional,
       org.fusesource.hawtbuf*;resolution:=optional,
-      org.fusesource.mq.leveldb*;resolution:=optional,
+      org.apache.activemq.store.leveldb*;resolution:=optional,
+      org.apache.activemq.leveldb*;resolution:=optional,
       org.fusesource.mqtt.client*;resolution:=optional,
       org.fusesource.mqtt.codec*;resolution:=optional,
       *
@@ -94,11 +95,6 @@
       <artifactId>activemq-protobuf</artifactId>
       <optional>false</optional>
     </dependency>
-    <dependency>
-      <groupId>org.fusesource.fuse-extra</groupId>
-      <artifactId>fusemq-leveldb</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.fusesource.mqtt-client</groupId>
       <artifactId>mqtt-client</artifactId>
@@ -234,7 +230,13 @@
       <version>${jasypt-version}</version>
       <optional>true</optional>
     </dependency>
-
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.26</version>
+      <scope>test</scope>
+    </dependency>
+    
     <!-- database testing -->
     <dependency>
       <groupId>commons-collections</groupId>
@@ -830,7 +832,6 @@
             <exclude>org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.*</exclude>
             <exclude>org/apache/activemq/pool/PooledConnectionFactoryTest.*</exclude>
             <exclude>org/apache/activemq/network/DemandForwardingBridgeFilterTest.*</exclude>
-            <exclude>org/apache/activemq/store/leveldb/LevelDBConfigTest.*</exclude>
             <exclude>org/apache/activemq/test/message/NestedMapMessageTest.*</exclude>
             <exclude>org/apache/activemq/transport/failover/FailoverTimeoutTest.*</exclude>
             <exclude>org/apache/activemq/broker/scheduler/JobSchedulerTest.*</exclude>
diff --git a/activemq-leveldb/pom.xml b/activemq-leveldb/pom.xml
index 5464fb676e..cf455d90e9 100644
--- a/activemq-leveldb/pom.xml
+++ b/activemq-leveldb/pom.xml
@@ -69,27 +69,27 @@
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-osx</artifactId>
-      <version>1.3</version>
+      <version>${leveldbjni-version}</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-linux32</artifactId>
-      <version>1.3</version>
+      <version>${leveldbjni-version}</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-linux64</artifactId>
-      <version>1.3</version>
+      <version>${leveldbjni-version}</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-win32</artifactId>
-      <version>1.3</version>
+      <version>${leveldbjni-version}</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-win64</artifactId>
-      <version>1.3</version>
+      <version>${leveldbjni-version}</version>
     </dependency>
 
     <!-- For Optional Snappy Compression -->
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e39f296181..a4bcee4ef5 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -54,6 +54,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-leveldb</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
@@ -149,10 +153,6 @@
       <artifactId>commons-pool</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-	    <groupId>org.fusesource.fuse-extra</groupId>
-	    <artifactId>fusemq-leveldb</artifactId>
-	  </dependency>
     <dependency>
       <groupId>activesoap</groupId>
       <artifactId>jaxp-api</artifactId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 950da8f245..ab168b6c1b 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -182,7 +182,7 @@
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <includes>
         <!-- leveldb -->
-        <include>org.fusesource.fuse-extra:fusemq-leveldb</include>
+        <include>org.apache.activemq:activemq-leveldb</include>
         <include>org.fusesource.hawtbuf:hawtbuf</include>
         <!-- mqtt -->
         <include>org.fusesource.mqtt-client:mqtt-client</include>
diff --git a/pom.xml b/pom.xml
index e67b2c7555..0c94dd2e60 100755
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
     <junit-version>4.10</junit-version>
     <jxta-version>2.0</jxta-version>
     <karaf-version>2.2.9</karaf-version>
-    <leveldbjni-version>1.2</leveldbjni-version>
+    <leveldbjni-version>1.3</leveldbjni-version>
     <log4j-version>1.2.17</log4j-version>
     <mqtt-client-version>1.3</mqtt-client-version>
     <openjpa-version>1.2.0</openjpa-version>
@@ -273,6 +273,11 @@
         <artifactId>activemq-web</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-leveldb</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-xmpp</artifactId>