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 0ba8f1ef561c77ba0f62be693636ae4461dc659a Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jun 19 13:36:04 2020 +0700 JAMES-3255 Postmaster example values should be valid --- .../run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml | 4 +++- .../cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml | 4 +++- .../run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml | 4 +++- dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml | 4 +++- dockerfiles/run/guice/jpa-smtp/destination/conf/mailetcontainer.xml | 4 +++- dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml | 4 +++- dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml | 4 +++- dockerfiles/run/spring/destination/conf/mailetcontainer.xml | 4 +++- examples/custom-mailets/src/main/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml | 2 +- server/app/src/main/resources/mailetcontainer.xml | 4 +++- .../container/cli-integration/src/test/resources/mailetcontainer.xml | 2 +- .../guice/cassandra-guice/src/test/resources/mailetcontainer.xml | 2 +- .../guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml | 2 +- .../cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../container/guice/jpa-guice/src/test/resources/mailetcontainer.xml | 2 +- .../guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml | 2 +- .../container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml | 4 +++- .../container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml | 2 +- .../guice/memory-guice/sample-configuration/mailetcontainer.xml | 4 +++- .../guice/memory-guice/src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- .../src/test/resources/mailetcontainer.xml | 2 +- src/homepage/howTo/mail-processing.html | 2 +- 31 files changed, 53 insertions(+), 31 deletions(-) diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml index 017d7c2..38a5ede 100644 --- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml index 1e621ba..d66b290 100644 --- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml index 1e621ba..d66b290 100644 --- a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml index 1e621ba..d66b290 100644 --- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/guice/jpa-smtp/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa-smtp/destination/conf/mailetcontainer.xml index e0ee151..c7120f5 100644 --- a/dockerfiles/run/guice/jpa-smtp/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/jpa-smtp/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml index 45f75ce..bab9e37 100644 --- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml index af849fd..716e625 100644 --- a/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml @@ -24,7 +24,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml index 49237c8..4e07ba2 100644 --- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml @@ -22,7 +22,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/examples/custom-mailets/src/main/resources/mailetcontainer.xml b/examples/custom-mailets/src/main/resources/mailetcontainer.xml index d75ba9e..125b775 100644 --- a/examples/custom-mailets/src/main/resources/mailetcontainer.xml +++ b/examples/custom-mailets/src/main/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster@localhost</postmaster> </context> <spooler> diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/mailetcontainer.xml index 34d5c8b..7c58ed0 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/mailetcontainer.xml +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>postmaster@localhost</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml index 34d5c8b..7c58ed0 100644 --- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml +++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>postmaster@localhost</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/app/src/main/resources/mailetcontainer.xml index e443e33..91dd386 100644 --- a/server/app/src/main/resources/mailetcontainer.xml +++ b/server/app/src/main/resources/mailetcontainer.xml @@ -31,7 +31,9 @@ <!-- MailAddress used for PostMaster --> <context> - <postmaster>postmaster@localhost</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster</postmaster> </context> <!-- Number of spool threads --> diff --git a/server/container/cli-integration/src/test/resources/mailetcontainer.xml b/server/container/cli-integration/src/test/resources/mailetcontainer.xml index 5322187..66307b0 100644 --- a/server/container/cli-integration/src/test/resources/mailetcontainer.xml +++ b/server/container/cli-integration/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml index 4549bd2..f22ddb7 100644 --- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml index c2f0cc0..2340ac6 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml index 0f6b8dd..d629b8a 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml index c2f0cc0..2340ac6 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml index e03f3e5..0d6d961 100644 --- a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml index dedb391..5edda70 100644 --- a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>postmaster@localhost</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml index 0317de4..0c05525 100644 --- a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml @@ -22,7 +22,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster@localhost</postmaster> </context> <spooler> diff --git a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml index dedb391..5edda70 100644 --- a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>postmaster@localhost</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml index 9ed6c89..9d81841 100644 --- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml +++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml @@ -22,7 +22,9 @@ <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended. + You can configure it to (for example) <postmaster>[email protected]</postmaster> --> + <postmaster>postmaster@localhost</postmaster> </context> <spooler> diff --git a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml index 7d68583..f14ec95 100644 --- a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml index f63f535..e6afe68 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml index 849d564..47a6b82 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml index f63f535..e6afe68 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml index f63f535..e6afe68 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml index 849d564..47a6b82 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/mailetcontainer.xml index f8b5bfd..59b9b1e 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/mailetcontainer.xml +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/mailetcontainer.xml index 9c5c25d..e52366e 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/mailetcontainer.xml +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/mailetcontainer.xml @@ -22,7 +22,7 @@ <mailetcontainer enableJmx="false"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster</postmaster> </context> <spooler> diff --git a/src/homepage/howTo/mail-processing.html b/src/homepage/howTo/mail-processing.html index ec41f2e..e1b82a3 100644 --- a/src/homepage/howTo/mail-processing.html +++ b/src/homepage/howTo/mail-processing.html @@ -173,7 +173,7 @@ public void init() throws MessagingException { <mailetcontainer enableJmx="true"> <context> - <postmaster>[email protected]</postmaster> + <postmaster>postmaster@localhost</postmaster> </context> <spooler> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
