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 ro...@apache.org on 2019/08/28 07:28:35 UTC
[james-project] 04/09: JAMES-2813 Move TaskManagerTest to
Distributed project
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b2640dd967ef71a005b2bcb1a1fe3c5fa39f3e87
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Thu Aug 1 12:15:54 2019 +0200
JAMES-2813 Move TaskManagerTest to Distributed project
---
server/container/guice/cassandra-guice/pom.xml | 9 ---------
server/container/guice/cassandra-rabbitmq-guice/pom.xml | 4 ++++
.../java/org/apache/james/DistributedTaskManagerModule.java | 0
server/task-distributed/pom.xml | 12 ++++++++++++
.../distributed/DistributedTaskManagerTest.java} | 5 ++---
5 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index f5440a7..79a6a5e 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -246,15 +246,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-task-distributed</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-task-distributed</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-task-json</artifactId>
</dependency>
<dependency>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
index 043cb73..050f0b0 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
@@ -135,6 +135,10 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>james-server-task-distributed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DistributedTaskManagerModule.java b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/DistributedTaskManagerModule.java
similarity index 100%
rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/DistributedTaskManagerModule.java
rename to server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/DistributedTaskManagerModule.java
diff --git a/server/task-distributed/pom.xml b/server/task-distributed/pom.xml
index 63a7a01..844c693 100644
--- a/server/task-distributed/pom.xml
+++ b/server/task-distributed/pom.xml
@@ -30,6 +30,7 @@
<artifactId>james-server-task-distributed</artifactId>
<name>Apache James :: Server :: Task :: Distributed</name>
+ <description>Distributed task manager leveraging Cassandra and RabbitMQ</description>
<dependencies>
<dependency>
@@ -59,6 +60,12 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-sourcing-event-store-cassandra</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-json</artifactId>
</dependency>
<dependency>
@@ -96,6 +103,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
similarity index 97%
rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java
rename to server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
index 8f465e5..ce43266 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java
+++ b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james;
+package org.apache.james.task.eventsourcing.distributed;
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,7 +49,6 @@ import org.apache.james.task.eventsourcing.WorkerStatusListener;
import org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjection;
import org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionDAO;
import org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionModule;
-import org.apache.james.task.eventsourcing.distributed.TasksSerializationModule;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.junit.jupiter.api.Test;
@@ -57,7 +56,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import com.github.steveash.guavate.Guavate;
-class CassandraTaskManagerTest {
+class DistributedTaskManagerTest {
private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(TestTaskDTOModules.COMPLETED_TASK_MODULE);
private static final Set<EventDTOModule> MODULES = TasksSerializationModule.MODULES.apply(TASK_SERIALIZER).stream().collect(Guavate.toImmutableSet());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org