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 717d74edb42d08ec6aab2e0df2be2c122f8ad8d5 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jun 9 15:33:38 2021 +0700 JAMES-3596 Move cassandra-app to server/apps folder --- .../smtp/cassandra-rabbitmq-object-storage/pom.xml | 2 +- mpt/impl/smtp/cassandra/pom.xml | 4 ++-- pom.xml | 4 ++-- .../cassandra-app-ldap-tests}/pom.xml | 26 +++++++++++++++------ .../apache/james/CassandraLdapJamesServerTest.java | 0 .../james/CassandraLdapJmapJamesServerTest.java | 0 .../test/java/org/apache/james/DockerLdapRule.java | 0 .../java/org/apache/james/LdapTestExtension.java | 0 .../src/test/resources/dnsservice.xml | 0 .../src/test/resources/domainlist.xml | 0 .../src/test/resources/fakemailrepositorystore.xml | 0 .../src/test/resources/imapserver.xml | 0 .../src/test/resources/keystore | Bin .../src/test/resources/ldif-files/Dockerfile | 0 .../src/test/resources/ldif-files/populate.ldif | 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/smtpserver.xml | 0 .../cassandra-app}/README.adoc | 4 ++-- .../cassandra-guice => apps/cassandra-app}/pom.xml | 26 +++++++++++++++------ .../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/recipientrewritetable.xml | 0 .../sample-configuration/smtpserver.xml | 0 .../sample-configuration/tika.properties | 0 .../sample-configuration/usersrepository.xml | 0 .../sample-configuration/webadmin.properties | 0 .../cassandra-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 .../cassandra-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/CassandraJamesServerConfiguration.java | 0 .../org/apache/james/CassandraJamesServerMain.java | 0 .../cassandra-app}/src/main/scripts/james-cli | 0 .../AuthenticatedCassandraJamesServerTest.java | 0 .../java/org/apache/james/CacheSessionTest.java | 0 .../java/org/apache/james/CassandraExtension.java | 0 .../org/apache/james/CassandraJamesServerTest.java | 0 .../org/apache/james/CassandraJmapTestRule.java | 0 .../CassandraMailRepositoryIntegrationTest.java | 0 .../org/apache/james/CassandraNodeConfTest.java | 0 .../org/apache/james/CassandraWithTikaTest.java | 0 .../james/DefaultCassandraJamesServerTest.java | 0 .../java/org/apache/james/DockerCassandraRule.java | 0 .../apache/james/DockerElasticSearchExtension.java | 0 .../org/apache/james/DockerElasticSearchRule.java | 0 .../test/java/org/apache/james/ESReporterTest.java | 0 .../apache/james/JamesCapabilitiesServerTest.java | 0 .../james/JamesServerWithRetryConnectionTest.java | 0 ...esWithNonCompatibleElasticSearchServerTest.java | 0 .../org/apache/james/KeyspaceCreationTest.java | 0 .../TestingDistributedJamesServerBuilder.java | 0 .../test/java/org/apache/james/TikaExtension.java | 0 .../james/WithCassandraBlobStoreImmutableTest.java | 0 .../apache/james/WithCassandraBlobStoreTest.java | 0 .../modules/TestDockerESMetricReporterModule.java | 0 .../modules/TestDockerElasticSearchModule.java | 0 .../org/apache/james/modules/TestTikaModule.java | 0 .../CassandraSchemaVersionStartUpCheckTest.java | 0 .../src/test/resources}/batchsizes.properties | 0 .../src/test/resources/dnsservice.xml | 0 .../src/test/resources/domainlist.xml | 0 .../src/test/resources/fakemailrepositorystore.xml | 0 .../src/test/resources/imapserver.xml | 0 .../cassandra-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/smtpserver.xml | 0 .../src/test/resources/spamassassin.properties | 0 .../container/guice/cassandra-ldap-guice/README.md | 4 ---- .../guice/cassandra-rabbitmq-guice/pom.xml | 2 +- .../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 2 +- server/container/guice/pom.xml | 3 --- server/pom.xml | 2 ++ .../pom.xml | 2 +- .../pom.xml | 2 +- .../distributed-webadmin-integration-test/pom.xml | 2 +- 110 files changed, 56 insertions(+), 37 deletions(-) diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml index 490a9f9..e1ef7ce 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index 4542d5b..b23cc15 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -49,11 +49,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 21e035a..ac58c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -1269,12 +1269,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/apps/cassandra-app-ldap-tests/pom.xml similarity index 84% rename from server/container/guice/cassandra-ldap-guice/pom.xml rename to server/apps/cassandra-app-ldap-tests/pom.xml index 57e1eda..997b67c 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/apps/cassandra-app-ldap-tests/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-ldap-guice</artifactId> + <artifactId>james-server-cassandra-app-ldap-tessts</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: Cassandra/Ldap - guice injection</name> - <description>An advanced email server - Cassandra/Ldap backend with guice injection</description> + <name>Apache James :: Server :: Cassandra App :: LDAP tests</name> + <description>Tests the Cassandra APP against a LDAP</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> @@ -57,11 +69,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java rename to server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java b/server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java rename to server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/DockerLdapRule.java b/server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/DockerLdapRule.java similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/DockerLdapRule.java rename to server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/DockerLdapRule.java diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/LdapTestExtension.java b/server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/LdapTestExtension.java similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/LdapTestExtension.java rename to server/apps/cassandra-app-ldap-tests/src/test/java/org/apache/james/LdapTestExtension.java diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/dnsservice.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/dnsservice.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/dnsservice.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/domainlist.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/domainlist.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/domainlist.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/fakemailrepositorystore.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/fakemailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/fakemailrepositorystore.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/fakemailrepositorystore.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/imapserver.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/imapserver.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/imapserver.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/keystore b/server/apps/cassandra-app-ldap-tests/src/test/resources/keystore similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/keystore rename to server/apps/cassandra-app-ldap-tests/src/test/resources/keystore diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/ldif-files/Dockerfile b/server/apps/cassandra-app-ldap-tests/src/test/resources/ldif-files/Dockerfile similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/ldif-files/Dockerfile rename to server/apps/cassandra-app-ldap-tests/src/test/resources/ldif-files/Dockerfile diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/ldif-files/populate.ldif b/server/apps/cassandra-app-ldap-tests/src/test/resources/ldif-files/populate.ldif similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/ldif-files/populate.ldif rename to server/apps/cassandra-app-ldap-tests/src/test/resources/ldif-files/populate.ldif diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/lmtpserver.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/lmtpserver.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/lmtpserver.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/lmtpserver.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/managesieveserver.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/managesieveserver.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/managesieveserver.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/managesieveserver.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/pop3server.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/pop3server.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/pop3server.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/pop3server.xml diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml b/server/apps/cassandra-app-ldap-tests/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/cassandra-ldap-guice/src/test/resources/smtpserver.xml rename to server/apps/cassandra-app-ldap-tests/src/test/resources/smtpserver.xml diff --git a/server/container/guice/cassandra-guice/README.adoc b/server/apps/cassandra-app/README.adoc similarity index 95% rename from server/container/guice/cassandra-guice/README.adoc rename to server/apps/cassandra-app/README.adoc index 24d6ec9..77f30e2 100644 --- a/server/container/guice/cassandra-guice/README.adoc +++ b/server/apps/cassandra-app/README.adoc @@ -27,7 +27,7 @@ $ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-n To run james, you have to create a directory containing required configuration files. James requires the configuration to be in a subfolder of working directory that is called -**conf**. A [sample directory](https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-guice/sample-configuration) +**conf**. A [sample directory](https://github.com/apache/james-project/tree/master/server/apps/cassandra-app/sample-configuration) is provided with some default values you may need to replace, especially compulsory third party software endpoints. You will need to update its content to match your needs. @@ -43,7 +43,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-guice.jar +$ java -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-cassandra-app.jar ---- Note that binding ports below 1024 requires administrative rights. diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/apps/cassandra-app/pom.xml similarity index 95% rename from server/container/guice/cassandra-guice/pom.xml rename to server/apps/cassandra-app/pom.xml index f127c89..98efc85 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/apps/cassandra-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-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: Cassandra - guice injection</name> + <name>Apache James :: Server :: Cassandra :: Application</name> <description>An advanced email server - Cassandra backend 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> @@ -289,10 +301,10 @@ </goals> <phase>package</phase> <configuration> - <url>https://github.com/glowroot/glowroot/releases/download/v0.13.6/glowroot-0.13.6-dist.zip</url> + <url>https://github.com/glowroot/glowroot/releases/download/v0.13.4/glowroot-0.13.4-dist.zip</url> <unpack>true</unpack> <outputDirectory>${project.build.directory}</outputDirectory> - <md5>f9026dbab1fbade067ca549913802fcc</md5> + <md5>93d472281a67ab8404033a88280c23c9</md5> </configuration> </execution> </executions> @@ -449,7 +461,7 @@ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> - <finalName>james-server-cassandra-guice</finalName> + <finalName>james-server-cassandra-app</finalName> </configuration> <executions> <execution> diff --git a/server/container/guice/cassandra-guice/src/test/resources/batchsizes.properties b/server/apps/cassandra-app/sample-configuration/batchsizes.properties similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/batchsizes.properties rename to server/apps/cassandra-app/sample-configuration/batchsizes.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/blob.properties b/server/apps/cassandra-app/sample-configuration/blob.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/blob.properties rename to server/apps/cassandra-app/sample-configuration/blob.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/cassandra.properties b/server/apps/cassandra-app/sample-configuration/cassandra.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/cassandra.properties rename to server/apps/cassandra-app/sample-configuration/cassandra.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/deletedMessageVault.properties b/server/apps/cassandra-app/sample-configuration/deletedMessageVault.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/deletedMessageVault.properties rename to server/apps/cassandra-app/sample-configuration/deletedMessageVault.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/dnsservice.xml b/server/apps/cassandra-app/sample-configuration/dnsservice.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/dnsservice.xml rename to server/apps/cassandra-app/sample-configuration/dnsservice.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/domainlist.xml b/server/apps/cassandra-app/sample-configuration/domainlist.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/domainlist.xml rename to server/apps/cassandra-app/sample-configuration/domainlist.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/elasticsearch.properties b/server/apps/cassandra-app/sample-configuration/elasticsearch.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/elasticsearch.properties rename to server/apps/cassandra-app/sample-configuration/elasticsearch.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/extensions.properties b/server/apps/cassandra-app/sample-configuration/extensions.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/extensions.properties rename to server/apps/cassandra-app/sample-configuration/extensions.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/healthcheck.properties b/server/apps/cassandra-app/sample-configuration/healthcheck.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/healthcheck.properties rename to server/apps/cassandra-app/sample-configuration/healthcheck.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/imapserver.xml b/server/apps/cassandra-app/sample-configuration/imapserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/imapserver.xml rename to server/apps/cassandra-app/sample-configuration/imapserver.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/jmap.properties b/server/apps/cassandra-app/sample-configuration/jmap.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/jmap.properties rename to server/apps/cassandra-app/sample-configuration/jmap.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/jmx.properties b/server/apps/cassandra-app/sample-configuration/jmx.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/jmx.properties rename to server/apps/cassandra-app/sample-configuration/jmx.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/jwt_publickey b/server/apps/cassandra-app/sample-configuration/jwt_publickey similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/jwt_publickey rename to server/apps/cassandra-app/sample-configuration/jwt_publickey diff --git a/server/container/guice/cassandra-guice/sample-configuration/listeners.xml b/server/apps/cassandra-app/sample-configuration/listeners.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/listeners.xml rename to server/apps/cassandra-app/sample-configuration/listeners.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/lmtpserver.xml b/server/apps/cassandra-app/sample-configuration/lmtpserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/lmtpserver.xml rename to server/apps/cassandra-app/sample-configuration/lmtpserver.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/logback.xml b/server/apps/cassandra-app/sample-configuration/logback.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/logback.xml rename to server/apps/cassandra-app/sample-configuration/logback.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/mailetcontainer.xml b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/mailetcontainer.xml rename to server/apps/cassandra-app/sample-configuration/mailetcontainer.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/mailrepositorystore.xml b/server/apps/cassandra-app/sample-configuration/mailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/mailrepositorystore.xml rename to server/apps/cassandra-app/sample-configuration/mailrepositorystore.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/managesieveserver.xml b/server/apps/cassandra-app/sample-configuration/managesieveserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/managesieveserver.xml rename to server/apps/cassandra-app/sample-configuration/managesieveserver.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/pop3server.xml b/server/apps/cassandra-app/sample-configuration/pop3server.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/pop3server.xml rename to server/apps/cassandra-app/sample-configuration/pop3server.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/recipientrewritetable.xml b/server/apps/cassandra-app/sample-configuration/recipientrewritetable.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/recipientrewritetable.xml rename to server/apps/cassandra-app/sample-configuration/recipientrewritetable.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/smtpserver.xml b/server/apps/cassandra-app/sample-configuration/smtpserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/smtpserver.xml rename to server/apps/cassandra-app/sample-configuration/smtpserver.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/tika.properties b/server/apps/cassandra-app/sample-configuration/tika.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/tika.properties rename to server/apps/cassandra-app/sample-configuration/tika.properties diff --git a/server/container/guice/cassandra-guice/sample-configuration/usersrepository.xml b/server/apps/cassandra-app/sample-configuration/usersrepository.xml similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/usersrepository.xml rename to server/apps/cassandra-app/sample-configuration/usersrepository.xml diff --git a/server/container/guice/cassandra-guice/sample-configuration/webadmin.properties b/server/apps/cassandra-app/sample-configuration/webadmin.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/webadmin.properties rename to server/apps/cassandra-app/sample-configuration/webadmin.properties diff --git a/server/container/guice/cassandra-guice/src/assemble/app.xml b/server/apps/cassandra-app/src/assemble/app.xml similarity index 91% rename from server/container/guice/cassandra-guice/src/assemble/app.xml rename to server/apps/cassandra-app/src/assemble/app.xml index 06cc885..5815af6 100644 --- a/server/container/guice/cassandra-guice/src/assemble/app.xml +++ b/server/apps/cassandra-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-guice.lib</directory> - <outputDirectory>/james-server-cassandra-guice.lib</outputDirectory> + <directory>target/james-server-cassandra-app.lib</directory> + <outputDirectory>/james-server-cassandra-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-guice.jar</source> + <source>target/james-server-cassandra-app.jar</source> <outputDirectory>/</outputDirectory> <fileMode>0755</fileMode> - <destName>james-server-cassandra-guice.jar</destName> + <destName>james-server-cassandra-app.jar</destName> </file> </files> </assembly> diff --git a/server/container/guice/cassandra-guice/src/assemble/extensions-jars.txt b/server/apps/cassandra-app/src/assemble/extensions-jars.txt similarity index 100% rename from server/container/guice/cassandra-guice/src/assemble/extensions-jars.txt rename to server/apps/cassandra-app/src/assemble/extensions-jars.txt diff --git a/server/container/guice/cassandra-guice/src/assemble/license-for-binary.txt b/server/apps/cassandra-app/src/assemble/license-for-binary.txt similarity index 100% rename from server/container/guice/cassandra-guice/src/assemble/license-for-binary.txt rename to server/apps/cassandra-app/src/assemble/license-for-binary.txt diff --git a/server/container/guice/cassandra-guice/src/main/extensions-jars/README.md b/server/apps/cassandra-app/src/main/extensions-jars/README.md similarity index 100% rename from server/container/guice/cassandra-guice/src/main/extensions-jars/README.md rename to server/apps/cassandra-app/src/main/extensions-jars/README.md diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/admin.json b/server/apps/cassandra-app/src/main/glowroot/admin.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/admin.json rename to server/apps/cassandra-app/src/main/glowroot/admin.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/blobstore.json b/server/apps/cassandra-app/src/main/glowroot/plugins/blobstore.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/blobstore.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/blobstore.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/imap.json b/server/apps/cassandra-app/src/main/glowroot/plugins/imap.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/imap.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/imap.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/jmap.json b/server/apps/cassandra-app/src/main/glowroot/plugins/jmap.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/jmap.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/jmap.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/mailboxListener.json b/server/apps/cassandra-app/src/main/glowroot/plugins/mailboxListener.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/mailboxListener.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/mailboxListener.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/smtp.json b/server/apps/cassandra-app/src/main/glowroot/plugins/smtp.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/smtp.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/smtp.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/spooler.json b/server/apps/cassandra-app/src/main/glowroot/plugins/spooler.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/spooler.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/spooler.json diff --git a/server/container/guice/cassandra-guice/src/main/glowroot/plugins/task.json b/server/apps/cassandra-app/src/main/glowroot/plugins/task.json similarity index 100% rename from server/container/guice/cassandra-guice/src/main/glowroot/plugins/task.json rename to server/apps/cassandra-app/src/main/glowroot/plugins/task.json diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java similarity index 100% rename from server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java rename to server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java similarity index 100% rename from server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java rename to server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java diff --git a/server/container/guice/cassandra-guice/src/main/scripts/james-cli b/server/apps/cassandra-app/src/main/scripts/james-cli similarity index 100% rename from server/container/guice/cassandra-guice/src/main/scripts/james-cli rename to server/apps/cassandra-app/src/main/scripts/james-cli diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CacheSessionTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CacheSessionTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraExtension.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraExtension.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraExtension.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CassandraExtension.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJamesServerTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJamesServerTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJmapTestRule.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJmapTestRule.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraNodeConfTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CassandraNodeConfTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraWithTikaTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/CassandraWithTikaTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerCassandraRule.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/DockerCassandraRule.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchExtension.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchExtension.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchRule.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchRule.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/ESReporterTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/ESReporterTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/KeyspaceCreationTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/KeyspaceCreationTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/TestingDistributedJamesServerBuilder.java b/server/apps/cassandra-app/src/test/java/org/apache/james/TestingDistributedJamesServerBuilder.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/TestingDistributedJamesServerBuilder.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/TestingDistributedJamesServerBuilder.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/TikaExtension.java b/server/apps/cassandra-app/src/test/java/org/apache/james/TikaExtension.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/TikaExtension.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/TikaExtension.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestDockerESMetricReporterModule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerESMetricReporterModule.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestDockerESMetricReporterModule.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerESMetricReporterModule.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestTikaModule.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestTikaModule.java diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java similarity index 100% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java rename to server/apps/cassandra-app/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java diff --git a/server/container/guice/cassandra-guice/sample-configuration/batchsizes.properties b/server/apps/cassandra-app/src/test/resources/batchsizes.properties similarity index 100% rename from server/container/guice/cassandra-guice/sample-configuration/batchsizes.properties rename to server/apps/cassandra-app/src/test/resources/batchsizes.properties diff --git a/server/container/guice/cassandra-guice/src/test/resources/dnsservice.xml b/server/apps/cassandra-app/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/dnsservice.xml rename to server/apps/cassandra-app/src/test/resources/dnsservice.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/domainlist.xml b/server/apps/cassandra-app/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/domainlist.xml rename to server/apps/cassandra-app/src/test/resources/domainlist.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/fakemailrepositorystore.xml b/server/apps/cassandra-app/src/test/resources/fakemailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/fakemailrepositorystore.xml rename to server/apps/cassandra-app/src/test/resources/fakemailrepositorystore.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/imapserver.xml b/server/apps/cassandra-app/src/test/resources/imapserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/imapserver.xml rename to server/apps/cassandra-app/src/test/resources/imapserver.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/keystore b/server/apps/cassandra-app/src/test/resources/keystore similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/keystore rename to server/apps/cassandra-app/src/test/resources/keystore diff --git a/server/container/guice/cassandra-guice/src/test/resources/listeners.xml b/server/apps/cassandra-app/src/test/resources/listeners.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/listeners.xml rename to server/apps/cassandra-app/src/test/resources/listeners.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/lmtpserver.xml b/server/apps/cassandra-app/src/test/resources/lmtpserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/lmtpserver.xml rename to server/apps/cassandra-app/src/test/resources/lmtpserver.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml b/server/apps/cassandra-app/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml rename to server/apps/cassandra-app/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/mailrepositorystore.xml b/server/apps/cassandra-app/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/mailrepositorystore.xml rename to server/apps/cassandra-app/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/managesieveserver.xml b/server/apps/cassandra-app/src/test/resources/managesieveserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/managesieveserver.xml rename to server/apps/cassandra-app/src/test/resources/managesieveserver.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/pop3server.xml b/server/apps/cassandra-app/src/test/resources/pop3server.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/pop3server.xml rename to server/apps/cassandra-app/src/test/resources/pop3server.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml b/server/apps/cassandra-app/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/smtpserver.xml rename to server/apps/cassandra-app/src/test/resources/smtpserver.xml diff --git a/server/container/guice/cassandra-guice/src/test/resources/spamassassin.properties b/server/apps/cassandra-app/src/test/resources/spamassassin.properties similarity index 100% rename from server/container/guice/cassandra-guice/src/test/resources/spamassassin.properties rename to server/apps/cassandra-app/src/test/resources/spamassassin.properties diff --git a/server/container/guice/cassandra-ldap-guice/README.md b/server/container/guice/cassandra-ldap-guice/README.md deleted file mode 100644 index ca9b20c..0000000 --- a/server/container/guice/cassandra-ldap-guice/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Install James Cassandra-Guice - -Follow this [guide](https://james.apache.org/server/install/guice-cassandra.html) to install James Cassandra-guice -from command line. \ No newline at end of file diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml index f83405f..a54626f 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml @@ -117,7 +117,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index b1e070c..847b720 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -63,7 +63,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-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 7ef0017..06cd628 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -33,14 +33,11 @@ <name>Apache James :: Server :: Guice</name> <modules> - <module>blob/api</module> <module>blob/export</module> <module>blob/memory</module> <module>blob/s3</module> <module>cassandra</module> - <module>cassandra-guice</module> - <module>cassandra-ldap-guice</module> <module>cassandra-rabbitmq-guice</module> <module>cassandra-rabbitmq-ldap-guice</module> <module>configuration</module> diff --git a/server/pom.xml b/server/pom.xml index f620f6d..54d62e5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -39,6 +39,8 @@ <modules> <module>app</module> + <module>apps/cassandra-app</module> + <module>apps/cassandra-app-ldap-tests</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 a4a277d..2b3ab3d 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 @@ -65,7 +65,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-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 f4f2d25..99ef4f2 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 @@ -77,7 +77,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-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 ad8527a..6a8f379 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 @@ -65,7 +65,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> + <artifactId>james-server-cassandra-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
