You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/02/23 10:00:39 UTC
[2/2] james-project git commit: JAMES-1891 upgrade activemq and
switch persistence engine
JAMES-1891 upgrade activemq and switch persistence engine
Version 5.10 of ActiveMQ is the last one to support java-6
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/27d91f0f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/27d91f0f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/27d91f0f
Branch: refs/heads/master
Commit: 27d91f0f18721ad6af5fdc589458d97eae9fb81d
Parents: e253358
Author: Matthieu Baechler <ma...@gmail.com>
Authored: Fri Dec 16 23:15:26 2016 +0100
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 23 17:00:00 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/modules/server/EmbeddedActiveMQ.java | 4 ++--
server/pom.xml | 4 ++--
server/queue/queue-activemq/pom.xml | 7 ++++++-
.../main/resources/META-INF/spring/activemq-queue-context.xml | 2 +-
server/queue/queue-jms/pom.xml | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/27d91f0f/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java
index 2c38535..51d72db 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java
@@ -29,7 +29,7 @@ import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.plugin.StatisticsBrokerPlugin;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.queue.activemq.FileSystemBlobTransferPolicy;
@@ -94,7 +94,7 @@ public class EmbeddedActiveMQ {
ManagementContext managementContext = new ManagementContext();
managementContext.setCreateConnector(false);
brokerService.setManagementContext(managementContext);
- brokerService.setPersistenceAdapter(new AMQPersistenceAdapter());
+ brokerService.setPersistenceAdapter(new KahaDBPersistenceAdapter());
BrokerPlugin[] brokerPlugins = {new StatisticsBrokerPlugin()};
brokerService.setPlugins(brokerPlugins);
String[] transportConnectorsURIs = {"tcp://localhost:0"};
http://git-wip-us.apache.org/repos/asf/james-project/blob/27d91f0f/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 3259d60..7080631 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -123,7 +123,7 @@
<properties>
<productName>Apache-James Mail Server</productName>
- <activemq.version>5.7.0</activemq.version>
+ <activemq.version>5.10.2</activemq.version>
<apache-mime4j.version>0.8.0</apache-mime4j.version>
<camel.version>2.13.4</camel.version>
<derby.version>10.9.1.0</derby.version>
@@ -1304,7 +1304,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<version>${activemq.version}</version>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/james-project/blob/27d91f0f/server/queue/queue-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index 9f8c0fe..a6c164c 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -55,9 +55,14 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/27d91f0f/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml b/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
index 4e8ca76..3903250 100644
--- a/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
+++ b/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
@@ -52,7 +52,7 @@
<amq:managementContext createConnector="false"/>
</amq:managementContext>
<amq:persistenceAdapter>
- <amq:amqPersistenceAdapter/>
+ <amq:kahaDB/>
</amq:persistenceAdapter>
<amq:plugins>
<amq:statisticsBrokerPlugin/>
http://git-wip-us.apache.org/repos/asf/james-project/blob/27d91f0f/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 8e1850c..c7e651a 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org