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 78cf07a9534cdff2797878fb7c65ecfa0fc5e1aa Author: Benoit Tellier <[email protected]> AuthorDate: Fri Nov 13 17:03:25 2020 +0700 JAMES-3444 Default configuration should have a local-delivery processor --- .../destination/conf/mailetcontainer.xml | 18 +++++++++------ .../destination/conf/mailetcontainer.xml | 18 +++++++++------ .../destination/conf/mailetcontainer.xml | 18 +++++++++------ .../cassandra/destination/conf/mailetcontainer.xml | 18 +++++++++------ .../memory/destination/conf/mailetcontainer.xml | 18 +++++++++------ .../src/test/resources/mailetcontainer.xml | 26 ++++++++++++++-------- .../src/test/resources/mailetcontainer.xml | 15 ++++++++++--- .../src/test/resources/mailetcontainer.xml | 13 ++++++++--- .../src/test/resources/mailetcontainer.xml | 14 +++++++++--- .../src/test/resources/mailetcontainer.xml | 26 ++++++++++++++-------- 10 files changed, 122 insertions(+), 62 deletions(-) diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml index d66b290..663cd32 100644 --- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml @@ -68,25 +68,29 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="Sieve"/> - <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> </mailet> - <mailet match="relay-allowed" class="ToProcessor"> <processor>relay</processor> </mailet> - <mailet match="All" class="ToProcessor"> <processor>relay-denied</processor> </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="relay" enableJmx="true"> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> 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 d66b290..663cd32 100644 --- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml @@ -68,25 +68,29 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="Sieve"/> - <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> </mailet> - <mailet match="relay-allowed" class="ToProcessor"> <processor>relay</processor> </mailet> - <mailet match="All" class="ToProcessor"> <processor>relay-denied</processor> </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="relay" enableJmx="true"> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> diff --git a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml index d66b290..663cd32 100644 --- a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml @@ -68,25 +68,29 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="Sieve"/> - <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> </mailet> - <mailet match="relay-allowed" class="ToProcessor"> <processor>relay</processor> </mailet> - <mailet match="All" class="ToProcessor"> <processor>relay-denied</processor> </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="relay" enableJmx="true"> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml index d66b290..663cd32 100644 --- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml @@ -68,25 +68,29 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="Sieve"/> - <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> </mailet> - <mailet match="relay-allowed" class="ToProcessor"> <processor>relay</processor> </mailet> - <mailet match="All" class="ToProcessor"> <processor>relay-denied</processor> </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="relay" enableJmx="true"> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> diff --git a/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml index 716e625..6af0d79 100644 --- a/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml @@ -68,25 +68,29 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="Sieve"/> - <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> </mailet> - <mailet match="relay-allowed" class="ToProcessor"> <processor>relay</processor> </mailet> - <mailet match="All" class="ToProcessor"> <processor>relay-denied</processor> </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="relay" enableJmx="true"> <mailet match="All" class="RemoteDelivery"> <outgoingQueue>outgoing</outgoingQueue> 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 f22ddb7..7855291 100644 --- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml @@ -67,16 +67,9 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="SpamAssassin"> - <spamdHost>localhost</spamdHost> - <spamdPort>783</spamdPort> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> </mailet> - <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> - <targetFolderName>Spam</targetFolderName> - </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> @@ -95,6 +88,21 @@ </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="SpamAssassin"> + <spamdHost>localhost</spamdHost> + <spamdPort>783</spamdPort> + </mailet> + <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + <targetFolderName>Spam</targetFolderName> + </mailet> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="local-address-error" enableJmx="false"> <mailet match="All" class="Bounce"> <attachment>none</attachment> 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 2340ac6..5feb464 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 @@ -59,9 +59,9 @@ <name>bcc</name> </mailet> <mailet match="All" class="RecipientRewriteTable" /> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> @@ -80,6 +80,15 @@ </mailet> </processor> + + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="local-address-error" enableJmx="false"> <mailet match="All" class="Bounce"> <attachment>none</attachment> 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 d629b8a..13210ce 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 @@ -67,9 +67,9 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> @@ -88,6 +88,13 @@ </mailet> </processor> + + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="local-address-error" enableJmx="false"> <mailet match="All" class="Bounce"> <attachment>none</attachment> 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 2340ac6..93e8b54 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 @@ -59,9 +59,9 @@ <name>bcc</name> </mailet> <mailet match="All" class="RecipientRewriteTable" /> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> + </mailet> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> @@ -80,6 +80,14 @@ </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="local-address-error" enableJmx="false"> <mailet match="All" class="Bounce"> <attachment>none</attachment> 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 f14ec95..ea088d1 100644 --- a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml @@ -58,16 +58,9 @@ <mailet match="All" class="RecipientRewriteTable"> <errorProcessor>rrt-error</errorProcessor> </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> - <mailet match="RecipientIsLocal" class="SpamAssassin"> - <spamdHost>localhost</spamdHost> - <spamdPort>783</spamdPort> + <mailet match="RecipientIsLocal" class="ToProcessor"> + <processor>local-delivery</processor> </mailet> - <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> - <targetFolderName>Spam</targetFolderName> - </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> <notice>550 - Requested action not taken: no such user here</notice> @@ -98,6 +91,21 @@ </mailet> </processor> + <processor state="local-delivery" enableJmx="true"> + <mailet match="All" class="SpamAssassin"> + <spamdHost>localhost</spamdHost> + <spamdPort>783</spamdPort> + </mailet> + <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + <targetFolderName>Spam</targetFolderName> + </mailet> + <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/> + <mailet match="All" class="Sieve"/> + <mailet match="All" class="AddDeliveredToHeader"/> + <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/> + <mailet match="All" class="LocalDelivery"/> + </processor> + <processor state="spam" enableJmx="false"> <mailet match="All" class="ToRepository"> <repositoryPath>memory://var/mail/spam/</repositoryPath> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
