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 369a279f93eb4b5d3e836f5e071fe5dde6ace994 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jun 10 20:55:25 2021 +0700 JAMES-3596 Move JPA app in server/apps folder --- .../guice/jpa-guice => apps/jpa-app}/README.adoc | 2 +- .../guice/jpa-guice => apps/jpa-app}/pom.xml | 30 +++++--- .../jpa-app}/sample-configuration/dnsservice.xml | 0 .../jpa-app}/sample-configuration/domainlist.xml | 0 .../sample-configuration/extensions.properties | 0 .../sample-configuration/healthcheck.properties | 0 .../jpa-app}/sample-configuration/imapserver.xml | 0 .../sample-configuration/james-database.properties | 0 .../jpa-app}/sample-configuration/jmx.properties | 0 .../jpa-app}/sample-configuration/jwt_publickey | 0 .../jpa-app}/sample-configuration/listeners.xml | 0 .../jpa-app}/sample-configuration/lmtpserver.xml | 0 .../jpa-app}/sample-configuration/logback.xml | 0 .../sample-configuration/mailetcontainer.xml | 0 .../sample-configuration/mailrepositorystore.xml | 0 .../sample-configuration/managesieveserver.xml | 0 .../jpa-app}/sample-configuration/pop3server.xml | 0 .../sample-configuration/recipientrewritetable.xml | 0 .../jpa-app}/sample-configuration/smtpserver.xml | 0 .../sample-configuration/usersrepository.xml | 0 .../sample-configuration/webadmin.properties | 0 .../jpa-app}/src/assemble/app.xml | 8 +- .../jpa-app}/src/assemble/extensions-jars.txt | 0 .../jpa-app}/src/assemble/license-for-binary.txt | 0 .../jpa-app}/src/main/extensions-jars/README.md | 0 .../jpa-app}/src/main/glowroot/admin.json | 0 .../jpa-app}/src/main/glowroot/plugins/imap.json | 0 .../jpa-app}/src/main/glowroot/plugins/jmap.json | 0 .../src/main/glowroot/plugins/mailboxListener.json | 0 .../jpa-app}/src/main/glowroot/plugins/smtp.json | 0 .../src/main/glowroot/plugins/spooler.json | 0 .../jpa-app}/src/main/glowroot/plugins/task.json | 0 .../java/org/apache/james/JPAJamesServerMain.java | 0 .../src/main/resources/META-INF/persistence.xml | 0 .../src/main/resources/defaultMailetContainer.xml | 0 .../jpa-app}/src/main/resources/logback.xml | 0 .../jpa-app}/src/main/scripts/james-cli | 0 .../java/org/apache/james/JPAJamesServerTest.java | 0 ...WithAuthenticatedDatabaseSqlValidationTest.java | 0 ...atabaseAuthenticaticationSqlValidationTest.java | 0 .../james/JPAJamesServerWithSqlValidationTest.java | 0 .../apache/james/JamesCapabilitiesServerTest.java | 0 .../jpa-app}/src/test/resources/dnsservice.xml | 0 .../jpa-app}/src/test/resources/domainlist.xml | 0 .../src/test/resources/fakemailrepositorystore.xml | 0 .../jpa-app}/src/test/resources/imapserver.xml | 0 .../jpa-app}/src/test/resources/keystore | Bin .../jpa-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 .../jpa-app}/src/test/resources/pop3server.xml | 0 .../jpa-app}/src/test/resources/smtpserver.xml | 0 server/container/guice/mailbox-jpa/pom.xml | 81 +++++++++++++++++++++ .../james/modules/mailbox/JPAMailboxModule.java | 0 .../modules/mailbox/JPAQuotaSearchModule.java | 0 .../james/modules/mailbox/JpaQuotaModule.java | 0 .../modules/mailbox/LuceneSearchMailboxModule.java | 0 server/container/guice/pom.xml | 7 +- server/pom.xml | 1 + 60 files changed, 112 insertions(+), 17 deletions(-) diff --git a/server/container/guice/jpa-guice/README.adoc b/server/apps/jpa-app/README.adoc similarity index 98% rename from server/container/guice/jpa-guice/README.adoc rename to server/apps/jpa-app/README.adoc index ed72deb..97b16db 100644 --- a/server/container/guice/jpa-guice/README.adoc +++ b/server/apps/jpa-app/README.adoc @@ -25,7 +25,7 @@ Once everything is set up, you just have to run the jar with: [source] ---- -$ java -javaagent:james-server-jpa-guice.lib/openjpa-3.1.2.jar -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-jpa-guice.jar +$ java -javaagent:james-server-jpa-guice.lib/openjpa-3.1.2.jar -Dworking.directory=. -Dlogback.configurationFile=conf/logback.xml -jar james-server-jpa-app.jar ---- Note that binding ports below 1024 requires administrative rights. diff --git a/server/container/guice/jpa-guice/pom.xml b/server/apps/jpa-app/pom.xml similarity index 96% rename from server/container/guice/jpa-guice/pom.xml rename to server/apps/jpa-app/pom.xml index b33a2d0..eec192c 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/apps/jpa-app/pom.xml @@ -23,12 +23,12 @@ <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-guice</artifactId> + <artifactId>james-server-jpa-app</artifactId> <packaging>jar</packaging> <name>Apache James :: Server :: JPA - guice injection</name> @@ -38,23 +38,27 @@ <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> <artifactId>apache-james-mailbox-jpa</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-jpa</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-lucene</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-james-mailbox-quota-search-scanning</artifactId> </dependency> <dependency> @@ -98,6 +102,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox-jpa</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId> </dependency> <dependency> diff --git a/server/container/guice/jpa-guice/sample-configuration/dnsservice.xml b/server/apps/jpa-app/sample-configuration/dnsservice.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/dnsservice.xml rename to server/apps/jpa-app/sample-configuration/dnsservice.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/domainlist.xml b/server/apps/jpa-app/sample-configuration/domainlist.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/domainlist.xml rename to server/apps/jpa-app/sample-configuration/domainlist.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/extensions.properties b/server/apps/jpa-app/sample-configuration/extensions.properties similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/extensions.properties rename to server/apps/jpa-app/sample-configuration/extensions.properties diff --git a/server/container/guice/jpa-guice/sample-configuration/healthcheck.properties b/server/apps/jpa-app/sample-configuration/healthcheck.properties similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/healthcheck.properties rename to server/apps/jpa-app/sample-configuration/healthcheck.properties diff --git a/server/container/guice/jpa-guice/sample-configuration/imapserver.xml b/server/apps/jpa-app/sample-configuration/imapserver.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/imapserver.xml rename to server/apps/jpa-app/sample-configuration/imapserver.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/james-database.properties b/server/apps/jpa-app/sample-configuration/james-database.properties similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/james-database.properties rename to server/apps/jpa-app/sample-configuration/james-database.properties diff --git a/server/container/guice/jpa-guice/sample-configuration/jmx.properties b/server/apps/jpa-app/sample-configuration/jmx.properties similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/jmx.properties rename to server/apps/jpa-app/sample-configuration/jmx.properties diff --git a/server/container/guice/jpa-guice/sample-configuration/jwt_publickey b/server/apps/jpa-app/sample-configuration/jwt_publickey similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/jwt_publickey rename to server/apps/jpa-app/sample-configuration/jwt_publickey diff --git a/server/container/guice/jpa-guice/sample-configuration/listeners.xml b/server/apps/jpa-app/sample-configuration/listeners.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/listeners.xml rename to server/apps/jpa-app/sample-configuration/listeners.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/lmtpserver.xml b/server/apps/jpa-app/sample-configuration/lmtpserver.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/lmtpserver.xml rename to server/apps/jpa-app/sample-configuration/lmtpserver.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/logback.xml b/server/apps/jpa-app/sample-configuration/logback.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/logback.xml rename to server/apps/jpa-app/sample-configuration/logback.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/mailetcontainer.xml b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/mailetcontainer.xml rename to server/apps/jpa-app/sample-configuration/mailetcontainer.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/mailrepositorystore.xml b/server/apps/jpa-app/sample-configuration/mailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/mailrepositorystore.xml rename to server/apps/jpa-app/sample-configuration/mailrepositorystore.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/managesieveserver.xml b/server/apps/jpa-app/sample-configuration/managesieveserver.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/managesieveserver.xml rename to server/apps/jpa-app/sample-configuration/managesieveserver.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/pop3server.xml b/server/apps/jpa-app/sample-configuration/pop3server.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/pop3server.xml rename to server/apps/jpa-app/sample-configuration/pop3server.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/recipientrewritetable.xml b/server/apps/jpa-app/sample-configuration/recipientrewritetable.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/recipientrewritetable.xml rename to server/apps/jpa-app/sample-configuration/recipientrewritetable.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/smtpserver.xml b/server/apps/jpa-app/sample-configuration/smtpserver.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/smtpserver.xml rename to server/apps/jpa-app/sample-configuration/smtpserver.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/usersrepository.xml b/server/apps/jpa-app/sample-configuration/usersrepository.xml similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/usersrepository.xml rename to server/apps/jpa-app/sample-configuration/usersrepository.xml diff --git a/server/container/guice/jpa-guice/sample-configuration/webadmin.properties b/server/apps/jpa-app/sample-configuration/webadmin.properties similarity index 100% rename from server/container/guice/jpa-guice/sample-configuration/webadmin.properties rename to server/apps/jpa-app/sample-configuration/webadmin.properties diff --git a/server/container/guice/jpa-guice/src/assemble/app.xml b/server/apps/jpa-app/src/assemble/app.xml similarity index 91% rename from server/container/guice/jpa-guice/src/assemble/app.xml rename to server/apps/jpa-app/src/assemble/app.xml index 0b590c3..691a4b0 100644 --- a/server/container/guice/jpa-guice/src/assemble/app.xml +++ b/server/apps/jpa-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-guice.lib</directory> - <outputDirectory>/james-server-jpa-guice.lib</outputDirectory> + <directory>target/james-server-jpa-app.lib</directory> + <outputDirectory>/james-server-jpa-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-guice.jar</source> + <source>target/james-server-jpa-app.jar</source> <outputDirectory>/</outputDirectory> <fileMode>0755</fileMode> - <destName>james-server-jpa-guice.jar</destName> + <destName>james-server-jpa-app.jar</destName> </file> </files> </assembly> diff --git a/server/container/guice/jpa-guice/src/assemble/extensions-jars.txt b/server/apps/jpa-app/src/assemble/extensions-jars.txt similarity index 100% rename from server/container/guice/jpa-guice/src/assemble/extensions-jars.txt rename to server/apps/jpa-app/src/assemble/extensions-jars.txt diff --git a/server/container/guice/jpa-guice/src/assemble/license-for-binary.txt b/server/apps/jpa-app/src/assemble/license-for-binary.txt similarity index 100% rename from server/container/guice/jpa-guice/src/assemble/license-for-binary.txt rename to server/apps/jpa-app/src/assemble/license-for-binary.txt diff --git a/server/container/guice/jpa-guice/src/main/extensions-jars/README.md b/server/apps/jpa-app/src/main/extensions-jars/README.md similarity index 100% rename from server/container/guice/jpa-guice/src/main/extensions-jars/README.md rename to server/apps/jpa-app/src/main/extensions-jars/README.md diff --git a/server/container/guice/jpa-guice/src/main/glowroot/admin.json b/server/apps/jpa-app/src/main/glowroot/admin.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/admin.json rename to server/apps/jpa-app/src/main/glowroot/admin.json diff --git a/server/container/guice/jpa-guice/src/main/glowroot/plugins/imap.json b/server/apps/jpa-app/src/main/glowroot/plugins/imap.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/plugins/imap.json rename to server/apps/jpa-app/src/main/glowroot/plugins/imap.json diff --git a/server/container/guice/jpa-guice/src/main/glowroot/plugins/jmap.json b/server/apps/jpa-app/src/main/glowroot/plugins/jmap.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/plugins/jmap.json rename to server/apps/jpa-app/src/main/glowroot/plugins/jmap.json diff --git a/server/container/guice/jpa-guice/src/main/glowroot/plugins/mailboxListener.json b/server/apps/jpa-app/src/main/glowroot/plugins/mailboxListener.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/plugins/mailboxListener.json rename to server/apps/jpa-app/src/main/glowroot/plugins/mailboxListener.json diff --git a/server/container/guice/jpa-guice/src/main/glowroot/plugins/smtp.json b/server/apps/jpa-app/src/main/glowroot/plugins/smtp.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/plugins/smtp.json rename to server/apps/jpa-app/src/main/glowroot/plugins/smtp.json diff --git a/server/container/guice/jpa-guice/src/main/glowroot/plugins/spooler.json b/server/apps/jpa-app/src/main/glowroot/plugins/spooler.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/plugins/spooler.json rename to server/apps/jpa-app/src/main/glowroot/plugins/spooler.json diff --git a/server/container/guice/jpa-guice/src/main/glowroot/plugins/task.json b/server/apps/jpa-app/src/main/glowroot/plugins/task.json similarity index 100% rename from server/container/guice/jpa-guice/src/main/glowroot/plugins/task.json rename to server/apps/jpa-app/src/main/glowroot/plugins/task.json diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/apps/jpa-app/src/main/java/org/apache/james/JPAJamesServerMain.java similarity index 100% rename from server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java rename to server/apps/jpa-app/src/main/java/org/apache/james/JPAJamesServerMain.java diff --git a/server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml b/server/apps/jpa-app/src/main/resources/META-INF/persistence.xml similarity index 100% rename from server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml rename to server/apps/jpa-app/src/main/resources/META-INF/persistence.xml diff --git a/server/container/guice/jpa-guice/src/main/resources/defaultMailetContainer.xml b/server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml similarity index 100% rename from server/container/guice/jpa-guice/src/main/resources/defaultMailetContainer.xml rename to server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml diff --git a/server/container/guice/jpa-guice/src/main/resources/logback.xml b/server/apps/jpa-app/src/main/resources/logback.xml similarity index 100% rename from server/container/guice/jpa-guice/src/main/resources/logback.xml rename to server/apps/jpa-app/src/main/resources/logback.xml diff --git a/server/container/guice/jpa-guice/src/main/scripts/james-cli b/server/apps/jpa-app/src/main/scripts/james-cli similarity index 100% rename from server/container/guice/jpa-guice/src/main/scripts/james-cli rename to server/apps/jpa-app/src/main/scripts/james-cli diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerTest.java similarity index 100% rename from server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java rename to server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerTest.java diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java b/server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java similarity index 100% rename from server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java rename to server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java b/server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java similarity index 100% rename from server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java rename to server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java b/server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java similarity index 100% rename from server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java rename to server/apps/jpa-app/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/apps/jpa-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java similarity index 100% rename from server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java rename to server/apps/jpa-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java diff --git a/server/container/guice/jpa-guice/src/test/resources/dnsservice.xml b/server/apps/jpa-app/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/dnsservice.xml rename to server/apps/jpa-app/src/test/resources/dnsservice.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/domainlist.xml b/server/apps/jpa-app/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/domainlist.xml rename to server/apps/jpa-app/src/test/resources/domainlist.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/fakemailrepositorystore.xml b/server/apps/jpa-app/src/test/resources/fakemailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/fakemailrepositorystore.xml rename to server/apps/jpa-app/src/test/resources/fakemailrepositorystore.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/imapserver.xml b/server/apps/jpa-app/src/test/resources/imapserver.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/imapserver.xml rename to server/apps/jpa-app/src/test/resources/imapserver.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/keystore b/server/apps/jpa-app/src/test/resources/keystore similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/keystore rename to server/apps/jpa-app/src/test/resources/keystore diff --git a/server/container/guice/jpa-guice/src/test/resources/lmtpserver.xml b/server/apps/jpa-app/src/test/resources/lmtpserver.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/lmtpserver.xml rename to server/apps/jpa-app/src/test/resources/lmtpserver.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/apps/jpa-app/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml rename to server/apps/jpa-app/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/mailrepositorystore.xml b/server/apps/jpa-app/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/mailrepositorystore.xml rename to server/apps/jpa-app/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/managesieveserver.xml b/server/apps/jpa-app/src/test/resources/managesieveserver.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/managesieveserver.xml rename to server/apps/jpa-app/src/test/resources/managesieveserver.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/pop3server.xml b/server/apps/jpa-app/src/test/resources/pop3server.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/pop3server.xml rename to server/apps/jpa-app/src/test/resources/pop3server.xml diff --git a/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml b/server/apps/jpa-app/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/jpa-guice/src/test/resources/smtpserver.xml rename to server/apps/jpa-app/src/test/resources/smtpserver.xml diff --git a/server/container/guice/mailbox-jpa/pom.xml b/server/container/guice/mailbox-jpa/pom.xml new file mode 100644 index 0000000..12ca74a --- /dev/null +++ b/server/container/guice/mailbox-jpa/pom.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.james</groupId> + <artifactId>james-server-guice</artifactId> + <version>3.7.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>james-server-guice-mailbox-jpa</artifactId> + <packaging>jar</packaging> + + <name>Apache James :: Server :: JPA - guice injection</name> + <description>An advanced email server - JPA backend with guice injection</description> + + <dependencies> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>apache-james-mailbox-jpa</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>apache-james-mailbox-lucene</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>apache-james-mailbox-quota-search-scanning</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-data-jpa</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-webadmin-data</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-jpa-common-guice</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailbox-adapter</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + </dependencies> + +</project> diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java similarity index 100% rename from server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java rename to server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAQuotaSearchModule.java b/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAQuotaSearchModule.java similarity index 100% rename from server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAQuotaSearchModule.java rename to server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAQuotaSearchModule.java diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JpaQuotaModule.java b/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JpaQuotaModule.java similarity index 100% rename from server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JpaQuotaModule.java rename to server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JpaQuotaModule.java diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java b/server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java similarity index 100% rename from server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java rename to server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 787a189..74643c0 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -48,9 +48,9 @@ <module>guice-utils</module> <module>jmx</module> <module>jpa-common-guice</module> - <module>jpa-guice</module> <module>jpa-smtp-common</module> <module>mailbox</module> + <module>mailbox-jpa</module> <module>mailbox-plugin-deleted-messages-vault-guice</module> <module>mailbox-plugin-spamassassin</module> <module>mailet</module> @@ -146,6 +146,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox-jpa</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/pom.xml b/server/pom.xml index 6931fb8..c0be2b3 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -44,6 +44,7 @@ <module>apps/cli-integration-tests</module> <module>apps/distributed-app</module> <module>apps/distributed-ldap-tests</module> + <module>apps/jpa-app</module> <module>apps/jpa-smtp-app</module> <module>apps/jpa-smtp-mariadb-app</module> <module>apps/spring-app</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
