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 f2f41c6d1712744f5893df2c0739d815d2daf39c Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jun 10 21:48:55 2021 +0700 JAMES-3596 Move Memory app in server/apps folder --- pom.xml | 4 +- server/apps/cli-integration-tests/pom.xml | 4 +- .../memory-guice => apps/memory-app}/README.md | 0 .../guice/memory-guice => apps/memory-app}/pom.xml | 63 +++++-------- .../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 .../memory-app}/sample-configuration/jwt_publickey | 0 .../memory-app}/sample-configuration/listeners.xml | 0 .../memory-app}/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/usersrepository.xml | 0 .../sample-configuration/webadmin.properties | 0 .../memory-app}/src/assemble/README.adoc | 0 .../memory-app}/src/assemble/app.xml | 8 +- .../memory-app}/src/assemble/extensions-jars.txt | 0 .../src/assemble/license-for-binary.txt | 0 .../memory-app}/src/main/extensions-jars/README.md | 0 .../memory-app}/src/main/glowroot/admin.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 .../org/apache/james/MemoryJamesServerMain.java | 0 .../memory-app}/src/main/scripts/james-cli | 0 .../apache/james/DefaultMemoryJamesServerTest.java | 0 .../apache/james/DisabledGroupExecutionTest.java | 0 .../java/org/apache/james/DisabledSpoolerTest.java | 0 .../org/apache/james/DomainAutodetectionTest.java | 0 .../test/java/org/apache/james/ErrorMailet.java | 0 .../james/GuiceJamesServerStartUpCheckTest.java | 0 .../org/apache/james/GuiceJamesServerTest.java | 0 .../apache/james/GuiceLifecycleHeathCheckTest.java | 0 .../LinshareBlobExportMechanismProvidingTest.java | 0 .../java/org/apache/james/LmtpIntegrationTest.java | 0 .../org/apache/james/MemoryJamesServerTest.java | 0 .../apache/james/MemoryJmapJamesServerTest.java | 0 .../java/org/apache/james/MemoryJmapTestRule.java | 0 .../src/test/java/org/apache/james/MyRoute.java | 0 .../apache/james/WebAdminRoutesExtensionTest.java | 0 .../src/test/resources/badAliasKeystore | Bin .../memory-app}/src/test/resources/dnsservice.xml | 0 .../memory-app}/src/test/resources/domainlist.xml | 0 .../memory-app}/src/test/resources/imapserver.xml | 0 .../memory-app}/src/test/resources/keystore | Bin .../memory-app}/src/test/resources/listeners.xml | 0 .../memory-app}/src/test/resources/lmtpserver.xml | 0 .../src/test/resources/mailetcontainer.xml | 0 .../src/test/resources/mailrepositorystore.xml | 0 .../src/test/resources/managesieveserver.xml | 0 .../memory-app}/src/test/resources/pop3server.xml | 0 .../memory-app}/src/test/resources/smtpserver.xml | 0 .../src/test/resources/spamassassin.properties | 0 server/apps/webadmin-cli/pom.xml | 2 +- .../guice/{memory-guice => memory}/README.md | 0 .../guice/memory}/pom.xml | 104 ++++++--------------- .../org/apache/james/FakeMessageSearchIndex.java | 0 .../org/apache/james/FakeSearchMailboxModule.java | 0 .../james/modules/data/MemoryDataJmapModule.java | 0 .../james/modules/data/MemoryDataModule.java | 0 .../modules/eventstore/MemoryEventStoreModule.java | 0 .../james/modules/mailbox/MemoryMailboxModule.java | 0 .../james/modules/mailbox/MemoryQuotaModule.java | 0 .../modules/mailbox/MemoryQuotaSearchModule.java | 0 server/container/guice/pom.xml | 7 +- server/mailet/integration-testing/pom.xml | 2 +- server/pom.xml | 1 + .../memory-jmap-draft-integration-testing/pom.xml | 4 +- .../memory-jmap-rfc-8621-integration-tests/pom.xml | 2 +- .../memory-webadmin-integration-test/pom.xml | 4 +- 83 files changed, 72 insertions(+), 133 deletions(-) diff --git a/pom.xml b/pom.xml index e8a926b..866858c 100644 --- a/pom.xml +++ b/pom.xml @@ -1628,12 +1628,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> diff --git a/server/apps/cli-integration-tests/pom.xml b/server/apps/cli-integration-tests/pom.xml index 3264dcb..9e4bd67 100644 --- a/server/apps/cli-integration-tests/pom.xml +++ b/server/apps/cli-integration-tests/pom.xml @@ -50,13 +50,13 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/container/guice/memory-guice/README.md b/server/apps/memory-app/README.md similarity index 100% copy from server/container/guice/memory-guice/README.md copy to server/apps/memory-app/README.md diff --git a/server/container/guice/memory-guice/pom.xml b/server/apps/memory-app/pom.xml similarity index 90% rename from server/container/guice/memory-guice/pom.xml rename to server/apps/memory-app/pom.xml index ac6369a..cd5cbd2 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/apps/memory-app/pom.xml @@ -23,17 +23,29 @@ <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-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: Memory - guice injection</name> + <name>Apache James :: Server :: Memory :: App</name> <description>An advanced email server - Memory backend with guice injection</description> + <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> @@ -43,60 +55,23 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-memory</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-quota-mailing</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-quota-search-scanning</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-james-mailbox-store</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-icalendar</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>blob-export-guice</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>blob-export-guice</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>blob-memory-guice</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>event-sourcing-event-store-memory</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-cli</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-memory</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -141,6 +116,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-memory</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-pop</artifactId> </dependency> <dependency> @@ -414,7 +393,7 @@ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> - <finalName>james-server-memory-guice</finalName> + <finalName>james-server-memory-app</finalName> </configuration> <executions> <execution> diff --git a/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties b/server/apps/memory-app/sample-configuration/deletedMessageVault.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties rename to server/apps/memory-app/sample-configuration/deletedMessageVault.properties diff --git a/server/container/guice/memory-guice/sample-configuration/dnsservice.xml b/server/apps/memory-app/sample-configuration/dnsservice.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/dnsservice.xml rename to server/apps/memory-app/sample-configuration/dnsservice.xml diff --git a/server/container/guice/memory-guice/sample-configuration/domainlist.xml b/server/apps/memory-app/sample-configuration/domainlist.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/domainlist.xml rename to server/apps/memory-app/sample-configuration/domainlist.xml diff --git a/server/container/guice/memory-guice/sample-configuration/elasticsearch.properties b/server/apps/memory-app/sample-configuration/elasticsearch.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/elasticsearch.properties rename to server/apps/memory-app/sample-configuration/elasticsearch.properties diff --git a/server/container/guice/memory-guice/sample-configuration/extensions.properties b/server/apps/memory-app/sample-configuration/extensions.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/extensions.properties rename to server/apps/memory-app/sample-configuration/extensions.properties diff --git a/server/container/guice/memory-guice/sample-configuration/healthcheck.properties b/server/apps/memory-app/sample-configuration/healthcheck.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/healthcheck.properties rename to server/apps/memory-app/sample-configuration/healthcheck.properties diff --git a/server/container/guice/memory-guice/sample-configuration/imapserver.xml b/server/apps/memory-app/sample-configuration/imapserver.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/imapserver.xml rename to server/apps/memory-app/sample-configuration/imapserver.xml diff --git a/server/container/guice/memory-guice/sample-configuration/jmap.properties b/server/apps/memory-app/sample-configuration/jmap.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/jmap.properties rename to server/apps/memory-app/sample-configuration/jmap.properties diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/apps/memory-app/sample-configuration/jmx.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/jmx.properties rename to server/apps/memory-app/sample-configuration/jmx.properties diff --git a/server/container/guice/memory-guice/sample-configuration/jwt_publickey b/server/apps/memory-app/sample-configuration/jwt_publickey similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/jwt_publickey rename to server/apps/memory-app/sample-configuration/jwt_publickey diff --git a/server/container/guice/memory-guice/sample-configuration/listeners.xml b/server/apps/memory-app/sample-configuration/listeners.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/listeners.xml rename to server/apps/memory-app/sample-configuration/listeners.xml diff --git a/server/container/guice/memory-guice/sample-configuration/logback.xml b/server/apps/memory-app/sample-configuration/logback.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/logback.xml rename to server/apps/memory-app/sample-configuration/logback.xml diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/apps/memory-app/sample-configuration/mailetcontainer.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml rename to server/apps/memory-app/sample-configuration/mailetcontainer.xml diff --git a/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml b/server/apps/memory-app/sample-configuration/mailrepositorystore.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml rename to server/apps/memory-app/sample-configuration/mailrepositorystore.xml diff --git a/server/container/guice/memory-guice/sample-configuration/managesieveserver.xml b/server/apps/memory-app/sample-configuration/managesieveserver.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/managesieveserver.xml rename to server/apps/memory-app/sample-configuration/managesieveserver.xml diff --git a/server/container/guice/memory-guice/sample-configuration/pop3server.xml b/server/apps/memory-app/sample-configuration/pop3server.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/pop3server.xml rename to server/apps/memory-app/sample-configuration/pop3server.xml diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/apps/memory-app/sample-configuration/recipientrewritetable.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml rename to server/apps/memory-app/sample-configuration/recipientrewritetable.xml diff --git a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml b/server/apps/memory-app/sample-configuration/smtpserver.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/smtpserver.xml rename to server/apps/memory-app/sample-configuration/smtpserver.xml diff --git a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml b/server/apps/memory-app/sample-configuration/usersrepository.xml similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/usersrepository.xml rename to server/apps/memory-app/sample-configuration/usersrepository.xml diff --git a/server/container/guice/memory-guice/sample-configuration/webadmin.properties b/server/apps/memory-app/sample-configuration/webadmin.properties similarity index 100% rename from server/container/guice/memory-guice/sample-configuration/webadmin.properties rename to server/apps/memory-app/sample-configuration/webadmin.properties diff --git a/server/container/guice/memory-guice/src/assemble/README.adoc b/server/apps/memory-app/src/assemble/README.adoc similarity index 100% rename from server/container/guice/memory-guice/src/assemble/README.adoc rename to server/apps/memory-app/src/assemble/README.adoc diff --git a/server/container/guice/memory-guice/src/assemble/app.xml b/server/apps/memory-app/src/assemble/app.xml similarity index 91% rename from server/container/guice/memory-guice/src/assemble/app.xml rename to server/apps/memory-app/src/assemble/app.xml index 1aa4b3a..6191377 100644 --- a/server/container/guice/memory-guice/src/assemble/app.xml +++ b/server/apps/memory-app/src/assemble/app.xml @@ -46,8 +46,8 @@ limitations under the License. </fileSet> <!-- include stuff from jar plugin --> <fileSet> - <directory>target/james-server-memory-guice.lib</directory> - <outputDirectory>/james-server-memory-guice.lib</outputDirectory> + <directory>target/james-server-memory-app.lib</directory> + <outputDirectory>/james-server-memory-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-memory-guice.jar</source> + <source>target/james-server-memory-app.jar</source> <outputDirectory>/</outputDirectory> <fileMode>0755</fileMode> - <destName>james-server-memory-guice.jar</destName> + <destName>james-server-memory-app.jar</destName> </file> </files> </assembly> diff --git a/server/container/guice/memory-guice/src/assemble/extensions-jars.txt b/server/apps/memory-app/src/assemble/extensions-jars.txt similarity index 100% rename from server/container/guice/memory-guice/src/assemble/extensions-jars.txt rename to server/apps/memory-app/src/assemble/extensions-jars.txt diff --git a/server/container/guice/memory-guice/src/assemble/license-for-binary.txt b/server/apps/memory-app/src/assemble/license-for-binary.txt similarity index 100% rename from server/container/guice/memory-guice/src/assemble/license-for-binary.txt rename to server/apps/memory-app/src/assemble/license-for-binary.txt diff --git a/server/container/guice/memory-guice/src/main/extensions-jars/README.md b/server/apps/memory-app/src/main/extensions-jars/README.md similarity index 100% rename from server/container/guice/memory-guice/src/main/extensions-jars/README.md rename to server/apps/memory-app/src/main/extensions-jars/README.md diff --git a/server/container/guice/memory-guice/src/main/glowroot/admin.json b/server/apps/memory-app/src/main/glowroot/admin.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/admin.json rename to server/apps/memory-app/src/main/glowroot/admin.json diff --git a/server/container/guice/memory-guice/src/main/glowroot/plugins/imap.json b/server/apps/memory-app/src/main/glowroot/plugins/imap.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/plugins/imap.json rename to server/apps/memory-app/src/main/glowroot/plugins/imap.json diff --git a/server/container/guice/memory-guice/src/main/glowroot/plugins/jmap.json b/server/apps/memory-app/src/main/glowroot/plugins/jmap.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/plugins/jmap.json rename to server/apps/memory-app/src/main/glowroot/plugins/jmap.json diff --git a/server/container/guice/memory-guice/src/main/glowroot/plugins/mailboxListener.json b/server/apps/memory-app/src/main/glowroot/plugins/mailboxListener.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/plugins/mailboxListener.json rename to server/apps/memory-app/src/main/glowroot/plugins/mailboxListener.json diff --git a/server/container/guice/memory-guice/src/main/glowroot/plugins/smtp.json b/server/apps/memory-app/src/main/glowroot/plugins/smtp.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/plugins/smtp.json rename to server/apps/memory-app/src/main/glowroot/plugins/smtp.json diff --git a/server/container/guice/memory-guice/src/main/glowroot/plugins/spooler.json b/server/apps/memory-app/src/main/glowroot/plugins/spooler.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/plugins/spooler.json rename to server/apps/memory-app/src/main/glowroot/plugins/spooler.json diff --git a/server/container/guice/memory-guice/src/main/glowroot/plugins/task.json b/server/apps/memory-app/src/main/glowroot/plugins/task.json similarity index 100% rename from server/container/guice/memory-guice/src/main/glowroot/plugins/task.json rename to server/apps/memory-app/src/main/glowroot/plugins/task.json diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java rename to server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java diff --git a/server/container/guice/memory-guice/src/main/scripts/james-cli b/server/apps/memory-app/src/main/scripts/james-cli similarity index 100% rename from server/container/guice/memory-guice/src/main/scripts/james-cli rename to server/apps/memory-app/src/main/scripts/james-cli diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java b/server/apps/memory-app/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DisabledGroupExecutionTest.java b/server/apps/memory-app/src/test/java/org/apache/james/DisabledGroupExecutionTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/DisabledGroupExecutionTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/DisabledGroupExecutionTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DisabledSpoolerTest.java b/server/apps/memory-app/src/test/java/org/apache/james/DisabledSpoolerTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/DisabledSpoolerTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/DisabledSpoolerTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DomainAutodetectionTest.java b/server/apps/memory-app/src/test/java/org/apache/james/DomainAutodetectionTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/DomainAutodetectionTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/DomainAutodetectionTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/ErrorMailet.java b/server/apps/memory-app/src/test/java/org/apache/james/ErrorMailet.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/ErrorMailet.java rename to server/apps/memory-app/src/test/java/org/apache/james/ErrorMailet.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java b/server/apps/memory-app/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java b/server/apps/memory-app/src/test/java/org/apache/james/GuiceJamesServerTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/GuiceJamesServerTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java b/server/apps/memory-app/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java b/server/apps/memory-app/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/LmtpIntegrationTest.java b/server/apps/memory-app/src/test/java/org/apache/james/LmtpIntegrationTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/LmtpIntegrationTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/LmtpIntegrationTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/apps/memory-app/src/test/java/org/apache/james/MemoryJamesServerTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/MemoryJamesServerTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java b/server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java b/server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapTestRule.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java rename to server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapTestRule.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MyRoute.java b/server/apps/memory-app/src/test/java/org/apache/james/MyRoute.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/MyRoute.java rename to server/apps/memory-app/src/test/java/org/apache/james/MyRoute.java diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java b/server/apps/memory-app/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java similarity index 100% rename from server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java rename to server/apps/memory-app/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java diff --git a/server/container/guice/memory-guice/src/test/resources/badAliasKeystore b/server/apps/memory-app/src/test/resources/badAliasKeystore similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/badAliasKeystore rename to server/apps/memory-app/src/test/resources/badAliasKeystore diff --git a/server/container/guice/memory-guice/src/test/resources/dnsservice.xml b/server/apps/memory-app/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/dnsservice.xml rename to server/apps/memory-app/src/test/resources/dnsservice.xml diff --git a/server/container/guice/memory-guice/src/test/resources/domainlist.xml b/server/apps/memory-app/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/domainlist.xml rename to server/apps/memory-app/src/test/resources/domainlist.xml diff --git a/server/container/guice/memory-guice/src/test/resources/imapserver.xml b/server/apps/memory-app/src/test/resources/imapserver.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/imapserver.xml rename to server/apps/memory-app/src/test/resources/imapserver.xml diff --git a/server/container/guice/memory-guice/src/test/resources/keystore b/server/apps/memory-app/src/test/resources/keystore similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/keystore rename to server/apps/memory-app/src/test/resources/keystore diff --git a/server/container/guice/memory-guice/src/test/resources/listeners.xml b/server/apps/memory-app/src/test/resources/listeners.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/listeners.xml rename to server/apps/memory-app/src/test/resources/listeners.xml diff --git a/server/container/guice/memory-guice/src/test/resources/lmtpserver.xml b/server/apps/memory-app/src/test/resources/lmtpserver.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/lmtpserver.xml rename to server/apps/memory-app/src/test/resources/lmtpserver.xml diff --git a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml b/server/apps/memory-app/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml rename to server/apps/memory-app/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/memory-guice/src/test/resources/mailrepositorystore.xml b/server/apps/memory-app/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/mailrepositorystore.xml rename to server/apps/memory-app/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/memory-guice/src/test/resources/managesieveserver.xml b/server/apps/memory-app/src/test/resources/managesieveserver.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/managesieveserver.xml rename to server/apps/memory-app/src/test/resources/managesieveserver.xml diff --git a/server/container/guice/memory-guice/src/test/resources/pop3server.xml b/server/apps/memory-app/src/test/resources/pop3server.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/pop3server.xml rename to server/apps/memory-app/src/test/resources/pop3server.xml diff --git a/server/container/guice/memory-guice/src/test/resources/smtpserver.xml b/server/apps/memory-app/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/smtpserver.xml rename to server/apps/memory-app/src/test/resources/smtpserver.xml diff --git a/server/container/guice/memory-guice/src/test/resources/spamassassin.properties b/server/apps/memory-app/src/test/resources/spamassassin.properties similarity index 100% rename from server/container/guice/memory-guice/src/test/resources/spamassassin.properties rename to server/apps/memory-app/src/test/resources/spamassassin.properties diff --git a/server/apps/webadmin-cli/pom.xml b/server/apps/webadmin-cli/pom.xml index 8d52aac..76022e7 100644 --- a/server/apps/webadmin-cli/pom.xml +++ b/server/apps/webadmin-cli/pom.xml @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/container/guice/memory-guice/README.md b/server/container/guice/memory/README.md similarity index 100% rename from server/container/guice/memory-guice/README.md rename to server/container/guice/memory/README.md diff --git a/server/mailet/integration-testing/pom.xml b/server/container/guice/memory/pom.xml similarity index 51% copy from server/mailet/integration-testing/pom.xml copy to server/container/guice/memory/pom.xml index 6e6da97..2c3e51d 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/container/guice/memory/pom.xml @@ -18,140 +18,94 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> + <artifactId>james-server-guice</artifactId> <version>3.7.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>james-server-mailets-integration-testing</artifactId> + <artifactId>james-server-guice-memory</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: Mailets Integration Testing</name> + <name>Apache James :: Server :: Memory - guice injection</name> + <description>Guice modules for the memory backend</description> <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-crypto</artifactId> - <version>${project.version}</version> + <artifactId>apache-james-mailbox-memory</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-icalendar</artifactId> - <version>${project.version}</version> + <artifactId>apache-james-mailbox-quota-mailing</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-test</artifactId> + <artifactId>apache-james-mailbox-quota-search-scanning</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-dnsservice-test</artifactId> + <artifactId>apache-mailet-icalendar</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> - <type>test-jar</type> + <artifactId>blob-export-guice</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> - <type>test-jar</type> + <artifactId>blob-memory-guice</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailet-dkim</artifactId> + <artifactId>event-sourcing-event-store-memory</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailets</artifactId> + <artifactId>james-server-data-memory</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-testing</artifactId> + <artifactId>james-server-guice-jmap</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-webadmin-core</artifactId> - <type>test-jar</type> + <artifactId>james-server-guice-mailbox</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>mock-smtp-server</artifactId> + <artifactId>james-server-guice-sieve-file</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>queue-activemq-guice</artifactId> + <artifactId>james-server-mailbox-adapter</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> - </dependency> - <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId> </dependency> <dependency> - <groupId>com.jayway.jsonpath</groupId> - <artifactId>json-path</artifactId> - </dependency> - <dependency> - <groupId>com.rabbitmq</groupId> - <artifactId>amqp-client</artifactId> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-assertj</artifactId> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>java-hamcrest</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailrepository-memory</artifactId> </dependency> <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> - <version>2.6.3</version> + <!-- Added because of https://issues.apache.org/jira/browse/SUREFIRE-1266 --> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-testing</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-matchers</artifactId> - <version>2.6.3</version> + <groupId>${james.groupId}</groupId> + <artifactId>queue-memory-guice</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <reuseForks>true</reuseForks> - <forkCount>8</forkCount> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/FakeMessageSearchIndex.java b/server/container/guice/memory/src/main/java/org/apache/james/FakeMessageSearchIndex.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/FakeMessageSearchIndex.java rename to server/container/guice/memory/src/main/java/org/apache/james/FakeMessageSearchIndex.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/FakeSearchMailboxModule.java b/server/container/guice/memory/src/main/java/org/apache/james/FakeSearchMailboxModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/FakeSearchMailboxModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/FakeSearchMailboxModule.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/data/MemoryDataModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/modules/data/MemoryDataModule.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/eventstore/MemoryEventStoreModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/eventstore/MemoryEventStoreModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/modules/eventstore/MemoryEventStoreModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/modules/eventstore/MemoryEventStoreModule.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaModule.java diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaSearchModule.java b/server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaSearchModule.java similarity index 100% rename from server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaSearchModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryQuotaSearchModule.java diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 74643c0..d10274c 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -55,7 +55,7 @@ <module>mailbox-plugin-spamassassin</module> <module>mailet</module> <module>mailrepository-cassandra</module> - <module>memory-guice</module> + <module>memory</module> <module>onami</module> <module>protocols/imap</module> <module>protocols/jmap</module> @@ -166,6 +166,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-memory</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-pop</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 6e6da97..624123d 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/pom.xml b/server/pom.xml index c0be2b3..2f19172 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -47,6 +47,7 @@ <module>apps/jpa-app</module> <module>apps/jpa-smtp-app</module> <module>apps/jpa-smtp-mariadb-app</module> + <module>apps/memory-app</module> <module>apps/spring-app</module> <module>apps/webadmin-cli</module> diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml index 5454281..20d89d7 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml @@ -92,12 +92,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml index 4ff51f5..43af545 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml index 79c1fa7..b93505b 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml @@ -35,13 +35,13 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> + <artifactId>james-server-memory-app</artifactId> <scope>test</scope> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
