JAMES-2529 Configure JMAP filtering mailet by default
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/808c8fa3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/808c8fa3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/808c8fa3 Branch: refs/heads/master Commit: 808c8fa3cf44810481ba7be2f656ece9c50082a3 Parents: 7164031 Author: Benoit Tellier <[email protected]> Authored: Wed Aug 29 12:35:34 2018 +0700 Committer: Antoine Duprat <[email protected]> Committed: Thu Aug 30 15:11:55 2018 +0200 ---------------------------------------------------------------------- .../cassandra/package/etc/james/templates/mailetcontainer.xml | 1 + .../run/guice/cassandra/destination/conf/mailetcontainer.xml | 1 + .../guice/cassandra-guice/src/test/resources/mailetcontainer.xml | 1 + .../cassandra-ldap-guice/src/test/resources/mailetcontainer.xml | 1 + .../org/apache/james/mailets/configuration/CommonProcessors.java | 4 ++++ .../apache/james/transport/mailets/GroupMappingRelayTest.java | 4 ++++ .../org/apache/james/transport/mailets/GroupMappingTest.java | 4 ++++ .../src/test/resources/mailetcontainer.xml | 1 + 8 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml index 681b966..e8200f4 100644 --- a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml +++ b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/mailetcontainer.xml @@ -64,6 +64,7 @@ <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="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml index 3839b39..04d0459 100644 --- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml +++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml @@ -66,6 +66,7 @@ <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="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- 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 2365c7c..412e6e9 100644 --- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml @@ -74,6 +74,7 @@ <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> http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- 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 4a7d1e8..69d03e2 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,6 +59,7 @@ </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="HostIsLocal" class="ToProcessor"> <processor>local-address-error</processor> http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java index 936124f..503b940 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java @@ -21,6 +21,7 @@ package org.apache.james.mailets.configuration; import org.apache.james.jmap.mailet.VacationMailet; +import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.transport.mailets.AddDeliveredToHeader; import org.apache.james.transport.mailets.Bounce; @@ -95,6 +96,9 @@ public class CommonProcessors { .mailet(VacationMailet.class)) .addMailet(MailetConfiguration.builder() .matcher(RecipientIsLocal.class) + .mailet(JMAPFiltering.class)) + .addMailet(MailetConfiguration.builder() + .matcher(RecipientIsLocal.class) .mailet(Sieve.class)) .addMailet(MailetConfiguration.builder() .matcher(RecipientIsLocal.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java index 4ba8505..a4de0bb 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java @@ -30,6 +30,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.jmap.mailet.VacationMailet; +import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; @@ -100,6 +101,9 @@ public class GroupMappingRelayTest { .addMailet(MailetConfiguration.builder() .matcher(RecipientIsLocal.class) .mailet(VacationMailet.class)) + .addMailet(MailetConfiguration.builder() + .matcher(RecipientIsLocal.class) + .mailet(JMAPFiltering.class)) .addMailetsFrom(CommonProcessors.deliverOnlyTransport()) .addMailet(MailetConfiguration.remoteDeliveryBuilder() .matcher(All.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index 7b9dc10..a2ff045 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -30,6 +30,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.jmap.mailet.VacationMailet; +import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; @@ -98,6 +99,9 @@ public class GroupMappingTest { .addMailet(MailetConfiguration.builder() .matcher(RecipientIsLocal.class) .mailet(VacationMailet.class)) + .addMailet(MailetConfiguration.builder() + .matcher(RecipientIsLocal.class) + .mailet(JMAPFiltering.class)) .addMailetsFrom(CommonProcessors.deliverOnlyTransport())) .putProcessor(ProcessorConfiguration.builder() .state(RRT_ERROR) http://git-wip-us.apache.org/repos/asf/james-project/blob/808c8fa3/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml index f24fd9c..f9d4127 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml @@ -60,6 +60,7 @@ <mailet match="All" class="RecipientRewriteTable" /> <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/> <mailet match="RecipientIsLocal" class="Sieve"/> + <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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
