You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by ma...@apache.org on 2020/10/30 11:25:52 UTC
[james-project] branch JAMES-1902-extract-some-guice-modules
created (now f54573e)
This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a change to branch JAMES-1902-extract-some-guice-modules
in repository https://gitbox.apache.org/repos/asf/james-project.git.
at f54573e JAMES-1902 Extract 'mailrepository' cassandra implementation into its own maven module
This branch includes the following new commits:
new 96f2a7f JAMES-1902 Extract 'data' cassandra implementation into its own maven module
new f54573e JAMES-1902 Extract 'mailrepository' cassandra implementation into its own maven module
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/02: JAMES-1902 Extract 'mailrepository'
cassandra implementation into its own maven module
Posted by ma...@apache.org.
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 f54573eaee3bb7414b758e2f1345a1ff29e46475
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Fri Oct 30 00:16:11 2020 +0100
JAMES-1902 Extract 'mailrepository' cassandra implementation into its own maven module
---
server/container/guice/cassandra-guice/pom.xml | 4 ++
.../org/apache/james/CassandraJamesServerMain.java | 2 +-
.../modules/server/MailStoreRepositoryModule.java | 11 ++--
.../modules/data/JPAMailRepositoryModule.java | 11 ++--
.../guice/mailrepository-cassandra/pom.xml | 65 ++++++++++++++++++++++
.../CassandraMailRepositoryModule.java | 15 ++---
.../james/modules/data/MemoryDataModule.java | 11 ++--
server/container/guice/pom.xml | 6 ++
8 files changed, 100 insertions(+), 25 deletions(-)
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 6561a2d..8e23442 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -287,6 +287,10 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>mailrepository-cassandra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-es-reporter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
index 752c386..83d444b 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
@@ -30,7 +30,6 @@ import org.apache.james.modules.activemq.ActiveMQQueueModule;
import org.apache.james.modules.data.CassandraDLPConfigurationStoreModule;
import org.apache.james.modules.data.CassandraDomainListModule;
import org.apache.james.modules.data.CassandraJmapModule;
-import org.apache.james.modules.data.CassandraMailRepositoryModule;
import org.apache.james.modules.data.CassandraRecipientRewriteTableModule;
import org.apache.james.modules.data.CassandraSieveRepositoryModule;
import org.apache.james.modules.data.CassandraUsersRepositoryModule;
@@ -44,6 +43,7 @@ import org.apache.james.modules.mailbox.CassandraMailboxModule;
import org.apache.james.modules.mailbox.CassandraQuotaMailingModule;
import org.apache.james.modules.mailbox.CassandraSessionModule;
import org.apache.james.modules.mailbox.TikaMailboxModule;
+import org.apache.james.modules.mailrepository.CassandraMailRepositoryModule;
import org.apache.james.modules.metrics.CassandraMetricsModule;
import org.apache.james.modules.protocols.IMAPServerModule;
import org.apache.james.modules.protocols.JMAPServerModule;
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
index bf6eee1..1d43329 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
@@ -19,7 +19,7 @@
package org.apache.james.modules.server;
-import java.util.function.Supplier;
+import javax.inject.Provider;
import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
@@ -46,8 +46,6 @@ import com.google.inject.multibindings.ProvidesIntoSet;
public class MailStoreRepositoryModule extends AbstractModule {
public static final Logger LOGGER = LoggerFactory.getLogger(MailStoreRepositoryModule.class);
- public interface DefaultItemSupplier extends Supplier<MailRepositoryStoreConfiguration.Item> {}
-
@Override
protected void configure() {
bind(MemoryMailRepositoryStore.class).in(Scopes.SINGLETON);
@@ -61,14 +59,17 @@ public class MailStoreRepositoryModule extends AbstractModule {
@Provides
@Singleton
- MailRepositoryStoreConfiguration provideConfiguration(ConfigurationProvider configurationProvider, DefaultItemSupplier defaultItemSupplier) throws ConfigurationException {
+ MailRepositoryStoreConfiguration provideConfiguration(ConfigurationProvider configurationProvider,
+ Provider<MailRepositoryStoreConfiguration.Item> defaultConfigurationItem)
+ throws ConfigurationException {
+
HierarchicalConfiguration<ImmutableNode> configuration = configurationProvider.getConfiguration("mailrepositorystore");
MailRepositoryStoreConfiguration userConfiguration = MailRepositoryStoreConfiguration.parse(configuration);
if (!userConfiguration.getItems().isEmpty()) {
return userConfiguration;
}
LOGGER.warn("Empty MailRepository store configuration supplied. Defaulting to default configuration for this product");
- return MailRepositoryStoreConfiguration.forItems(defaultItemSupplier.get());
+ return MailRepositoryStoreConfiguration.forItems(defaultConfigurationItem.get());
}
@ProvidesIntoSet
diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java
index 51c6587..f17764f 100644
--- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java
+++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java
@@ -25,17 +25,12 @@ import org.apache.james.mailrepository.api.Protocol;
import org.apache.james.mailrepository.file.FileMailRepository;
import org.apache.james.mailrepository.jpa.JPAMailRepositoryUrlStore;
import org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
-import org.apache.james.modules.server.MailStoreRepositoryModule;
import com.google.common.collect.ImmutableList;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
public class JPAMailRepositoryModule extends AbstractModule {
- private static final MailRepositoryStoreConfiguration.Item FILE_MAILREPOSITORY_DEFAULT_DECLARATION = new MailRepositoryStoreConfiguration.Item(
- ImmutableList.of(new Protocol("file")),
- FileMailRepository.class.getName(),
- new BaseHierarchicalConfiguration());
@Override
protected void configure() {
@@ -43,6 +38,10 @@ public class JPAMailRepositoryModule extends AbstractModule {
bind(MailRepositoryUrlStore.class).to(JPAMailRepositoryUrlStore.class);
- bind(MailStoreRepositoryModule.DefaultItemSupplier.class).toInstance(() -> FILE_MAILREPOSITORY_DEFAULT_DECLARATION);
+ bind(MailRepositoryStoreConfiguration.Item.class)
+ .toProvider(() -> new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(new Protocol("file")),
+ FileMailRepository.class.getName(),
+ new BaseHierarchicalConfiguration()));
}
}
diff --git a/server/container/guice/mailrepository-cassandra/pom.xml b/server/container/guice/mailrepository-cassandra/pom.xml
new file mode 100644
index 0000000..93d0a66
--- /dev/null
+++ b/server/container/guice/mailrepository-cassandra/pom.xml
@@ -0,0 +1,65 @@
+<?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>mailrepository-cassandra</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache James :: Server :: MailRepository :: Cassandra / Guice</name>
+ <description>Guice modules for Cassandra implementation of 'mailrepository' 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-guice-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-mailrepository-cassandra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-mailrepository-memory</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/CassandraMailRepositoryModule.java b/server/container/guice/mailrepository-cassandra/src/main/java/org/apache/james/modules/mailrepository/CassandraMailRepositoryModule.java
similarity index 86%
rename from server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java
rename to server/container/guice/mailrepository-cassandra/src/main/java/org/apache/james/modules/mailrepository/CassandraMailRepositoryModule.java
index b26dcf7..a663675 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java
+++ b/server/container/guice/mailrepository-cassandra/src/main/java/org/apache/james/modules/mailrepository/CassandraMailRepositoryModule.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.modules.data;
+package org.apache.james.modules.mailrepository;
import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
import org.apache.james.backends.cassandra.components.CassandraModule;
@@ -33,7 +33,6 @@ import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryUrlModul
import org.apache.james.mailrepository.cassandra.CassandraMailRepositoryUrlStore;
import org.apache.james.mailrepository.cassandra.MergingCassandraMailRepositoryMailDao;
import org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
-import org.apache.james.modules.server.MailStoreRepositoryModule;
import com.google.common.collect.ImmutableList;
import com.google.inject.AbstractModule;
@@ -41,10 +40,6 @@ import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder;
public class CassandraMailRepositoryModule extends AbstractModule {
- private static final MailRepositoryStoreConfiguration.Item CASSANDRA_MAILREPOSITORY_DEFAULT_DECLARATION = new MailRepositoryStoreConfiguration.Item(
- ImmutableList.of(new Protocol("cassandra")),
- CassandraMailRepository.class.getName(),
- new BaseHierarchicalConfiguration());
@Override
protected void configure() {
@@ -58,10 +53,16 @@ public class CassandraMailRepositoryModule extends AbstractModule {
bind(CassandraMailRepositoryMailDaoAPI.class).to(MergingCassandraMailRepositoryMailDao.class);
bind(MailRepositoryUrlStore.class).to(CassandraMailRepositoryUrlStore.class);
- bind(MailStoreRepositoryModule.DefaultItemSupplier.class).toInstance(() -> CASSANDRA_MAILREPOSITORY_DEFAULT_DECLARATION);
+ bind(MailRepositoryStoreConfiguration.Item.class)
+ .toProvider(() ->
+ new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(new Protocol("cassandra")),
+ CassandraMailRepository.class.getName(),
+ new BaseHierarchicalConfiguration()));
Multibinder<CassandraModule> cassandraModuleBinder = Multibinder.newSetBinder(binder(), CassandraModule.class);
cassandraModuleBinder.addBinding().toInstance(org.apache.james.mailrepository.cassandra.CassandraMailRepositoryModule.MODULE);
cassandraModuleBinder.addBinding().toInstance(CassandraMailRepositoryUrlModule.MODULE);
}
+
}
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
index cf65a71..df658fe 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
@@ -31,7 +31,6 @@ import org.apache.james.mailrepository.api.Protocol;
import org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import org.apache.james.mailrepository.memory.MemoryMailRepository;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryUrlStore;
-import org.apache.james.modules.server.MailStoreRepositoryModule;
import org.apache.james.rrt.api.AliasReverseResolver;
import org.apache.james.rrt.api.CanSendFrom;
import org.apache.james.rrt.api.RecipientRewriteTable;
@@ -52,10 +51,6 @@ import com.google.inject.Singleton;
import com.google.inject.multibindings.ProvidesIntoSet;
public class MemoryDataModule extends AbstractModule {
- private static final MailRepositoryStoreConfiguration.Item MEMORY_MAILREPOSITORY_DEFAULT_DECLARATION = new MailRepositoryStoreConfiguration.Item(
- ImmutableList.of(new Protocol("memory")),
- MemoryMailRepository.class.getName(),
- new BaseHierarchicalConfiguration());
@Override
protected void configure() {
@@ -84,7 +79,11 @@ public class MemoryDataModule extends AbstractModule {
bind(UsersRepository.class).to(MemoryUsersRepository.class);
- bind(MailStoreRepositoryModule.DefaultItemSupplier.class).toInstance(() -> MEMORY_MAILREPOSITORY_DEFAULT_DECLARATION);
+ bind(MailRepositoryStoreConfiguration.Item.class)
+ .toProvider(() -> new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(new Protocol("memory")),
+ MemoryMailRepository.class.getName(),
+ new BaseHierarchicalConfiguration()));
}
@Provides
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index ef5ebe5..882574f 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -56,6 +56,7 @@
<module>mailbox</module>
<module>mailbox-plugin-deleted-messages-vault-guice</module>
<module>mailbox-plugin-spamassassin</module>
+ <module>mailrepository-cassandra</module>
<module>mailet</module>
<module>memory-guice</module>
<module>onami</module>
@@ -242,6 +243,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>mailrepository-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.linagora</groupId>
<artifactId>logback-elasticsearch-appender</artifactId>
<version>1.8.0</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/02: JAMES-1902 Extract 'data' cassandra
implementation into its own maven module
Posted by ma...@apache.org.
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 <ma...@apache.org>
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: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org