This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch JAMES-1902-extract-some-guice-modules in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 96f2a7f713524552f0fac9a3a5602f195b914d7b Author: Matthieu Baechler <[email protected]> AuthorDate: Thu Oct 29 23:36:57 2020 +0100 JAMES-1902 Extract 'data' cassandra implementation into its own maven module --- server/container/guice/cassandra-guice/pom.xml | 4 ++ server/container/guice/data-cassandra/pom.xml | 61 ++++++++++++++++++++++ .../modules/data/CassandraDomainListModule.java | 1 + .../data/CassandraRecipientRewriteTableModule.java | 1 + .../data/CassandraUsersRepositoryModule.java | 1 + server/container/guice/pom.xml | 6 +++ 6 files changed, 74 insertions(+) diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index c29be3b..6561a2d 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -128,6 +128,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>data-cassandra</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>event-sourcing-event-store-cassandra</artifactId> </dependency> <dependency> diff --git a/server/container/guice/data-cassandra/pom.xml b/server/container/guice/data-cassandra/pom.xml new file mode 100644 index 0000000..adfd27c --- /dev/null +++ b/server/container/guice/data-cassandra/pom.xml @@ -0,0 +1,61 @@ +<?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>james-server-guice</artifactId> + <version>3.6.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>data-cassandra</artifactId> + <packaging>jar</packaging> + + <name>Apache James :: Server :: Data :: Cassandra / Guice</name> + <description>Guice modules for Cassandra implementation of 'data' interfaces</description> + + <properties> + <cassandra.includes>empty</cassandra.includes> + </properties> + + <dependencies> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-core</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-data-cassandra</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-configuration</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + </dependencies> + + +</project> diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java b/server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java similarity index 99% rename from server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java rename to server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java index c854d8d..e9cb213 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java +++ b/server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ + package org.apache.james.modules.data; import org.apache.commons.configuration2.ex.ConfigurationException; diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java b/server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java similarity index 99% rename from server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java rename to server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java index 709a242..1460694 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java +++ b/server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ + package org.apache.james.modules.data; import org.apache.james.backends.cassandra.components.CassandraModule; diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java b/server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java similarity index 99% rename from server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java rename to server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java index 505b96f..7edeb44 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java +++ b/server/container/guice/data-cassandra/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ + package org.apache.james.modules.data; import org.apache.james.backends.cassandra.components.CassandraModule; diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 1e37151..ef5ebe5 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -43,6 +43,7 @@ <module>cassandra-rabbitmq-guice</module> <module>cassandra-rabbitmq-ldap-guice</module> <module>configuration</module> + <module>data-cassandra</module> <module>es-metric-reporter</module> <module>guice-common</module> <module>guice-utils</module> @@ -83,6 +84,11 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>data-cassandra</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-cassandra-ldap-guice</artifactId> <version>${project.version}</version> <type>test-jar</type> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
