From 7db8987ca6fdb3ce4f65d30a4178c0ccc483b525 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Sun, 9 Jun 2013 20:41:24 +0000
Subject: [PATCH] Fixup the assembly packaging so that the replicated leveldb
 store can be used.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1491287 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-leveldb-store/pom.xml | 10 +++++-----
 assembly/pom.xml               | 33 +++++++++++++++++++++++++++++++++
 pom.xml                        |  1 +
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index e467def1f3..fdb160c90e 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -113,31 +113,31 @@
     <dependency>
       <groupId>org.fusesource.fabric</groupId>
       <artifactId>fabric-groups</artifactId>
-      <version>7.2.0.redhat-024</version>
+      <version>${fabric-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.fusesource.fabric</groupId>
       <artifactId>fabric-linkedin-zookeeper</artifactId>
-      <version>7.2.0.redhat-024</version>
+      <version>${fabric-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.fusesource.fabric</groupId>
       <artifactId>fabric-zookeeper</artifactId>
-      <version>7.2.0.redhat-024</version>
+      <version>${fabric-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.3.1</version>
+      <version>${org.osgi.core-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.3.1</version>
+      <version>${org.osgi.core-version}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ef7ca18108..6bdce441a2 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -75,6 +75,39 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-leveldb-store</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.fusesource.hawtdispatch</groupId>
+      <artifactId>hawtdispatch-transport</artifactId>
+      <version>${hawtdispatch-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.fusesource.fabric</groupId>
+      <artifactId>fabric-groups</artifactId>
+      <version>${fabric-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.fusesource.fabric</groupId>
+      <artifactId>fabric-linkedin-zookeeper</artifactId>
+      <version>${fabric-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.fusesource.fabric</groupId>
+      <artifactId>fabric-zookeeper</artifactId>
+      <version>${fabric-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>${org.osgi.core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>${org.osgi.core-version}</version>
+    </dependency>    
+    
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
diff --git a/pom.xml b/pom.xml
index b7c231851b..b8ad9b267a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
     <opensymphony-version>2.4.2</opensymphony-version>
     <org-apache-derby-version>10.9.1.0</org-apache-derby-version>
     <org.osgi.core-version>4.3.1</org.osgi.core-version>
+    <fabric-version>7.2.0.redhat-024</fabric-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <qpid-proton-version>0.3.0-fuse-3</qpid-proton-version>
     <qpid-jms-version>0.20</qpid-jms-version>