You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/09/25 16:50:16 UTC
svn commit: r1389892 - in /activemq/trunk: activemq-core/pom.xml
activemq-leveldb/pom.xml assembly/pom.xml
assembly/src/main/descriptors/common-bin.xml pom.xml
Author: chirino
Date: Tue Sep 25 14:50:15 2012
New Revision: 1389892
URL: http://svn.apache.org/viewvc?rev=1389892&view=rev
Log:
More work for AMQ-4080: Include the activemq-leveldb module in the assembly, don't use the fusesource leveldb module anymore.
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-leveldb/pom.xml
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1389892&r1=1389891&r2=1389892&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Sep 25 14:50:15 2012
@@ -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,
*
@@ -95,11 +96,6 @@
<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>
</dependency>
@@ -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>
Modified: activemq/trunk/activemq-leveldb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb/pom.xml?rev=1389892&r1=1389891&r2=1389892&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/pom.xml (original)
+++ activemq/trunk/activemq-leveldb/pom.xml Tue Sep 25 14:50:15 2012
@@ -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 -->
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1389892&r1=1389891&r2=1389892&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Sep 25 14:50:15 2012
@@ -56,6 +56,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>activemq-leveldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
<dependency>
@@ -150,10 +154,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.fusesource.fuse-extra</groupId>
- <artifactId>fusemq-leveldb</artifactId>
- </dependency>
- <dependency>
<groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId>
</dependency>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1389892&r1=1389891&r2=1389892&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Sep 25 14:50:15 2012
@@ -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>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1389892&r1=1389891&r2=1389892&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Sep 25 14:50:15 2012
@@ -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>
@@ -275,6 +275,11 @@
</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>
<version>${project.version}</version>
</dependency>