You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/04 05:02:29 UTC
[james-project] 03/18: JAMES-3498 Move as is the Distributed
implementation
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4bc40387ed257212f026abc24ab52afa917488dd
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Jan 25 13:54:40 2021 +0700
JAMES-3498 Move as is the Distributed implementation
---
event-bus/distributed/pom.xml | 86 +++++++++++++++
.../java/org/apache/james/events/EventBusId.java | 0
.../org/apache/james/events/EventDispatcher.java | 0
.../apache/james/events/GroupConsumerRetry.java | 0
.../org/apache/james/events/GroupRegistration.java | 0
.../james/events/GroupRegistrationHandler.java | 0
.../james/events/KeyReconnectionHandler.java | 0
.../org/apache/james/events/KeyRegistration.java | 2 -
.../james/events/KeyRegistrationHandler.java | 0
.../apache/james/events/LocalListenerRegistry.java | 3 -
.../james/events/MailboxListenerExecutor.java | 3 -
.../org/apache/james/events/RabbitMQEventBus.java | 0
.../apache/james/events/RegistrationBinder.java | 0
.../apache/james/events/RegistrationQueueName.java | 0
.../apache/james/events/RoutingKeyConverter.java | 0
.../apache/james/events/WaitDelayGenerator.java | 0
.../org/apache/james/events/EventBusIdTest.java | 0
.../james/events/LocalListenerRegistryTest.java | 0
.../org/apache/james/events/NetworkErrorTest.java | 0
...RabbitMQEventBusDeadLetterQueueUpgradeTest.java | 0
.../apache/james/events/RabbitMQEventBusTest.java | 10 +-
.../james/events/RoutingKeyConverterTest.java | 0
.../james/events/WaitDelayGeneratorTest.java | 0
mailbox/event/event-rabbitmq/pom.xml | 120 ---------------------
mailbox/pom.xml | 1 -
mpt/impl/imap-mailbox/rabbitmq/pom.xml | 10 +-
pom.xml | 10 +-
.../guice/cassandra-rabbitmq-guice/pom.xml | 8 +-
28 files changed, 105 insertions(+), 148 deletions(-)
diff --git a/event-bus/distributed/pom.xml b/event-bus/distributed/pom.xml
index a202f2c..9bd7f5c 100644
--- a/event-bus/distributed/pom.xml
+++ b/event-bus/distributed/pom.xml
@@ -31,4 +31,90 @@
<name>Apache James :: Event Bus :: Distributed</name>
<description>Distributed implementation for the eventBus</description>
+ <dependencies>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-tests</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>testing-base</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-rabbitmq</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-rabbitmq</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-event-json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-in-vm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.projectreactor.rabbitmq</groupId>
+ <artifactId>reactor-rabbitmq</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/EventBusId.java b/event-bus/distributed/src/main/java/org/apache/james/events/EventBusId.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/EventBusId.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/EventBusId.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/EventDispatcher.java b/event-bus/distributed/src/main/java/org/apache/james/events/EventDispatcher.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/EventDispatcher.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/EventDispatcher.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/GroupConsumerRetry.java b/event-bus/distributed/src/main/java/org/apache/james/events/GroupConsumerRetry.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/GroupConsumerRetry.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/GroupConsumerRetry.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/GroupRegistration.java b/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/GroupRegistration.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/GroupRegistrationHandler.java b/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyReconnectionHandler.java b/event-bus/distributed/src/main/java/org/apache/james/events/KeyReconnectionHandler.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyReconnectionHandler.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/KeyReconnectionHandler.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyRegistration.java b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java
similarity index 96%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyRegistration.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java
index b7d6c28..53e79b0 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyRegistration.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java
@@ -19,8 +19,6 @@
package org.apache.james.events;
-import org.apache.james.events.Registration;
-
class KeyRegistration implements Registration {
private final Runnable unregister;
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyRegistrationHandler.java b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/LocalListenerRegistry.java b/event-bus/distributed/src/main/java/org/apache/james/events/LocalListenerRegistry.java
similarity index 98%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/LocalListenerRegistry.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/LocalListenerRegistry.java
index 05306ae..f4e5537 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/LocalListenerRegistry.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/LocalListenerRegistry.java
@@ -26,9 +26,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
-import org.apache.james.events.EventListener;
-import org.apache.james.events.RegistrationKey;
-
import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableSet;
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/MailboxListenerExecutor.java b/event-bus/distributed/src/main/java/org/apache/james/events/MailboxListenerExecutor.java
similarity index 95%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/MailboxListenerExecutor.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/MailboxListenerExecutor.java
index 7b6afef..e74e6ec 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/MailboxListenerExecutor.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/MailboxListenerExecutor.java
@@ -21,9 +21,6 @@ package org.apache.james.events;
import static org.apache.james.events.EventBus.Metrics.timerName;
-import org.apache.james.events.Event;
-import org.apache.james.events.EventBus;
-import org.apache.james.events.EventListener;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.util.MDCBuilder;
import org.apache.james.util.ReactorUtils;
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RabbitMQEventBus.java b/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBus.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RabbitMQEventBus.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBus.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RegistrationBinder.java b/event-bus/distributed/src/main/java/org/apache/james/events/RegistrationBinder.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RegistrationBinder.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/RegistrationBinder.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RegistrationQueueName.java b/event-bus/distributed/src/main/java/org/apache/james/events/RegistrationQueueName.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RegistrationQueueName.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/RegistrationQueueName.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RoutingKeyConverter.java b/event-bus/distributed/src/main/java/org/apache/james/events/RoutingKeyConverter.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/RoutingKeyConverter.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/RoutingKeyConverter.java
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/WaitDelayGenerator.java b/event-bus/distributed/src/main/java/org/apache/james/events/WaitDelayGenerator.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/main/java/org/apache/james/events/WaitDelayGenerator.java
rename to event-bus/distributed/src/main/java/org/apache/james/events/WaitDelayGenerator.java
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/EventBusIdTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/EventBusIdTest.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/EventBusIdTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/EventBusIdTest.java
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/LocalListenerRegistryTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/LocalListenerRegistryTest.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/LocalListenerRegistryTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/LocalListenerRegistryTest.java
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/NetworkErrorTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/NetworkErrorTest.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/NetworkErrorTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/NetworkErrorTest.java
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
similarity index 98%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
index 47e84be..6313fc6 100644
--- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
+++ b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
@@ -185,7 +185,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract,
@Test
void eventProcessingShouldNotCrashOnInvalidMessage() {
EventCollector listener = new EventCollector();
- EventBusTestFixture.GroupA registeredGroup = new EventBusTestFixture.GroupA();
+ GroupA registeredGroup = new GroupA();
eventBus.register(listener, registeredGroup);
String emptyRoutingKey = "";
@@ -204,7 +204,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract,
@Test
void eventProcessingShouldNotCrashOnInvalidMessages() {
EventCollector listener = new EventCollector();
- EventBusTestFixture.GroupA registeredGroup = new EventBusTestFixture.GroupA();
+ GroupA registeredGroup = new GroupA();
eventBus.register(listener, registeredGroup);
String emptyRoutingKey = "";
@@ -223,7 +223,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract,
@Test
void eventProcessingShouldStoreInvalidMessagesInDeadLetterQueue() {
EventCollector listener = new EventCollector();
- EventBusTestFixture.GroupA registeredGroup = new EventBusTestFixture.GroupA();
+ GroupA registeredGroup = new GroupA();
eventBus.register(listener, registeredGroup);
String emptyRoutingKey = "";
@@ -287,7 +287,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract,
@Test
void registerGroupShouldCreateRetryExchange() throws Exception {
EventListener listener = newListener();
- EventBusTestFixture.GroupA registeredGroup = new EventBusTestFixture.GroupA();
+ GroupA registeredGroup = new GroupA();
eventBus.register(listener, registeredGroup);
GroupConsumerRetry.RetryExchangeName retryExchangeName = GroupConsumerRetry.RetryExchangeName.of(registeredGroup);
@@ -307,7 +307,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract,
@Test
void rabbitMQEventBusShouldHandleBulksGracefully() throws Exception {
EventListenerCountingSuccessfulExecution countingListener1 = newCountingListener();
- eventBus().register(countingListener1, new EventBusTestFixture.GroupA());
+ eventBus().register(countingListener1, new GroupA());
int totalGlobalRegistrations = 1; // GroupA
int threadCount = 10;
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RoutingKeyConverterTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/RoutingKeyConverterTest.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/RoutingKeyConverterTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/RoutingKeyConverterTest.java
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/WaitDelayGeneratorTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/WaitDelayGeneratorTest.java
similarity index 100%
rename from mailbox/event/event-rabbitmq/src/test/java/org/apache/james/events/WaitDelayGeneratorTest.java
rename to event-bus/distributed/src/test/java/org/apache/james/events/WaitDelayGeneratorTest.java
diff --git a/mailbox/event/event-rabbitmq/pom.xml b/mailbox/event/event-rabbitmq/pom.xml
deleted file mode 100644
index cdb79b3..0000000
--- a/mailbox/event/event-rabbitmq/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>apache-james-mailbox-event-rabbitmq</artifactId>
- <name>Apache James :: Mailbox :: Event :: RabbitMQ implementation</name>
- <description>RabbitMQ implementation for the eventbus API</description>
-
- <dependencies>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>metrics-tests</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>testing-base</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-rabbitmq</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-rabbitmq</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-event-json</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>event-bus-in-vm</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.rabbitmq</groupId>
- <artifactId>reactor-rabbitmq</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 14e92aa..f5bb377 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -41,7 +41,6 @@
<module>elasticsearch</module>
<module>event/event-cassandra</module>
- <module>event/event-rabbitmq</module>
<module>event/json</module>
<module>jpa</module>
diff --git a/mpt/impl/imap-mailbox/rabbitmq/pom.xml b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
index 533c221..e2332fd 100644
--- a/mpt/impl/imap-mailbox/rabbitmq/pom.xml
+++ b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
@@ -44,11 +44,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-event-rabbitmq</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
@@ -64,6 +59,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-distributed</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 203d59d..5245d5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -770,11 +770,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-event-rabbitmq</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1161,6 +1156,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-distributed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-bus-in-vm</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
index a75b05e..beffba1 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
@@ -71,10 +71,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-event-rabbitmq</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -101,6 +97,10 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-distributed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org