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/06/12 00:07:24 UTC
[james-project] 04/19: JAMES-3596 Move distributed-app to
server/apps folder
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 25da3ba2f3286425b4808b78306454554f6fb2e6
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jun 10 14:03:40 2021 +0700
JAMES-3596 Move distributed-app to server/apps folder
---
docs/modules/servers/pages/distributed/run.adoc | 8 ++++----
.../smtp/cassandra-rabbitmq-object-storage/pom.xml | 4 ++--
pom.xml | 22 ++++++++++-----------
.../distributed-app}/README.adoc | 2 +-
.../distributed-app}/pom.xml | 22 ++++++++++++++++-----
.../sample-configuration}/batchsizes.properties | 0
.../sample-configuration/blob.properties | 0
.../sample-configuration/cassandra.properties | 0
.../deletedMessageVault.properties | 0
.../sample-configuration/dnsservice.xml | 0
.../sample-configuration/domainlist.xml | 0
.../sample-configuration/elasticsearch.properties | 0
.../sample-configuration/extensions.properties | 0
.../sample-configuration/healthcheck.properties | 0
.../sample-configuration/imapserver.xml | 0
.../sample-configuration/jmap.properties | 0
.../sample-configuration/jmx.properties | 0
.../sample-configuration/jwt_publickey | 0
.../sample-configuration/listeners.xml | 0
.../sample-configuration/lmtpserver.xml | 0
.../sample-configuration/logback.xml | 0
.../sample-configuration/mailetcontainer.xml | 0
.../sample-configuration/mailrepositorystore.xml | 0
.../sample-configuration/managesieveserver.xml | 0
.../sample-configuration/pop3server.xml | 0
.../sample-configuration/rabbitmq.properties | 0
.../sample-configuration/recipientrewritetable.xml | 0
.../sample-configuration/smtpserver.xml | 0
.../sample-configuration/tika.properties | 0
.../sample-configuration/usersrepository.xml | 0
.../sample-configuration/webadmin.properties | 0
.../distributed-app}/src/assemble/app.xml | 8 ++++----
.../src/assemble/extensions-jars.txt | 0
.../src/assemble/license-for-binary.txt | 0
.../src/main/extensions-jars/README.md | 0
.../distributed-app}/src/main/glowroot/admin.json | 0
.../src/main/glowroot/plugins/blobstore.json | 0
.../src/main/glowroot/plugins/imap.json | 0
.../src/main/glowroot/plugins/jmap.json | 0
.../src/main/glowroot/plugins/mailboxListener.json | 0
.../src/main/glowroot/plugins/smtp.json | 0
.../src/main/glowroot/plugins/spooler.json | 0
.../src/main/glowroot/plugins/task.json | 0
.../james/CassandraRabbitMQJamesConfiguration.java | 0
.../james/CassandraRabbitMQJamesServerMain.java | 0
.../distributed-app}/src/main/scripts/james-cli | 0
.../org/apache/james/CassandraCacheQueryTest.java | 0
.../james/CassandraRabbitMQAwsS3JmapTestRule.java | 0
.../CassandraRabbitMQJamesConfigurationTest.java | 0
.../james/CassandraRabbitMQJamesServerFixture.java | 0
.../apache/james/NamespaceConfigurationTest.java | 0
.../apache/james/RabbitMQDisabledTasksTest.java | 0
.../james/RabbitMQJamesServerReprocessingTest.java | 0
...RabbitMQJamesServerWithRetryConnectionTest.java | 0
.../org/apache/james/WithCacheImmutableTest.java | 0
.../org/apache/james/WithCacheMutableTest.java | 0
...ssandraDeduplicationBlobStoreImmutableTest.java | 0
...CassandraDeduplicationBlobStoreMutableTest.java | 0
...CassandraPassThroughBlobStoreImmutableTest.java | 0
...thCassandraPassThroughBlobStoreMutableTest.java | 0
.../james/WithDefaultAwsS3ImmutableTest.java | 0
.../apache/james/WithDefaultAwsS3MutableTest.java | 0
.../james/WithEncryptedBlobStoreImmutableTest.java | 0
.../james/WithEncryptedBlobStoreMutableTest.java | 0
.../james/WithScanningSearchImmutableTest.java | 0
.../james/WithScanningSearchMutableTest.java | 0
.../james/modules/AwsS3BlobStoreExtension.java | 0
.../apache/james/modules/DockerRabbitMQRule.java | 0
.../apache/james/modules/RabbitMQExtension.java | 0
.../apache/james/modules/TestRabbitMQModule.java | 0
...oreConfigurationValidationStartUpCheckTest.java | 0
.../src/test/resources}/batchsizes.properties | 0
.../src/test/resources/dnsservice.xml | 0
.../src/test/resources/domainlist.xml | 0
.../src/test/resources/imapserver.xml | 0
.../distributed-app}/src/test/resources/keystore | Bin
.../src/test/resources/listeners.xml | 0
.../src/test/resources/lmtpserver.xml | 0
.../src/test/resources/mailetcontainer.xml | 0
.../src/test/resources/mailrepositorystore.xml | 0
.../src/test/resources/managesieveserver.xml | 0
.../src/test/resources/pop3server.xml | 0
.../src/test/resources/rabbitmq.properties | 0
.../src/test/resources/smtpserver.xml | 0
.../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 12 +++++------
server/container/guice/pom.xml | 1 -
server/pom.xml | 1 +
.../pom.xml | 4 ++--
.../pom.xml | 4 ++--
.../distributed-webadmin-integration-test/pom.xml | 4 ++--
.../server/install/guice-cassandra-rabbitmq-s3.md | 8 ++++----
91 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/docs/modules/servers/pages/distributed/run.adoc b/docs/modules/servers/pages/distributed/run.adoc
index bf477a7..966d45f 100644
--- a/docs/modules/servers/pages/distributed/run.adoc
+++ b/docs/modules/servers/pages/distributed/run.adoc
@@ -13,10 +13,10 @@ ObjectStorage and Cassandra 3.11.10
=== Building the artifacts
An usual compilation using maven will produce two artifacts into
-server/container/guice/cassandra-rabbitmq-guice/target directory:
+server/apps/distributed-app/target directory:
-* james-server-cassandra-rabbitmq-guice.jar
-* james-server-cassandra-rabbitmq-guice.lib
+* james-server-distributed-app.jar
+* james-server-distributed-app.lib
You can for example run in the base of
https://github.com/apache/james-project[this git repository]:
@@ -68,7 +68,7 @@ Once everything is set up, you just have to run the jar with:
[source,bash]
----
-$ java -Dworking.directory=. -jar target/james-server-cassandra-rabbitmq-guice.jar
+$ java -Dworking.directory=. -jar target/james-server-distributed-app.jar
----
==== Using AWS S3 of Zenko Cloudserver
diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml
index e1ef7ce..e919835 100644
--- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml
+++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml
@@ -77,11 +77,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index ac58c0d..cff6211 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1285,17 +1285,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1391,6 +1380,17 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>james-server-distributed-app</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-distributed-app</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/README.adoc b/server/apps/distributed-app/README.adoc
similarity index 97%
rename from server/container/guice/cassandra-rabbitmq-guice/README.adoc
rename to server/apps/distributed-app/README.adoc
index 43897c2..6c1cbac 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/README.adoc
+++ b/server/apps/distributed-app/README.adoc
@@ -40,7 +40,7 @@ Once everything is set up, you just have to run the jar with:
[source]
----
-$ java -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-cassandra-rabbitmq-guice.jar
+$ java -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-distributed-app.jar
----
Note that binding ports below 1024 requires administrative rights.
diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/apps/distributed-app/pom.xml
similarity index 96%
rename from server/container/guice/cassandra-rabbitmq-guice/pom.xml
rename to server/apps/distributed-app/pom.xml
index a54626f..0b170b7 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml
+++ b/server/apps/distributed-app/pom.xml
@@ -23,21 +23,33 @@
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-guice</artifactId>
+ <artifactId>james-server</artifactId>
<version>3.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<packaging>jar</packaging>
- <name>Apache James :: Server :: Cassandra with RabbitMQ - guice injection</name>
+ <name>Apache James :: Server :: Distributed :: APP</name>
<description>An advanced email server - Cassandra backend and RabbitMQ messaging with guice injection</description>
<properties>
<cassandra.includes>empty</cassandra.includes>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -505,7 +517,7 @@
<descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
- <finalName>james-server-distributed-guice</finalName>
+ <finalName>james-server-distributed-app</finalName>
</configuration>
<executions>
<execution>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/batchsizes.properties b/server/apps/distributed-app/sample-configuration/batchsizes.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/batchsizes.properties
rename to server/apps/distributed-app/sample-configuration/batchsizes.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties b/server/apps/distributed-app/sample-configuration/blob.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties
rename to server/apps/distributed-app/sample-configuration/blob.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties b/server/apps/distributed-app/sample-configuration/cassandra.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties
rename to server/apps/distributed-app/sample-configuration/cassandra.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties b/server/apps/distributed-app/sample-configuration/deletedMessageVault.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties
rename to server/apps/distributed-app/sample-configuration/deletedMessageVault.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml b/server/apps/distributed-app/sample-configuration/dnsservice.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml
rename to server/apps/distributed-app/sample-configuration/dnsservice.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml b/server/apps/distributed-app/sample-configuration/domainlist.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml
rename to server/apps/distributed-app/sample-configuration/domainlist.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties b/server/apps/distributed-app/sample-configuration/elasticsearch.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties
rename to server/apps/distributed-app/sample-configuration/elasticsearch.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties b/server/apps/distributed-app/sample-configuration/extensions.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties
rename to server/apps/distributed-app/sample-configuration/extensions.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties b/server/apps/distributed-app/sample-configuration/healthcheck.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties
rename to server/apps/distributed-app/sample-configuration/healthcheck.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml b/server/apps/distributed-app/sample-configuration/imapserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml
rename to server/apps/distributed-app/sample-configuration/imapserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties b/server/apps/distributed-app/sample-configuration/jmap.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties
rename to server/apps/distributed-app/sample-configuration/jmap.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmx.properties b/server/apps/distributed-app/sample-configuration/jmx.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmx.properties
rename to server/apps/distributed-app/sample-configuration/jmx.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jwt_publickey b/server/apps/distributed-app/sample-configuration/jwt_publickey
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jwt_publickey
rename to server/apps/distributed-app/sample-configuration/jwt_publickey
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml b/server/apps/distributed-app/sample-configuration/listeners.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml
rename to server/apps/distributed-app/sample-configuration/listeners.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml b/server/apps/distributed-app/sample-configuration/lmtpserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml
rename to server/apps/distributed-app/sample-configuration/lmtpserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/logback.xml b/server/apps/distributed-app/sample-configuration/logback.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/logback.xml
rename to server/apps/distributed-app/sample-configuration/logback.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml
rename to server/apps/distributed-app/sample-configuration/mailetcontainer.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailrepositorystore.xml b/server/apps/distributed-app/sample-configuration/mailrepositorystore.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailrepositorystore.xml
rename to server/apps/distributed-app/sample-configuration/mailrepositorystore.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/managesieveserver.xml b/server/apps/distributed-app/sample-configuration/managesieveserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/managesieveserver.xml
rename to server/apps/distributed-app/sample-configuration/managesieveserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml b/server/apps/distributed-app/sample-configuration/pop3server.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml
rename to server/apps/distributed-app/sample-configuration/pop3server.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties b/server/apps/distributed-app/sample-configuration/rabbitmq.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties
rename to server/apps/distributed-app/sample-configuration/rabbitmq.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/recipientrewritetable.xml b/server/apps/distributed-app/sample-configuration/recipientrewritetable.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/recipientrewritetable.xml
rename to server/apps/distributed-app/sample-configuration/recipientrewritetable.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml b/server/apps/distributed-app/sample-configuration/smtpserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml
rename to server/apps/distributed-app/sample-configuration/smtpserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/tika.properties b/server/apps/distributed-app/sample-configuration/tika.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/tika.properties
rename to server/apps/distributed-app/sample-configuration/tika.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml b/server/apps/distributed-app/sample-configuration/usersrepository.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml
rename to server/apps/distributed-app/sample-configuration/usersrepository.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties b/server/apps/distributed-app/sample-configuration/webadmin.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties
rename to server/apps/distributed-app/sample-configuration/webadmin.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/assemble/app.xml b/server/apps/distributed-app/src/assemble/app.xml
similarity index 90%
rename from server/container/guice/cassandra-rabbitmq-guice/src/assemble/app.xml
rename to server/apps/distributed-app/src/assemble/app.xml
index 5e2cdd4..1779b06 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/assemble/app.xml
+++ b/server/apps/distributed-app/src/assemble/app.xml
@@ -46,8 +46,8 @@ limitations under the License.
</fileSet>
<!-- include stuff from jar plugin -->
<fileSet>
- <directory>target/james-server-cassandra-rabbitmq-guice.lib</directory>
- <outputDirectory>/james-server-cassandra-rabbitmq-guice.lib</outputDirectory>
+ <directory>target/james-server-distributed-app.lib</directory>
+ <outputDirectory>/james-server-distributed-app.lib</outputDirectory>
<directoryMode>0755</directoryMode>
<fileMode>0600</fileMode>
<includes>
@@ -77,10 +77,10 @@ limitations under the License.
<destName>README.md</destName>
</file>
<file>
- <source>target/james-server-cassandra-rabbitmq-guice.jar</source>
+ <source>target/james-server-distributed-app.jar</source>
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
- <destName>james-server-cassandra-rabbitmq-guice.jar</destName>
+ <destName>james-server-distributed-app.jar</destName>
</file>
</files>
</assembly>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/assemble/extensions-jars.txt b/server/apps/distributed-app/src/assemble/extensions-jars.txt
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/assemble/extensions-jars.txt
rename to server/apps/distributed-app/src/assemble/extensions-jars.txt
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/assemble/license-for-binary.txt b/server/apps/distributed-app/src/assemble/license-for-binary.txt
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/assemble/license-for-binary.txt
rename to server/apps/distributed-app/src/assemble/license-for-binary.txt
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/extensions-jars/README.md b/server/apps/distributed-app/src/main/extensions-jars/README.md
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/extensions-jars/README.md
rename to server/apps/distributed-app/src/main/extensions-jars/README.md
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/admin.json b/server/apps/distributed-app/src/main/glowroot/admin.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/admin.json
rename to server/apps/distributed-app/src/main/glowroot/admin.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/blobstore.json b/server/apps/distributed-app/src/main/glowroot/plugins/blobstore.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/blobstore.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/blobstore.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/imap.json b/server/apps/distributed-app/src/main/glowroot/plugins/imap.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/imap.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/imap.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/jmap.json b/server/apps/distributed-app/src/main/glowroot/plugins/jmap.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/jmap.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/jmap.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/mailboxListener.json b/server/apps/distributed-app/src/main/glowroot/plugins/mailboxListener.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/mailboxListener.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/mailboxListener.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/smtp.json b/server/apps/distributed-app/src/main/glowroot/plugins/smtp.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/smtp.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/smtp.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/spooler.json b/server/apps/distributed-app/src/main/glowroot/plugins/spooler.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/spooler.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/spooler.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/task.json b/server/apps/distributed-app/src/main/glowroot/plugins/task.json
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/glowroot/plugins/task.json
rename to server/apps/distributed-app/src/main/glowroot/plugins/task.json
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java
rename to server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
rename to server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/scripts/james-cli b/server/apps/distributed-app/src/main/scripts/james-cli
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/main/scripts/james-cli
rename to server/apps/distributed-app/src/main/scripts/james-cli
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraCacheQueryTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraCacheQueryTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraCacheQueryTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/CassandraCacheQueryTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesConfigurationTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesConfigurationTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesConfigurationTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesConfigurationTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/NamespaceConfigurationTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/NamespaceConfigurationTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/NamespaceConfigurationTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/NamespaceConfigurationTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQDisabledTasksTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/RabbitMQDisabledTasksTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQDisabledTasksTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/RabbitMQDisabledTasksTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerWithRetryConnectionTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/RabbitMQJamesServerWithRetryConnectionTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerWithRetryConnectionTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/RabbitMQJamesServerWithRetryConnectionTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCacheImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCacheImmutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCacheImmutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithCacheImmutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCacheMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCacheMutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCacheMutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithCacheMutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithDefaultAwsS3ImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithDefaultAwsS3ImmutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithDefaultAwsS3ImmutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithDefaultAwsS3ImmutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithDefaultAwsS3MutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithDefaultAwsS3MutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithDefaultAwsS3MutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithDefaultAwsS3MutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithScanningSearchImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithScanningSearchImmutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithScanningSearchImmutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithScanningSearchImmutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithScanningSearchMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithScanningSearchMutableTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithScanningSearchMutableTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/WithScanningSearchMutableTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/AwsS3BlobStoreExtension.java b/server/apps/distributed-app/src/test/java/org/apache/james/modules/AwsS3BlobStoreExtension.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/AwsS3BlobStoreExtension.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/modules/AwsS3BlobStoreExtension.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java b/server/apps/distributed-app/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/RabbitMQExtension.java b/server/apps/distributed-app/src/test/java/org/apache/james/modules/RabbitMQExtension.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/RabbitMQExtension.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/modules/RabbitMQExtension.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/TestRabbitMQModule.java b/server/apps/distributed-app/src/test/java/org/apache/james/modules/TestRabbitMQModule.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/TestRabbitMQModule.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/modules/TestRabbitMQModule.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java
rename to server/apps/distributed-app/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/batchsizes.properties b/server/apps/distributed-app/src/test/resources/batchsizes.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/sample-configuration/batchsizes.properties
rename to server/apps/distributed-app/src/test/resources/batchsizes.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/dnsservice.xml b/server/apps/distributed-app/src/test/resources/dnsservice.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/dnsservice.xml
rename to server/apps/distributed-app/src/test/resources/dnsservice.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/domainlist.xml b/server/apps/distributed-app/src/test/resources/domainlist.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/domainlist.xml
rename to server/apps/distributed-app/src/test/resources/domainlist.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/imapserver.xml b/server/apps/distributed-app/src/test/resources/imapserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/imapserver.xml
rename to server/apps/distributed-app/src/test/resources/imapserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/keystore b/server/apps/distributed-app/src/test/resources/keystore
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/keystore
rename to server/apps/distributed-app/src/test/resources/keystore
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/listeners.xml b/server/apps/distributed-app/src/test/resources/listeners.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/listeners.xml
rename to server/apps/distributed-app/src/test/resources/listeners.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/lmtpserver.xml b/server/apps/distributed-app/src/test/resources/lmtpserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/lmtpserver.xml
rename to server/apps/distributed-app/src/test/resources/lmtpserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml b/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml
rename to server/apps/distributed-app/src/test/resources/mailetcontainer.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailrepositorystore.xml b/server/apps/distributed-app/src/test/resources/mailrepositorystore.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailrepositorystore.xml
rename to server/apps/distributed-app/src/test/resources/mailrepositorystore.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/managesieveserver.xml b/server/apps/distributed-app/src/test/resources/managesieveserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/managesieveserver.xml
rename to server/apps/distributed-app/src/test/resources/managesieveserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/pop3server.xml b/server/apps/distributed-app/src/test/resources/pop3server.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/pop3server.xml
rename to server/apps/distributed-app/src/test/resources/pop3server.xml
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/rabbitmq.properties b/server/apps/distributed-app/src/test/resources/rabbitmq.properties
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/rabbitmq.properties
rename to server/apps/distributed-app/src/test/resources/rabbitmq.properties
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/smtpserver.xml b/server/apps/distributed-app/src/test/resources/smtpserver.xml
similarity index 100%
rename from server/container/guice/cassandra-rabbitmq-guice/src/test/resources/smtpserver.xml
rename to server/apps/distributed-app/src/test/resources/smtpserver.xml
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
index 847b720..939d3f0 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
@@ -75,18 +75,18 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-data-ldap</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>james-server-distributed-app</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-data-ldap</artifactId>
- <version>${project.version}</version>
+ <artifactId>james-server-distributed-app</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 06cd628..b028a6d 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -38,7 +38,6 @@
<module>blob/memory</module>
<module>blob/s3</module>
<module>cassandra</module>
- <module>cassandra-rabbitmq-guice</module>
<module>cassandra-rabbitmq-ldap-guice</module>
<module>configuration</module>
<module>data-cassandra</module>
diff --git a/server/pom.xml b/server/pom.xml
index 5b5bb31..aab6d0a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -40,6 +40,7 @@
<modules>
<module>apps/cassandra-app</module>
<module>apps/cassandra-app-ldap-tests</module>
+ <module>apps/distributed-app</module>
<module>apps/spring-app</module>
<module>blob</module>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
index 2b3ab3d..d482706 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
@@ -71,12 +71,12 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
index 99ef4f2..ba58452 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
@@ -83,12 +83,12 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
index 6a8f379..5e69a2d 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
@@ -71,12 +71,12 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-cassandra-rabbitmq-guice</artifactId>
+ <artifactId>james-server-distributed-app</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
index ae92a9a..ff1c4a9 100644
--- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
+++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
@@ -10,10 +10,10 @@
### Building the artifacts
-An usual compilation using maven will produce two artifacts into server/container/guice/cassandra-rabbitmq-guice/target directory:
+An usual compilation using maven will produce two artifacts into server/apps/distributed-app/target directory:
- * james-server-cassandra-rabbitmq-guice.jar
- * james-server-cassandra-rabbitmq-guice.lib
+ * james-server-distributed-app.jar
+ * james-server-distributed-app.lib
You can for example run in the base of [this git repository](https://github.com/apache/james-project):
@@ -56,7 +56,7 @@ $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID
Once everything is set up, you just have to run the jar with:
```bash
-$ java -Dworking.directory=. -jar target/james-server-cassandra-rabbitmq-guice.jar
+$ java -Dworking.directory=. -jar target/james-server-distributed-app.jar
```
#### Using AWS S3 of Zenko Cloudserver
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org