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 91ecc060f10513cf83e405948c5671fa81f7a98c Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jun 10 18:17:51 2021 +0700 JAMES-3596 Move JPA SMTP apps in server/apps folder --- .../jpa-smtp => apps/jpa-smtp-app}/README.adoc | 2 +- .../guice/jpa-smtp => apps/jpa-smtp-app}/pom.xml | 22 ++++++++++++++++----- .../sample-configuration/dnsservice.xml | 0 .../sample-configuration/domainlist.xml | 0 .../sample-configuration/extensions.properties | 0 .../sample-configuration/healthcheck.properties | 0 .../sample-configuration/james-database.properties | 0 .../sample-configuration/jmx.properties | 0 .../jpa-smtp-app}/sample-configuration/logback.xml | 0 .../sample-configuration/mailetcontainer.xml | 0 .../sample-configuration/mailrepositorystore.xml | 0 .../sample-configuration/recipientrewritetable.xml | 0 .../sample-configuration/smtpserver.xml | 0 .../sample-configuration/usersrepository.xml | 0 .../jpa-smtp-app}/src/assemble/app.xml | 8 ++++---- .../jpa-smtp-app}/src/assemble/extensions-jars.txt | 0 .../src/assemble/license-for-binary.txt | 0 .../src/main/extensions-jars/README.md | 0 .../jpa-smtp-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 .../jpa-smtp-app}/src/main/resources/.gitkeep | 0 .../jpa-smtp-app}/src/main/scripts/james-cli | 0 .../java/org/apache/james/JPAJamesServerTest.java | 0 .../src/test/resources/dnsservice.xml | 0 .../src/test/resources/domainlist.xml | 0 .../src/test/resources/fakemailrepositorystore.xml | 0 .../jpa-smtp-app}/src/test/resources/keystore | Bin .../src/test/resources/mailetcontainer.xml | 0 .../src/test/resources/mailrepositorystore.xml | 0 .../src/test/resources/managesieveserver.xml | 0 .../src/test/resources/smtpserver.xml | 0 .../jpa-smtp-mariadb-app}/pom.xml | 18 ++++++++++++++--- .../sample-configuration}/dnsservice.xml | 0 .../sample-configuration/domainlist.xml | 0 .../sample-configuration/james-database.properties | 0 .../sample-configuration/mailetcontainer.xml | 0 .../sample-configuration/mailrepositorystore.xml | 0 .../sample-configuration/recipientrewritetable.xml | 0 .../sample-configuration/smtpserver.xml | 0 .../sample-configuration/usersrepository.xml | 0 .../sample-configuration/webadmin.properties | 0 .../java/org/apache/james/JPAJamesServerTest.java | 0 .../apache/james/TestJPAConfigurationModule.java | 0 .../src/test/resources}/dnsservice.xml | 0 .../src/test/resources/domainlist.xml | 0 .../src/test/resources/fakemailrepositorystore.xml | 0 .../src/test/resources/keystore | Bin .../src/test/resources/mailetcontainer.xml | 0 .../src/test/resources/mailrepositorystore.xml | 0 .../src/test/resources/smtpserver.xml | 0 server/container/guice/pom.xml | 2 -- server/pom.xml | 2 ++ 57 files changed, 39 insertions(+), 15 deletions(-) diff --git a/server/container/guice/jpa-smtp/README.adoc b/server/apps/jpa-smtp-app/README.adoc similarity index 97% rename from server/container/guice/jpa-smtp/README.adoc rename to server/apps/jpa-smtp-app/README.adoc index f950870..8254a6a 100644 --- a/server/container/guice/jpa-smtp/README.adoc +++ b/server/apps/jpa-smtp-app/README.adoc @@ -27,7 +27,7 @@ Once everything is set up, you just have to run the jar with: [source] ---- -$ java -javaagent:james-server-jpa-smtp-guice.lib/openjpa-3.1.2.jar -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-jpa-smtp-guice.jar +$ java -javaagent:james-server-jpa-smtp-guice.lib/openjpa-3.1.2.jar -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-jpa-smtp-app.jar ---- Note that binding ports below 1024 requires administrative rights. diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/apps/jpa-smtp-app/pom.xml similarity index 94% rename from server/container/guice/jpa-smtp/pom.xml rename to server/apps/jpa-smtp-app/pom.xml index 65d77c5..bf73877 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/apps/jpa-smtp-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-jpa-smtp-guice</artifactId> + <artifactId>james-server-jpa-smtp-app</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: JPA + SMTP - guice injection</name> + <name>Apache James :: Server :: JPA SMTP only :: App</name> <description>An advanced email server - JPA backend for SMTP with guice injection</description> <properties> <jpa.includes>empty</jpa.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> @@ -280,7 +292,7 @@ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> - <finalName>james-server-jpa-smtp-guice</finalName> + <finalName>james-server-jpa-smtp-app</finalName> </configuration> <executions> <execution> diff --git a/server/container/guice/jpa-smtp/sample-configuration/dnsservice.xml b/server/apps/jpa-smtp-app/sample-configuration/dnsservice.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/dnsservice.xml rename to server/apps/jpa-smtp-app/sample-configuration/dnsservice.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/domainlist.xml b/server/apps/jpa-smtp-app/sample-configuration/domainlist.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/domainlist.xml rename to server/apps/jpa-smtp-app/sample-configuration/domainlist.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/extensions.properties b/server/apps/jpa-smtp-app/sample-configuration/extensions.properties similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/extensions.properties rename to server/apps/jpa-smtp-app/sample-configuration/extensions.properties diff --git a/server/container/guice/jpa-smtp/sample-configuration/healthcheck.properties b/server/apps/jpa-smtp-app/sample-configuration/healthcheck.properties similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/healthcheck.properties rename to server/apps/jpa-smtp-app/sample-configuration/healthcheck.properties diff --git a/server/container/guice/jpa-smtp/sample-configuration/james-database.properties b/server/apps/jpa-smtp-app/sample-configuration/james-database.properties similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/james-database.properties rename to server/apps/jpa-smtp-app/sample-configuration/james-database.properties diff --git a/server/container/guice/jpa-smtp/sample-configuration/jmx.properties b/server/apps/jpa-smtp-app/sample-configuration/jmx.properties similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/jmx.properties rename to server/apps/jpa-smtp-app/sample-configuration/jmx.properties diff --git a/server/container/guice/jpa-smtp/sample-configuration/logback.xml b/server/apps/jpa-smtp-app/sample-configuration/logback.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/logback.xml rename to server/apps/jpa-smtp-app/sample-configuration/logback.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml rename to server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailrepositorystore.xml b/server/apps/jpa-smtp-app/sample-configuration/mailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/mailrepositorystore.xml rename to server/apps/jpa-smtp-app/sample-configuration/mailrepositorystore.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/recipientrewritetable.xml b/server/apps/jpa-smtp-app/sample-configuration/recipientrewritetable.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/recipientrewritetable.xml rename to server/apps/jpa-smtp-app/sample-configuration/recipientrewritetable.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/smtpserver.xml b/server/apps/jpa-smtp-app/sample-configuration/smtpserver.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/smtpserver.xml rename to server/apps/jpa-smtp-app/sample-configuration/smtpserver.xml diff --git a/server/container/guice/jpa-smtp/sample-configuration/usersrepository.xml b/server/apps/jpa-smtp-app/sample-configuration/usersrepository.xml similarity index 100% rename from server/container/guice/jpa-smtp/sample-configuration/usersrepository.xml rename to server/apps/jpa-smtp-app/sample-configuration/usersrepository.xml diff --git a/server/container/guice/jpa-smtp/src/assemble/app.xml b/server/apps/jpa-smtp-app/src/assemble/app.xml similarity index 91% rename from server/container/guice/jpa-smtp/src/assemble/app.xml rename to server/apps/jpa-smtp-app/src/assemble/app.xml index af8cc5a..fbbb48b 100644 --- a/server/container/guice/jpa-smtp/src/assemble/app.xml +++ b/server/apps/jpa-smtp-app/src/assemble/app.xml @@ -46,8 +46,8 @@ limitations under the License. </fileSet> <!-- include stuff from jar plugin --> <fileSet> - <directory>target/james-server-jpa-smtp-guice.lib</directory> - <outputDirectory>/james-server-jpa-smtp-guice.lib</outputDirectory> + <directory>target/james-server-jpa-smtp-app.lib</directory> + <outputDirectory>/james-server-jpa-smtp-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-jpa-smtp-guice.jar</source> + <source>target/james-server-jpa-smtp-app.jar</source> <outputDirectory>/</outputDirectory> <fileMode>0755</fileMode> - <destName>james-server-jpa-smtp-guice.jar</destName> + <destName>james-server-jpa-smtp-app.jar</destName> </file> </files> </assembly> diff --git a/server/container/guice/jpa-smtp/src/assemble/extensions-jars.txt b/server/apps/jpa-smtp-app/src/assemble/extensions-jars.txt similarity index 100% rename from server/container/guice/jpa-smtp/src/assemble/extensions-jars.txt rename to server/apps/jpa-smtp-app/src/assemble/extensions-jars.txt diff --git a/server/container/guice/jpa-smtp/src/assemble/license-for-binary.txt b/server/apps/jpa-smtp-app/src/assemble/license-for-binary.txt similarity index 100% rename from server/container/guice/jpa-smtp/src/assemble/license-for-binary.txt rename to server/apps/jpa-smtp-app/src/assemble/license-for-binary.txt diff --git a/server/container/guice/jpa-smtp/src/main/extensions-jars/README.md b/server/apps/jpa-smtp-app/src/main/extensions-jars/README.md similarity index 100% rename from server/container/guice/jpa-smtp/src/main/extensions-jars/README.md rename to server/apps/jpa-smtp-app/src/main/extensions-jars/README.md diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/admin.json b/server/apps/jpa-smtp-app/src/main/glowroot/admin.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/admin.json rename to server/apps/jpa-smtp-app/src/main/glowroot/admin.json diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/plugins/imap.json b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/imap.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/plugins/imap.json rename to server/apps/jpa-smtp-app/src/main/glowroot/plugins/imap.json diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/plugins/jmap.json b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/jmap.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/plugins/jmap.json rename to server/apps/jpa-smtp-app/src/main/glowroot/plugins/jmap.json diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/plugins/mailboxListener.json b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/mailboxListener.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/plugins/mailboxListener.json rename to server/apps/jpa-smtp-app/src/main/glowroot/plugins/mailboxListener.json diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/plugins/smtp.json b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/smtp.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/plugins/smtp.json rename to server/apps/jpa-smtp-app/src/main/glowroot/plugins/smtp.json diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/plugins/spooler.json b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/spooler.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/plugins/spooler.json rename to server/apps/jpa-smtp-app/src/main/glowroot/plugins/spooler.json diff --git a/server/container/guice/jpa-smtp/src/main/glowroot/plugins/task.json b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/task.json similarity index 100% rename from server/container/guice/jpa-smtp/src/main/glowroot/plugins/task.json rename to server/apps/jpa-smtp-app/src/main/glowroot/plugins/task.json diff --git a/server/container/guice/jpa-smtp/src/main/resources/.gitkeep b/server/apps/jpa-smtp-app/src/main/resources/.gitkeep similarity index 100% rename from server/container/guice/jpa-smtp/src/main/resources/.gitkeep rename to server/apps/jpa-smtp-app/src/main/resources/.gitkeep diff --git a/server/container/guice/jpa-smtp/src/main/scripts/james-cli b/server/apps/jpa-smtp-app/src/main/scripts/james-cli similarity index 100% rename from server/container/guice/jpa-smtp/src/main/scripts/james-cli rename to server/apps/jpa-smtp-app/src/main/scripts/james-cli diff --git a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/apps/jpa-smtp-app/src/test/java/org/apache/james/JPAJamesServerTest.java similarity index 100% rename from server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java rename to server/apps/jpa-smtp-app/src/test/java/org/apache/james/JPAJamesServerTest.java diff --git a/server/container/guice/jpa-smtp/src/test/resources/dnsservice.xml b/server/apps/jpa-smtp-app/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/dnsservice.xml rename to server/apps/jpa-smtp-app/src/test/resources/dnsservice.xml diff --git a/server/container/guice/jpa-smtp/src/test/resources/domainlist.xml b/server/apps/jpa-smtp-app/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/domainlist.xml rename to server/apps/jpa-smtp-app/src/test/resources/domainlist.xml diff --git a/server/container/guice/jpa-smtp/src/test/resources/fakemailrepositorystore.xml b/server/apps/jpa-smtp-app/src/test/resources/fakemailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/fakemailrepositorystore.xml rename to server/apps/jpa-smtp-app/src/test/resources/fakemailrepositorystore.xml diff --git a/server/container/guice/jpa-smtp/src/test/resources/keystore b/server/apps/jpa-smtp-app/src/test/resources/keystore similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/keystore rename to server/apps/jpa-smtp-app/src/test/resources/keystore diff --git a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml b/server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml rename to server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/jpa-smtp/src/test/resources/mailrepositorystore.xml b/server/apps/jpa-smtp-app/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/mailrepositorystore.xml rename to server/apps/jpa-smtp-app/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/jpa-smtp/src/test/resources/managesieveserver.xml b/server/apps/jpa-smtp-app/src/test/resources/managesieveserver.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/managesieveserver.xml rename to server/apps/jpa-smtp-app/src/test/resources/managesieveserver.xml diff --git a/server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml b/server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/jpa-smtp/src/test/resources/smtpserver.xml rename to server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/apps/jpa-smtp-mariadb-app/pom.xml similarity index 90% rename from server/container/guice/jpa-smtp-mariadb/pom.xml rename to server/apps/jpa-smtp-mariadb-app/pom.xml index 2d59b39..c91c03d 100644 --- a/server/container/guice/jpa-smtp-mariadb/pom.xml +++ b/server/apps/jpa-smtp-mariadb-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-jpa-smtp-mariadb-guice</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: JPA + SMTP + mariaDB client - guice injection</name> + <name>Apache James :: Server :: JPA + mariaDB client :: SMTP only :: App</name> <description>An advanced email server - JPA backend for SMTP 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> diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/dnsservice.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/dnsservice.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/dnsservice.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/dnsservice.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/domainlist.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/domainlist.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/domainlist.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/domainlist.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/james-database.properties b/server/apps/jpa-smtp-mariadb-app/sample-configuration/james-database.properties similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/james-database.properties rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/james-database.properties diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailetcontainer.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/mailetcontainer.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailrepositorystore.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/mailrepositorystore.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/mailrepositorystore.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/recipientrewritetable.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/recipientrewritetable.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/recipientrewritetable.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/recipientrewritetable.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/smtpserver.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/smtpserver.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/smtpserver.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/smtpserver.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/usersrepository.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/usersrepository.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/usersrepository.xml rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/usersrepository.xml diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/webadmin.properties b/server/apps/jpa-smtp-mariadb-app/sample-configuration/webadmin.properties similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/webadmin.properties rename to server/apps/jpa-smtp-mariadb-app/sample-configuration/webadmin.properties diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/apps/jpa-smtp-mariadb-app/src/test/java/org/apache/james/JPAJamesServerTest.java similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/JPAJamesServerTest.java rename to server/apps/jpa-smtp-mariadb-app/src/test/java/org/apache/james/JPAJamesServerTest.java diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/TestJPAConfigurationModule.java b/server/apps/jpa-smtp-mariadb-app/src/test/java/org/apache/james/TestJPAConfigurationModule.java similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/TestJPAConfigurationModule.java rename to server/apps/jpa-smtp-mariadb-app/src/test/java/org/apache/james/TestJPAConfigurationModule.java diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/dnsservice.xml b/server/apps/jpa-smtp-mariadb-app/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/sample-configuration/dnsservice.xml rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/dnsservice.xml diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/domainlist.xml b/server/apps/jpa-smtp-mariadb-app/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/domainlist.xml rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/domainlist.xml diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/fakemailrepositorystore.xml b/server/apps/jpa-smtp-mariadb-app/src/test/resources/fakemailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/fakemailrepositorystore.xml rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/fakemailrepositorystore.xml diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/keystore b/server/apps/jpa-smtp-mariadb-app/src/test/resources/keystore similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/keystore rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/keystore diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml b/server/apps/jpa-smtp-mariadb-app/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailrepositorystore.xml b/server/apps/jpa-smtp-mariadb-app/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/mailrepositorystore.xml rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml b/server/apps/jpa-smtp-mariadb-app/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/jpa-smtp-mariadb/src/test/resources/smtpserver.xml rename to server/apps/jpa-smtp-mariadb-app/src/test/resources/smtpserver.xml diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index e42fed7..787a189 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -49,9 +49,7 @@ <module>jmx</module> <module>jpa-common-guice</module> <module>jpa-guice</module> - <module>jpa-smtp</module> <module>jpa-smtp-common</module> - <module>jpa-smtp-mariadb</module> <module>mailbox</module> <module>mailbox-plugin-deleted-messages-vault-guice</module> <module>mailbox-plugin-spamassassin</module> diff --git a/server/pom.xml b/server/pom.xml index 5295431..6931fb8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -44,6 +44,8 @@ <module>apps/cli-integration-tests</module> <module>apps/distributed-app</module> <module>apps/distributed-ldap-tests</module> + <module>apps/jpa-smtp-app</module> + <module>apps/jpa-smtp-mariadb-app</module> <module>apps/spring-app</module> <module>apps/webadmin-cli</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
