From 2e622a4e15ca847bfcaf4c7c4c01f02519d4da27 Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Sun, 27 Jan 2013 14:03:41 +0000 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-4034 - initial work on leveldb integration git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439086 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/resources/features.xml | 21 +-------- activemq-leveldb-store/pom.xml | 47 +++++++++++++++++++ activemq-osgi/pom.xml | 6 ++- 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index 8a36e914d5..28dcb45702 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -27,24 +27,6 @@ mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1 mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1 mvn:commons-pool/commons-pool/${commons-pool-version} - - - - - - - - - - - - - - - - - - @@ -118,10 +100,11 @@ + mvn:org.scala-lang/scala-library/${scala-version} mvn:org.fusesource.mqtt-client/mqtt-client/${mqtt-client-version} mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version} - mvn:org.apache.activemq/activemq-leveldb/${project.version}/jar/bundle mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version} + mvn:org.fusesource.hawtdispatch/hawtdispatch-scala/${hawtdispatch-version} mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version} diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml index 1183b17ef6..d697adbd90 100644 --- a/activemq-leveldb-store/pom.xml +++ b/activemq-leveldb-store/pom.xml @@ -365,6 +365,53 @@ + + org.fusesource.mvnplugins + maven-uberize-plugin + 1.14 + + + all + package + uberize + + + + true + uber + + + + org.fusesource.hawtdispatch:hawtdispatch + org.fusesource.hawtdispatch:hawtdispatch-scala + org.fusesource.hawtbuf:hawtbuf + org.fusesource.hawtbuf:hawtbuf-proto + + org.iq80.leveldb:leveldb-api + + org.iq80.leveldb:leveldb + + org.xerial.snappy:snappy-java + + org.fusesource.leveldbjni:leveldbjni + org.fusesource.leveldbjni:leveldbjni-osx + org.fusesource.leveldbjni:leveldbjni-linux32 + org.fusesource.leveldbjni:leveldbjni-linux64 + org.fusesource.hawtjni:hawtjni-runtime + + + org.apache.hadoop:hadoop-core + commons-configuration:commons-configuration + org.codehaus.jackson:jackson-mapper-asl + org.codehaus.jackson:jackson-core-asl + + + + + diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index a8535c4ed1..e32b071176 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -35,7 +35,9 @@ - org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first + org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first, + org.iq80*;-noimport:=true;-split-package:=merge-first, + org.fusesource*;-noimport:=true;-split-package:=merge-first * -Xmx512M @@ -60,6 +62,8 @@ ${project.groupId} activemq-leveldb-store + ${project.version} + uber ${project.groupId}