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 ddf5f669e044f1910a5ac3877484755b8091aecd Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jun 10 13:23:33 2021 +0700 JAMES-3596 Move server/app to server/apps/spring-app --- server/{app => apps/spring-app}/.dummy | 0 server/{app => apps/spring-app}/LICENSE | 0 server/{app => apps/spring-app}/NOTICE | 0 server/{app => apps/spring-app}/README.crypto | 0 server/{app => apps/spring-app}/pom.xml | 6 ++-- .../{app => apps/spring-app}/src/assemble/app.xml | 0 .../spring-app}/src/debian/control/control | 0 .../spring-app}/src/debian/control/copyright | 0 .../spring-app}/src/main/app/bin/setenv.bat | 0 .../spring-app}/src/main/app/bin/setenv.sh | 0 .../spring-app}/src/main/app/sieve/README.txt | 0 .../spring-app}/src/main/app/var/README.txt | 0 .../spring-app}/src/main/app/var/mail/README.txt | 0 .../spring-app}/src/main/app/var/store/README.txt | 0 .../appended-resources/supplemental-models.xml | 0 .../spring-app}/src/main/config/war/.gitignore | 0 .../james/app/spring/JamesAppSpringMain.java | 0 .../src/main/licensing/app/license-for-binary.txt | 0 .../src/main/licensing/app/licensing.xml | 0 .../src/main/licensing/app/notice-for-binary.txt | 0 .../spring-app}/src/main/licensing/war/LICENSE | 0 .../spring-app}/src/main/licensing/war/NOTICE | 0 .../src/main/licensing/war/licensing.xml | 0 .../resources/META-INF/jpa-mappings-template.xml | 0 .../resources/META-INF/persistence-template.xml | 0 .../src/main/resources/META-INF/persistence.xml | 0 .../spring-app}/src/main/resources/dnsservice.xml | 0 .../spring-app}/src/main/resources/domainlist.xml | 0 .../spring-app}/src/main/resources/fetchmail.xml | 0 .../spring-app}/src/main/resources/imapserver.xml | 0 .../spring-app}/src/main/resources/indexer.xml | 0 .../src/main/resources/james-database.properties | 0 .../src/main/resources/jetm-monitoring.xml | 0 .../spring-app}/src/main/resources/jmx.properties | 0 .../spring-app}/src/main/resources/lib/README.txt | 0 .../spring-app}/src/main/resources/lmtpserver.xml | 0 .../spring-app}/src/main/resources/log4j2.xml | 0 .../src/main/resources/mailbox-maildir.properties | 0 .../spring-app}/src/main/resources/mailbox.xml | 0 .../src/main/resources/mailetcontainer.xml | 0 .../src/main/resources/mailrepositorystore.xml | 0 .../src/main/resources/managesieveserver.xml | 0 .../spring-app}/src/main/resources/pop3server.xml | 0 .../spring-app}/src/main/resources/quota.xml | 0 .../src/main/resources/recipientrewritetable.xml | 0 .../spring-app}/src/main/resources/setenv.sh | 0 .../src/main/resources/sieverepository.xml | 0 .../spring-app}/src/main/resources/smtpserver.xml | 0 .../src/main/resources/sqlResources.xml | 0 .../src/main/resources/usersrepository.xml | 0 .../spring-app}/src/main/webapp/WEB-INF/web.xml | 0 .../{app => apps/spring-app}/src/mpt/adduser.mpt | 0 .../spring-app}/src/mpt/delivery-smtp.mpt | 0 .../spring-app}/src/mpt/imap-post-john-sieve.mpt | 0 .../spring-app}/src/mpt/imap-prep-john-sieve.mpt | 0 .../spring-app}/src/mpt/imap-sieve.mpt | 0 server/{app => apps/spring-app}/src/mpt/imap.mpt | 0 .../spring-app}/src/mpt/john.smith.sieve | 0 server/{app => apps/spring-app}/src/mpt/nntp.mpt | 0 .../spring-app}/src/mpt/pop3-after-smtp.mpt | 0 server/{app => apps/spring-app}/src/mpt/pop3.mpt | 0 .../spring-app}/src/mpt/sieve-smtp.mpt | 0 server/{app => apps/spring-app}/src/mpt/smtp.mpt | 0 .../{app => apps/spring-app}/src/mpt/vut-pop3.mpt | 0 .../{app => apps/spring-app}/src/mpt/vut-smtp.mpt | 0 .../spring-app}/src/reporting-site/site.xml | 0 .../james/app/spring/JamesAppSpringMainTest.java | 0 .../james/app/spring/JamesSpringContextTest.java | 0 .../spring-app}/src/test/resources/imapserver.xml | 0 .../src/test/resources/managesieveserver.xml | 0 .../spring-app}/src/test/resources/pop3server.xml | 0 .../spring-app}/src/test/resources/quota.xml | 0 .../spring-app}/src/test/resources/smtpserver.xml | 0 server/pom.xml | 2 +- src/site/xdoc/server/config-antispam.xml | 4 +-- src/site/xdoc/server/config-fetchmail.xml | 2 +- src/site/xdoc/server/config-mailbox.xml | 2 +- src/site/xdoc/server/config-mailetcontainer.xml | 2 +- .../xdoc/server/config-mailrepositorystore.xml | 2 +- src/site/xdoc/server/config-pop3.xml | 2 +- src/site/xdoc/server/config-quota.xml | 4 +-- .../xdoc/server/config-recipientrewritetable.xml | 2 +- src/site/xdoc/server/config-smtp-lmtp.xml | 4 +-- src/site/xdoc/server/config-system.xml | 8 ++--- src/site/xdoc/server/config-users.xml | 2 +- src/site/xdoc/server/config.xml | 38 +++++++++++----------- src/site/xdoc/server/monitor-logging.xml | 2 +- 87 files changed, 41 insertions(+), 41 deletions(-) diff --git a/server/app/.dummy b/server/apps/spring-app/.dummy similarity index 100% rename from server/app/.dummy rename to server/apps/spring-app/.dummy diff --git a/server/app/LICENSE b/server/apps/spring-app/LICENSE similarity index 100% rename from server/app/LICENSE rename to server/apps/spring-app/LICENSE diff --git a/server/app/NOTICE b/server/apps/spring-app/NOTICE similarity index 100% rename from server/app/NOTICE rename to server/apps/spring-app/NOTICE diff --git a/server/app/README.crypto b/server/apps/spring-app/README.crypto similarity index 100% rename from server/app/README.crypto rename to server/apps/spring-app/README.crypto diff --git a/server/app/pom.xml b/server/apps/spring-app/pom.xml similarity index 99% rename from server/app/pom.xml rename to server/apps/spring-app/pom.xml index 510f7b0..b181971 100644 --- a/server/app/pom.xml +++ b/server/apps/spring-app/pom.xml @@ -25,13 +25,13 @@ <groupId>org.apache.james</groupId> <artifactId>james-server</artifactId> <version>3.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>james-server-app</artifactId> + <artifactId>james-server-spring-app</artifactId> <packaging>jar</packaging> - <name>Apache James :: Server :: App</name> + <name>Apache James :: Server :: Spring :: App</name> <description>An advanced email server / Spring version</description> <properties> diff --git a/server/app/src/assemble/app.xml b/server/apps/spring-app/src/assemble/app.xml similarity index 100% rename from server/app/src/assemble/app.xml rename to server/apps/spring-app/src/assemble/app.xml diff --git a/server/app/src/debian/control/control b/server/apps/spring-app/src/debian/control/control similarity index 100% rename from server/app/src/debian/control/control rename to server/apps/spring-app/src/debian/control/control diff --git a/server/app/src/debian/control/copyright b/server/apps/spring-app/src/debian/control/copyright similarity index 100% rename from server/app/src/debian/control/copyright rename to server/apps/spring-app/src/debian/control/copyright diff --git a/server/app/src/main/app/bin/setenv.bat b/server/apps/spring-app/src/main/app/bin/setenv.bat similarity index 100% rename from server/app/src/main/app/bin/setenv.bat rename to server/apps/spring-app/src/main/app/bin/setenv.bat diff --git a/server/app/src/main/app/bin/setenv.sh b/server/apps/spring-app/src/main/app/bin/setenv.sh similarity index 100% rename from server/app/src/main/app/bin/setenv.sh rename to server/apps/spring-app/src/main/app/bin/setenv.sh diff --git a/server/app/src/main/app/sieve/README.txt b/server/apps/spring-app/src/main/app/sieve/README.txt similarity index 100% rename from server/app/src/main/app/sieve/README.txt rename to server/apps/spring-app/src/main/app/sieve/README.txt diff --git a/server/app/src/main/app/var/README.txt b/server/apps/spring-app/src/main/app/var/README.txt similarity index 100% rename from server/app/src/main/app/var/README.txt rename to server/apps/spring-app/src/main/app/var/README.txt diff --git a/server/app/src/main/app/var/mail/README.txt b/server/apps/spring-app/src/main/app/var/mail/README.txt similarity index 100% rename from server/app/src/main/app/var/mail/README.txt rename to server/apps/spring-app/src/main/app/var/mail/README.txt diff --git a/server/app/src/main/app/var/store/README.txt b/server/apps/spring-app/src/main/app/var/store/README.txt similarity index 100% rename from server/app/src/main/app/var/store/README.txt rename to server/apps/spring-app/src/main/app/var/store/README.txt diff --git a/server/app/src/main/appended-resources/supplemental-models.xml b/server/apps/spring-app/src/main/appended-resources/supplemental-models.xml similarity index 100% rename from server/app/src/main/appended-resources/supplemental-models.xml rename to server/apps/spring-app/src/main/appended-resources/supplemental-models.xml diff --git a/server/app/src/main/config/war/.gitignore b/server/apps/spring-app/src/main/config/war/.gitignore similarity index 100% rename from server/app/src/main/config/war/.gitignore rename to server/apps/spring-app/src/main/config/war/.gitignore diff --git a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java b/server/apps/spring-app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java similarity index 100% rename from server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java rename to server/apps/spring-app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java diff --git a/server/app/src/main/licensing/app/license-for-binary.txt b/server/apps/spring-app/src/main/licensing/app/license-for-binary.txt similarity index 100% rename from server/app/src/main/licensing/app/license-for-binary.txt rename to server/apps/spring-app/src/main/licensing/app/license-for-binary.txt diff --git a/server/app/src/main/licensing/app/licensing.xml b/server/apps/spring-app/src/main/licensing/app/licensing.xml similarity index 100% rename from server/app/src/main/licensing/app/licensing.xml rename to server/apps/spring-app/src/main/licensing/app/licensing.xml diff --git a/server/app/src/main/licensing/app/notice-for-binary.txt b/server/apps/spring-app/src/main/licensing/app/notice-for-binary.txt similarity index 100% rename from server/app/src/main/licensing/app/notice-for-binary.txt rename to server/apps/spring-app/src/main/licensing/app/notice-for-binary.txt diff --git a/server/app/src/main/licensing/war/LICENSE b/server/apps/spring-app/src/main/licensing/war/LICENSE similarity index 100% rename from server/app/src/main/licensing/war/LICENSE rename to server/apps/spring-app/src/main/licensing/war/LICENSE diff --git a/server/app/src/main/licensing/war/NOTICE b/server/apps/spring-app/src/main/licensing/war/NOTICE similarity index 100% rename from server/app/src/main/licensing/war/NOTICE rename to server/apps/spring-app/src/main/licensing/war/NOTICE diff --git a/server/app/src/main/licensing/war/licensing.xml b/server/apps/spring-app/src/main/licensing/war/licensing.xml similarity index 100% rename from server/app/src/main/licensing/war/licensing.xml rename to server/apps/spring-app/src/main/licensing/war/licensing.xml diff --git a/server/app/src/main/resources/META-INF/jpa-mappings-template.xml b/server/apps/spring-app/src/main/resources/META-INF/jpa-mappings-template.xml similarity index 100% rename from server/app/src/main/resources/META-INF/jpa-mappings-template.xml rename to server/apps/spring-app/src/main/resources/META-INF/jpa-mappings-template.xml diff --git a/server/app/src/main/resources/META-INF/persistence-template.xml b/server/apps/spring-app/src/main/resources/META-INF/persistence-template.xml similarity index 100% rename from server/app/src/main/resources/META-INF/persistence-template.xml rename to server/apps/spring-app/src/main/resources/META-INF/persistence-template.xml diff --git a/server/app/src/main/resources/META-INF/persistence.xml b/server/apps/spring-app/src/main/resources/META-INF/persistence.xml similarity index 100% rename from server/app/src/main/resources/META-INF/persistence.xml rename to server/apps/spring-app/src/main/resources/META-INF/persistence.xml diff --git a/server/app/src/main/resources/dnsservice.xml b/server/apps/spring-app/src/main/resources/dnsservice.xml similarity index 100% rename from server/app/src/main/resources/dnsservice.xml rename to server/apps/spring-app/src/main/resources/dnsservice.xml diff --git a/server/app/src/main/resources/domainlist.xml b/server/apps/spring-app/src/main/resources/domainlist.xml similarity index 100% rename from server/app/src/main/resources/domainlist.xml rename to server/apps/spring-app/src/main/resources/domainlist.xml diff --git a/server/app/src/main/resources/fetchmail.xml b/server/apps/spring-app/src/main/resources/fetchmail.xml similarity index 100% rename from server/app/src/main/resources/fetchmail.xml rename to server/apps/spring-app/src/main/resources/fetchmail.xml diff --git a/server/app/src/main/resources/imapserver.xml b/server/apps/spring-app/src/main/resources/imapserver.xml similarity index 100% rename from server/app/src/main/resources/imapserver.xml rename to server/apps/spring-app/src/main/resources/imapserver.xml diff --git a/server/app/src/main/resources/indexer.xml b/server/apps/spring-app/src/main/resources/indexer.xml similarity index 100% rename from server/app/src/main/resources/indexer.xml rename to server/apps/spring-app/src/main/resources/indexer.xml diff --git a/server/app/src/main/resources/james-database.properties b/server/apps/spring-app/src/main/resources/james-database.properties similarity index 100% rename from server/app/src/main/resources/james-database.properties rename to server/apps/spring-app/src/main/resources/james-database.properties diff --git a/server/app/src/main/resources/jetm-monitoring.xml b/server/apps/spring-app/src/main/resources/jetm-monitoring.xml similarity index 100% rename from server/app/src/main/resources/jetm-monitoring.xml rename to server/apps/spring-app/src/main/resources/jetm-monitoring.xml diff --git a/server/app/src/main/resources/jmx.properties b/server/apps/spring-app/src/main/resources/jmx.properties similarity index 100% rename from server/app/src/main/resources/jmx.properties rename to server/apps/spring-app/src/main/resources/jmx.properties diff --git a/server/app/src/main/resources/lib/README.txt b/server/apps/spring-app/src/main/resources/lib/README.txt similarity index 100% rename from server/app/src/main/resources/lib/README.txt rename to server/apps/spring-app/src/main/resources/lib/README.txt diff --git a/server/app/src/main/resources/lmtpserver.xml b/server/apps/spring-app/src/main/resources/lmtpserver.xml similarity index 100% rename from server/app/src/main/resources/lmtpserver.xml rename to server/apps/spring-app/src/main/resources/lmtpserver.xml diff --git a/server/app/src/main/resources/log4j2.xml b/server/apps/spring-app/src/main/resources/log4j2.xml similarity index 100% rename from server/app/src/main/resources/log4j2.xml rename to server/apps/spring-app/src/main/resources/log4j2.xml diff --git a/server/app/src/main/resources/mailbox-maildir.properties b/server/apps/spring-app/src/main/resources/mailbox-maildir.properties similarity index 100% rename from server/app/src/main/resources/mailbox-maildir.properties rename to server/apps/spring-app/src/main/resources/mailbox-maildir.properties diff --git a/server/app/src/main/resources/mailbox.xml b/server/apps/spring-app/src/main/resources/mailbox.xml similarity index 100% rename from server/app/src/main/resources/mailbox.xml rename to server/apps/spring-app/src/main/resources/mailbox.xml diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/apps/spring-app/src/main/resources/mailetcontainer.xml similarity index 100% rename from server/app/src/main/resources/mailetcontainer.xml rename to server/apps/spring-app/src/main/resources/mailetcontainer.xml diff --git a/server/app/src/main/resources/mailrepositorystore.xml b/server/apps/spring-app/src/main/resources/mailrepositorystore.xml similarity index 100% rename from server/app/src/main/resources/mailrepositorystore.xml rename to server/apps/spring-app/src/main/resources/mailrepositorystore.xml diff --git a/server/app/src/main/resources/managesieveserver.xml b/server/apps/spring-app/src/main/resources/managesieveserver.xml similarity index 100% rename from server/app/src/main/resources/managesieveserver.xml rename to server/apps/spring-app/src/main/resources/managesieveserver.xml diff --git a/server/app/src/main/resources/pop3server.xml b/server/apps/spring-app/src/main/resources/pop3server.xml similarity index 100% rename from server/app/src/main/resources/pop3server.xml rename to server/apps/spring-app/src/main/resources/pop3server.xml diff --git a/server/app/src/main/resources/quota.xml b/server/apps/spring-app/src/main/resources/quota.xml similarity index 100% rename from server/app/src/main/resources/quota.xml rename to server/apps/spring-app/src/main/resources/quota.xml diff --git a/server/app/src/main/resources/recipientrewritetable.xml b/server/apps/spring-app/src/main/resources/recipientrewritetable.xml similarity index 100% rename from server/app/src/main/resources/recipientrewritetable.xml rename to server/apps/spring-app/src/main/resources/recipientrewritetable.xml diff --git a/server/app/src/main/resources/setenv.sh b/server/apps/spring-app/src/main/resources/setenv.sh similarity index 100% rename from server/app/src/main/resources/setenv.sh rename to server/apps/spring-app/src/main/resources/setenv.sh diff --git a/server/app/src/main/resources/sieverepository.xml b/server/apps/spring-app/src/main/resources/sieverepository.xml similarity index 100% rename from server/app/src/main/resources/sieverepository.xml rename to server/apps/spring-app/src/main/resources/sieverepository.xml diff --git a/server/app/src/main/resources/smtpserver.xml b/server/apps/spring-app/src/main/resources/smtpserver.xml similarity index 100% rename from server/app/src/main/resources/smtpserver.xml rename to server/apps/spring-app/src/main/resources/smtpserver.xml diff --git a/server/app/src/main/resources/sqlResources.xml b/server/apps/spring-app/src/main/resources/sqlResources.xml similarity index 100% rename from server/app/src/main/resources/sqlResources.xml rename to server/apps/spring-app/src/main/resources/sqlResources.xml diff --git a/server/app/src/main/resources/usersrepository.xml b/server/apps/spring-app/src/main/resources/usersrepository.xml similarity index 100% rename from server/app/src/main/resources/usersrepository.xml rename to server/apps/spring-app/src/main/resources/usersrepository.xml diff --git a/server/app/src/main/webapp/WEB-INF/web.xml b/server/apps/spring-app/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from server/app/src/main/webapp/WEB-INF/web.xml rename to server/apps/spring-app/src/main/webapp/WEB-INF/web.xml diff --git a/server/app/src/mpt/adduser.mpt b/server/apps/spring-app/src/mpt/adduser.mpt similarity index 100% rename from server/app/src/mpt/adduser.mpt rename to server/apps/spring-app/src/mpt/adduser.mpt diff --git a/server/app/src/mpt/delivery-smtp.mpt b/server/apps/spring-app/src/mpt/delivery-smtp.mpt similarity index 100% rename from server/app/src/mpt/delivery-smtp.mpt rename to server/apps/spring-app/src/mpt/delivery-smtp.mpt diff --git a/server/app/src/mpt/imap-post-john-sieve.mpt b/server/apps/spring-app/src/mpt/imap-post-john-sieve.mpt similarity index 100% rename from server/app/src/mpt/imap-post-john-sieve.mpt rename to server/apps/spring-app/src/mpt/imap-post-john-sieve.mpt diff --git a/server/app/src/mpt/imap-prep-john-sieve.mpt b/server/apps/spring-app/src/mpt/imap-prep-john-sieve.mpt similarity index 100% rename from server/app/src/mpt/imap-prep-john-sieve.mpt rename to server/apps/spring-app/src/mpt/imap-prep-john-sieve.mpt diff --git a/server/app/src/mpt/imap-sieve.mpt b/server/apps/spring-app/src/mpt/imap-sieve.mpt similarity index 100% rename from server/app/src/mpt/imap-sieve.mpt rename to server/apps/spring-app/src/mpt/imap-sieve.mpt diff --git a/server/app/src/mpt/imap.mpt b/server/apps/spring-app/src/mpt/imap.mpt similarity index 100% rename from server/app/src/mpt/imap.mpt rename to server/apps/spring-app/src/mpt/imap.mpt diff --git a/server/app/src/mpt/john.smith.sieve b/server/apps/spring-app/src/mpt/john.smith.sieve similarity index 100% rename from server/app/src/mpt/john.smith.sieve rename to server/apps/spring-app/src/mpt/john.smith.sieve diff --git a/server/app/src/mpt/nntp.mpt b/server/apps/spring-app/src/mpt/nntp.mpt similarity index 100% rename from server/app/src/mpt/nntp.mpt rename to server/apps/spring-app/src/mpt/nntp.mpt diff --git a/server/app/src/mpt/pop3-after-smtp.mpt b/server/apps/spring-app/src/mpt/pop3-after-smtp.mpt similarity index 100% rename from server/app/src/mpt/pop3-after-smtp.mpt rename to server/apps/spring-app/src/mpt/pop3-after-smtp.mpt diff --git a/server/app/src/mpt/pop3.mpt b/server/apps/spring-app/src/mpt/pop3.mpt similarity index 100% rename from server/app/src/mpt/pop3.mpt rename to server/apps/spring-app/src/mpt/pop3.mpt diff --git a/server/app/src/mpt/sieve-smtp.mpt b/server/apps/spring-app/src/mpt/sieve-smtp.mpt similarity index 100% rename from server/app/src/mpt/sieve-smtp.mpt rename to server/apps/spring-app/src/mpt/sieve-smtp.mpt diff --git a/server/app/src/mpt/smtp.mpt b/server/apps/spring-app/src/mpt/smtp.mpt similarity index 100% rename from server/app/src/mpt/smtp.mpt rename to server/apps/spring-app/src/mpt/smtp.mpt diff --git a/server/app/src/mpt/vut-pop3.mpt b/server/apps/spring-app/src/mpt/vut-pop3.mpt similarity index 100% rename from server/app/src/mpt/vut-pop3.mpt rename to server/apps/spring-app/src/mpt/vut-pop3.mpt diff --git a/server/app/src/mpt/vut-smtp.mpt b/server/apps/spring-app/src/mpt/vut-smtp.mpt similarity index 100% rename from server/app/src/mpt/vut-smtp.mpt rename to server/apps/spring-app/src/mpt/vut-smtp.mpt diff --git a/server/app/src/reporting-site/site.xml b/server/apps/spring-app/src/reporting-site/site.xml similarity index 100% rename from server/app/src/reporting-site/site.xml rename to server/apps/spring-app/src/reporting-site/site.xml diff --git a/server/app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java b/server/apps/spring-app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java similarity index 100% rename from server/app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java rename to server/apps/spring-app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java diff --git a/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java b/server/apps/spring-app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java similarity index 100% rename from server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java rename to server/apps/spring-app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java diff --git a/server/app/src/test/resources/imapserver.xml b/server/apps/spring-app/src/test/resources/imapserver.xml similarity index 100% rename from server/app/src/test/resources/imapserver.xml rename to server/apps/spring-app/src/test/resources/imapserver.xml diff --git a/server/app/src/test/resources/managesieveserver.xml b/server/apps/spring-app/src/test/resources/managesieveserver.xml similarity index 100% rename from server/app/src/test/resources/managesieveserver.xml rename to server/apps/spring-app/src/test/resources/managesieveserver.xml diff --git a/server/app/src/test/resources/pop3server.xml b/server/apps/spring-app/src/test/resources/pop3server.xml similarity index 100% rename from server/app/src/test/resources/pop3server.xml rename to server/apps/spring-app/src/test/resources/pop3server.xml diff --git a/server/app/src/test/resources/quota.xml b/server/apps/spring-app/src/test/resources/quota.xml similarity index 100% rename from server/app/src/test/resources/quota.xml rename to server/apps/spring-app/src/test/resources/quota.xml diff --git a/server/app/src/test/resources/smtpserver.xml b/server/apps/spring-app/src/test/resources/smtpserver.xml similarity index 100% rename from server/app/src/test/resources/smtpserver.xml rename to server/apps/spring-app/src/test/resources/smtpserver.xml diff --git a/server/pom.xml b/server/pom.xml index 54d62e5..5b5bb31 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -38,9 +38,9 @@ <inceptionYear>2002</inceptionYear> <modules> - <module>app</module> <module>apps/cassandra-app</module> <module>apps/cassandra-app-ldap-tests</module> + <module>apps/spring-app</module> <module>blob</module> diff --git a/src/site/xdoc/server/config-antispam.xml b/src/site/xdoc/server/config-antispam.xml index c1682cb..debfb50 100644 --- a/src/site/xdoc/server/config-antispam.xml +++ b/src/site/xdoc/server/config-antispam.xml @@ -30,8 +30,8 @@ <p>Apache James Server Anti-Spam system can be configured via two main different mechanisms:</p> <ul> - <li>SMTP Hooks; see <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>examples</a>.</li> - <li>Mailets; see <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer.xml";>examples</a>.</li> + <li>SMTP Hooks; see <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/smtpserver.xml";>examples</a>.</li> + <li>Mailets; see <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailetcontainer.xml";>examples</a>.</li> </ul> <subsection name="AntiSpam SMTP Hooks"> diff --git a/src/site/xdoc/server/config-fetchmail.xml b/src/site/xdoc/server/config-fetchmail.xml index 6feb0b2..ad4b796 100755 --- a/src/site/xdoc/server/config-fetchmail.xml +++ b/src/site/xdoc/server/config-fetchmail.xml @@ -29,7 +29,7 @@ This configuration file requires Spring wiring. - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/fetchmail.xml";>fetchmail.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/fetchmail.xml";>fetchmail.xml</a> in GIT to get some examples and hints.</p> <p>Fetchmail acts as a gateway between an external message store such as an IMAP or POP3 server and James. Mail is fetched from the external message store and diff --git a/src/site/xdoc/server/config-mailbox.xml b/src/site/xdoc/server/config-mailbox.xml index 9c68bea..badd9ad 100644 --- a/src/site/xdoc/server/config-mailbox.xml +++ b/src/site/xdoc/server/config-mailbox.xml @@ -29,7 +29,7 @@ This configuration applies only to Spring wiring. - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailbox.xml";>mailbox.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailbox.xml";>mailbox.xml</a> in GIT to get some examples and hints.</p> <p>Use this configuration to define the type of mailbox storage used to persist the user's mails.</p> diff --git a/src/site/xdoc/server/config-mailetcontainer.xml b/src/site/xdoc/server/config-mailetcontainer.xml index c475f9a..cfad072 100644 --- a/src/site/xdoc/server/config-mailetcontainer.xml +++ b/src/site/xdoc/server/config-mailetcontainer.xml @@ -36,7 +36,7 @@ Futhermore, you can write and use with James your own <a href="dev-extend-matcher.html">custom matchers</a> and <a href="dev-extend-mailet.html">custom mailets</a>.</p> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer.xml";>mailetcontainer.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailetcontainer.xml";>mailetcontainer.xml</a> in GIT to get some examples and hints.</p> <dl> <dt><strong>context.postmaster</strong></dt> diff --git a/src/site/xdoc/server/config-mailrepositorystore.xml b/src/site/xdoc/server/config-mailrepositorystore.xml index f46e7be..15ccc53 100644 --- a/src/site/xdoc/server/config-mailrepositorystore.xml +++ b/src/site/xdoc/server/config-mailrepositorystore.xml @@ -31,7 +31,7 @@ <p>Read <a href="feature-persistence.html">documentation about persistence</a> for a description of the Mail Repository Store functionality.</p> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailrepositorystore.xml";>mailrepositorystore.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailrepositorystore.xml";>mailrepositorystore.xml</a> in GIT to get some examples and hints.</p> <p>Mail Repository Stores are distinguished by where they store data. There are several types of storage: File, Database, Cassandra, DBFile, and MBox.</p> diff --git a/src/site/xdoc/server/config-pop3.xml b/src/site/xdoc/server/config-pop3.xml index 137aff6..cf0ef13 100644 --- a/src/site/xdoc/server/config-pop3.xml +++ b/src/site/xdoc/server/config-pop3.xml @@ -27,7 +27,7 @@ <section name="POP3 Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/pop3server.xml";>pop3server.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/pop3server.xml";>pop3server.xml</a> in GIT to get some examples and hints.</p> <p>The POP3 service is controlled by a configuration block in the pop3server.xml. The pop3server tag defines the boundaries of the configuration block. It encloses diff --git a/src/site/xdoc/server/config-quota.xml b/src/site/xdoc/server/config-quota.xml index f13d3a2..c7729da 100644 --- a/src/site/xdoc/server/config-quota.xml +++ b/src/site/xdoc/server/config-quota.xml @@ -29,7 +29,7 @@ This configuration applies only to Spring wiring. - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota.xml";>quota.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/quota.xml";>quota.xml</a> in GIT to get some examples and hints.</p> <p>Use this configuration to define the type of quota storage used to persist the quotas.</p> @@ -65,7 +65,7 @@ </p> <p> - To choose the implementation you want for the given components you want simply have a look to the <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota.xml";>quota.xml</a> file. + To choose the implementation you want for the given components you want simply have a look to the <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/quota.xml";>quota.xml</a> file. </p> <p> diff --git a/src/site/xdoc/server/config-recipientrewritetable.xml b/src/site/xdoc/server/config-recipientrewritetable.xml index 829adfc..61680ca 100644 --- a/src/site/xdoc/server/config-recipientrewritetable.xml +++ b/src/site/xdoc/server/config-recipientrewritetable.xml @@ -27,7 +27,7 @@ <section name="Recipient Rewrite Table Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/recipientrewritetable.xml";>recipientrewritetable.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/recipientrewritetable.xml";>recipientrewritetable.xml</a> in GIT to get some examples and hints.</p> <subsection name="Mapping types"> <ul>James allow using various mapping types for better expressing the intent of your address rewritting logic: diff --git a/src/site/xdoc/server/config-smtp-lmtp.xml b/src/site/xdoc/server/config-smtp-lmtp.xml index ca8d806..5b7f1d2 100644 --- a/src/site/xdoc/server/config-smtp-lmtp.xml +++ b/src/site/xdoc/server/config-smtp-lmtp.xml @@ -37,7 +37,7 @@ <section name="SMTP Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>smtpserver.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/smtpserver.xml";>smtpserver.xml</a> in GIT to get some examples and hints.</p> <p>The SMTP service is controlled by a configuration block in the smptserver.xml. The smtpserver tag defines the boundaries of the configuration block. It encloses @@ -199,7 +199,7 @@ Correct this. <section name="LMTP Configuration"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a> in GIT to get some examples and hints.</p> <p>The configuration is the same of for SMTP.</p> diff --git a/src/site/xdoc/server/config-system.xml b/src/site/xdoc/server/config-system.xml index 038eb1e..4c73662 100644 --- a/src/site/xdoc/server/config-system.xml +++ b/src/site/xdoc/server/config-system.xml @@ -56,7 +56,7 @@ <p>This configuration file is only relevant when using JPA, with Spring or Guice.</p> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/james-database.properties";>james.properties</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/james-database.properties";>james.properties</a> in GIT to get some examples and hints.</p> <p>The database connection in database.properties</p> @@ -99,7 +99,7 @@ <subsection name="META-INF/persistence.xml"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a> in GIT to get some examples and hints.</p> <p>The JPA mapping and properties are defined in the in META-INF/persistence.xml.</p> @@ -112,7 +112,7 @@ <subsection name="jmx.properties"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jmx.properties";>jmx.properties</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/jmx.properties";>jmx.properties</a> in GIT to get some examples and hints.</p> <p>This is used to configure the JMX MBean server via which all management is achieved (also used by via the james-cli).</p> @@ -132,7 +132,7 @@ <subsection name="sqlResources.xml"> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/sqlResources.xml";>sqlResources.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/sqlResources.xml";>sqlResources.xml</a> in GIT to get some examples and hints.</p> <p>This file is deprecated but some mailets... still need it. The standard way to access database is JPA, but some functionalities are not yet migrated and still need the sqlResources.xml resources.</p> diff --git a/src/site/xdoc/server/config-users.xml b/src/site/xdoc/server/config-users.xml index 5829c23..5952861 100644 --- a/src/site/xdoc/server/config-users.xml +++ b/src/site/xdoc/server/config-users.xml @@ -31,7 +31,7 @@ <p>User repositories are required to store James user information and authentication data</p> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/usersrepository.xml";>usersrepository.xml</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/usersrepository.xml";>usersrepository.xml</a> in GIT to get some examples and hints.</p> <p> A user has two attributes: username and password. A valid user should satisfy these criteria: diff --git a/src/site/xdoc/server/config.xml b/src/site/xdoc/server/config.xml index 28aec46..c522eb4 100644 --- a/src/site/xdoc/server/config.xml +++ b/src/site/xdoc/server/config.xml @@ -54,27 +54,27 @@ </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice.xml";>dnsservice.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/dnsservice.xml";>dnsservice.xml</a></td> <td><a href="config-dnsservice.html">DNS Service Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist.xml";>domainlist.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/domainlist.xml";>domainlist.xml</a></td> <td><a href="config-domainlist.html">Domain List Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events.xml";>events.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/events.xml";>events.xml</a></td> <td><a href="config-events.html">Event system Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/fetchmail.xml";>fetchmail.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/fetchmail.xml";>fetchmail.xml</a></td> <td><a href="config-fetchmail.html">FetchMail Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/imapserver.xml";>imapserver.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/imapserver.xml";>imapserver.xml</a></td> <td><a href="config-imap4.html">IMAP4 Configuration</a></td> <td></td> </tr> @@ -84,47 +84,47 @@ <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/lmtpserver.xml";>lmtpserver.xml</a></td> <td><a href="config-smtp-lmtp.html">LMTP Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailrepositorystore.xml";>mailrepositorystore.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailrepositorystore.xml";>mailrepositorystore.xml</a></td> <td><a href="config-mailrepositorystore.html">Mail Repository Stores Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailbox.xml";>mailbox.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailbox.xml";>mailbox.xml</a></td> <td><a href="config-mailbox.html">Mailbox Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer.xml";>mailetcontainer.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/mailetcontainer.xml";>mailetcontainer.xml</a></td> <td><a href="config-mailetcontainer.html">Mailet Container Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/pop3server.xml";>pop3server.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/pop3server.xml";>pop3server.xml</a></td> <td><a href="config-pop3.html">POP3 Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/quota.xml";>mailbox.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/quota.xml";>mailbox.xml</a></td> <td><a href="config-quota.html">Quota Configuration (Spring only)</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/recipientrewritetable.xml";>recipientrewritetable.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/recipientrewritetable.xml";>recipientrewritetable.xml</a></td> <td><a href="config-recipientrewritetable.html">Recipient Rewrite Table Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/smtpserver.xml";>smtpserver.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/smtpserver.xml";>smtpserver.xml</a></td> <td><a href="config-smtp-lmtp.html">SMTP Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/usersrepository.xml";>usersrepository.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/usersrepository.xml";>usersrepository.xml</a></td> <td><a href="config-users.html">Users Configuration</a></td> <td></td> </tr> @@ -152,29 +152,29 @@ <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/james-database.properties";>james-database.properties</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/james-database.properties";>james-database.properties</a></td> <td><a href="config-system.html">System Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/META-INF/persistence.xml";>META-INF/persistence.xml</a></td> <td><a href="config-system.html">System Configuration</a></td> <td></td> </tr> <tr> <td> - <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/jmx.properties";>jmx.properties</a><br/> + <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/jmx.properties";>jmx.properties</a><br/> </td> <td><a href="config-system.html">System Configuration</a></td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/log4j.properties";>log4j.properties</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/log4j.properties";>log4j.properties</a></td> <td>See <a href="monitor-logging.html">monitoring with log4j</a> section.</td> <td></td> </tr> <tr> - <td><a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/sqlResources.xml";>sqlResources.xml</a></td> + <td><a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/sqlResources.xml";>sqlResources.xml</a></td> <td><a href="config-system.html">System Configuration</a></td> <td>Deprecated</td> </tr> diff --git a/src/site/xdoc/server/monitor-logging.xml b/src/site/xdoc/server/monitor-logging.xml index 3544965..ac72706 100644 --- a/src/site/xdoc/server/monitor-logging.xml +++ b/src/site/xdoc/server/monitor-logging.xml @@ -87,7 +87,7 @@ drwxrwxrwx. 7 root root 4096 2010-11-06 09:01 ../ -rw-r--r--. 1 root root 71 2010-11-06 09:24 usersrepository.log </source> - <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/log4j.properties";>log4j.properties</a> in GIT to get some examples and hints.</p> + <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/apps/spring-app/src/main/resources/log4j.properties";>log4j.properties</a> in GIT to get some examples and hints.</p> <p>You can rise the logging level on protocols.</p> <p>Set log4j.logger.james.smtpserver=DEBUG, SMTPSERVER</p> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
