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:30 UTC
[james-project] 04/18: JAMES-3498 Move as is the Cassandra
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 f9312dfd6ecb3050f205a7a5c69a08d60f5bb28c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Jan 25 14:00:54 2021 +0700
JAMES-3498 Move as is the Cassandra implementation
---
.../event/event-cassandra => event-bus/cassandra}/pom.xml | 15 +++++++--------
.../apache/james/events/CassandraEventDeadLetters.java | 0
.../apache/james/events/CassandraEventDeadLettersDAO.java | 0
.../james/events/CassandraEventDeadLettersGroupDAO.java | 0
.../james/events/CassandraEventDeadLettersModule.java | 0
.../tables/CassandraEventDeadLettersGroupTable.java | 0
.../events/tables/CassandraEventDeadLettersTable.java | 0
.../james/events/CassandraEventDeadLettersDAOTest.java | 0
.../events/CassandraEventDeadLettersGroupDAOTest.java | 0
.../events/CassandraEventDeadLettersHealthCheckTest.java | 0
.../james/events/CassandraEventDeadLettersTest.java | 0
event-bus/pom.xml | 1 +
mailbox/pom.xml | 1 -
pom.xml | 10 +++++-----
server/container/guice/cassandra-guice/pom.xml | 8 ++++----
15 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/mailbox/event/event-cassandra/pom.xml b/event-bus/cassandra/pom.xml
similarity index 84%
rename from mailbox/event/event-cassandra/pom.xml
rename to event-bus/cassandra/pom.xml
index fd72ca4..12763a8 100644
--- a/mailbox/event/event-cassandra/pom.xml
+++ b/event-bus/cassandra/pom.xml
@@ -17,18 +17,18 @@
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">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
+ <artifactId>event-bus</artifactId>
<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-cassandra</artifactId>
- <name>Apache James :: Mailbox :: Event :: In Cassandra implementation</name>
+ <artifactId>dead-letter-cassandra</artifactId>
+ <name>Apache James :: Event Bus :: Dead Letter :: Cassandra</name>
<description>In Cassandra implementation for the eventDeadLetter API</description>
<dependencies>
@@ -72,5 +72,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLetters.java b/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLetters.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLetters.java
rename to event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLetters.java
diff --git a/mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersDAO.java b/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersDAO.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersDAO.java
rename to event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersDAO.java
diff --git a/mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java b/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java
rename to event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java
diff --git a/mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersModule.java b/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersModule.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersModule.java
rename to event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersModule.java
diff --git a/mailbox/event/event-cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersGroupTable.java b/event-bus/cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersGroupTable.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersGroupTable.java
rename to event-bus/cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersGroupTable.java
diff --git a/mailbox/event/event-cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersTable.java b/event-bus/cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersTable.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersTable.java
rename to event-bus/cassandra/src/main/java/org/apache/james/events/tables/CassandraEventDeadLettersTable.java
diff --git a/mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersDAOTest.java b/event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersDAOTest.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersDAOTest.java
rename to event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersDAOTest.java
diff --git a/mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersGroupDAOTest.java b/event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersGroupDAOTest.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersGroupDAOTest.java
rename to event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersGroupDAOTest.java
diff --git a/mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersHealthCheckTest.java b/event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersHealthCheckTest.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersHealthCheckTest.java
rename to event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersHealthCheckTest.java
diff --git a/mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersTest.java b/event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersTest.java
similarity index 100%
rename from mailbox/event/event-cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersTest.java
rename to event-bus/cassandra/src/test/java/org/apache/james/events/CassandraEventDeadLettersTest.java
diff --git a/event-bus/pom.xml b/event-bus/pom.xml
index 4e36b39..95a420c 100644
--- a/event-bus/pom.xml
+++ b/event-bus/pom.xml
@@ -33,6 +33,7 @@
<modules>
<module>api</module>
+ <module>cassandra</module>
<module>distributed</module>
<module>in-vm</module>
</modules>
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index f5bb377..e73b5e8 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -40,7 +40,6 @@
<module>cassandra</module>
<module>elasticsearch</module>
- <module>event/event-cassandra</module>
<module>event/json</module>
<module>jpa</module>
diff --git a/pom.xml b/pom.xml
index 5245d5e..146ba5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -760,11 +760,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-event-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-event-json</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1151,6 +1146,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>dead-letter-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-bus-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 28ee945..66b277f 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -77,10 +77,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-event-cassandra</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-elasticsearch</artifactId>
</dependency>
<dependency>
@@ -128,6 +124,10 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>dead-letter-cassandra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org