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
This commit is contained in:
Hiram R. Chirino 2012-09-25 14:50:15 +00:00
parent b20d5411d1
commit 4051799a6d
5 changed files with 25 additions and 19 deletions

View File

@ -54,7 +54,8 @@
org.springframework.beans.factory.xml;resolution:=optional, org.springframework.beans.factory.xml;resolution:=optional,
org.w3c.dom.traversal*;resolution:=optional, org.w3c.dom.traversal*;resolution:=optional,
org.fusesource.hawtbuf*;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.client*;resolution:=optional,
org.fusesource.mqtt.codec*;resolution:=optional, org.fusesource.mqtt.codec*;resolution:=optional,
* *
@ -94,11 +95,6 @@
<artifactId>activemq-protobuf</artifactId> <artifactId>activemq-protobuf</artifactId>
<optional>false</optional> <optional>false</optional>
</dependency> </dependency>
<dependency>
<groupId>org.fusesource.fuse-extra</groupId>
<artifactId>fusemq-leveldb</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.fusesource.mqtt-client</groupId> <groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId> <artifactId>mqtt-client</artifactId>
@ -234,6 +230,12 @@
<version>${jasypt-version}</version> <version>${jasypt-version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
<scope>test</scope>
</dependency>
<!-- database testing --> <!-- database testing -->
<dependency> <dependency>
@ -830,7 +832,6 @@
<exclude>org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.*</exclude> <exclude>org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.*</exclude>
<exclude>org/apache/activemq/pool/PooledConnectionFactoryTest.*</exclude> <exclude>org/apache/activemq/pool/PooledConnectionFactoryTest.*</exclude>
<exclude>org/apache/activemq/network/DemandForwardingBridgeFilterTest.*</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/test/message/NestedMapMessageTest.*</exclude>
<exclude>org/apache/activemq/transport/failover/FailoverTimeoutTest.*</exclude> <exclude>org/apache/activemq/transport/failover/FailoverTimeoutTest.*</exclude>
<exclude>org/apache/activemq/broker/scheduler/JobSchedulerTest.*</exclude> <exclude>org/apache/activemq/broker/scheduler/JobSchedulerTest.*</exclude>

View File

@ -69,27 +69,27 @@
<dependency> <dependency>
<groupId>org.fusesource.leveldbjni</groupId> <groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-osx</artifactId> <artifactId>leveldbjni-osx</artifactId>
<version>1.3</version> <version>${leveldbjni-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.fusesource.leveldbjni</groupId> <groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-linux32</artifactId> <artifactId>leveldbjni-linux32</artifactId>
<version>1.3</version> <version>${leveldbjni-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.fusesource.leveldbjni</groupId> <groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-linux64</artifactId> <artifactId>leveldbjni-linux64</artifactId>
<version>1.3</version> <version>${leveldbjni-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.fusesource.leveldbjni</groupId> <groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-win32</artifactId> <artifactId>leveldbjni-win32</artifactId>
<version>1.3</version> <version>${leveldbjni-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.fusesource.leveldbjni</groupId> <groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-win64</artifactId> <artifactId>leveldbjni-win64</artifactId>
<version>1.3</version> <version>${leveldbjni-version}</version>
</dependency> </dependency>
<!-- For Optional Snappy Compression --> <!-- For Optional Snappy Compression -->

View File

@ -54,6 +54,10 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activeio-core</artifactId> <artifactId>activeio-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-leveldb</artifactId>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId> <artifactId>activemq-console</artifactId>
@ -149,10 +153,6 @@
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.fusesource.fuse-extra</groupId>
<artifactId>fusemq-leveldb</artifactId>
</dependency>
<dependency> <dependency>
<groupId>activesoap</groupId> <groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId> <artifactId>jaxp-api</artifactId>

View File

@ -182,7 +182,7 @@
<useTransitiveFiltering>true</useTransitiveFiltering> <useTransitiveFiltering>true</useTransitiveFiltering>
<includes> <includes>
<!-- leveldb --> <!-- leveldb -->
<include>org.fusesource.fuse-extra:fusemq-leveldb</include> <include>org.apache.activemq:activemq-leveldb</include>
<include>org.fusesource.hawtbuf:hawtbuf</include> <include>org.fusesource.hawtbuf:hawtbuf</include>
<!-- mqtt --> <!-- mqtt -->
<include>org.fusesource.mqtt-client:mqtt-client</include> <include>org.fusesource.mqtt-client:mqtt-client</include>

View File

@ -83,7 +83,7 @@
<junit-version>4.10</junit-version> <junit-version>4.10</junit-version>
<jxta-version>2.0</jxta-version> <jxta-version>2.0</jxta-version>
<karaf-version>2.2.9</karaf-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> <log4j-version>1.2.17</log4j-version>
<mqtt-client-version>1.3</mqtt-client-version> <mqtt-client-version>1.3</mqtt-client-version>
<openjpa-version>1.2.0</openjpa-version> <openjpa-version>1.2.0</openjpa-version>
@ -273,6 +273,11 @@
<artifactId>activemq-web</artifactId> <artifactId>activemq-web</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-leveldb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-xmpp</artifactId> <artifactId>activemq-xmpp</artifactId>