JAMES-2340 Rely on WithStorageDirective for Spam pipeline
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d335c7bf Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d335c7bf Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d335c7bf Branch: refs/heads/master Commit: d335c7bff269419c51edea802f8ba328bbb698c3 Parents: c8431b7 Author: benwa <btell...@linagora.com> Authored: Wed Mar 21 16:25:02 2018 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Mar 27 15:17:38 2018 +0700 ---------------------------------------------------------------------- .../cassandra-guice/src/test/resources/mailetcontainer.xml | 5 ++--- .../guice/memory-guice/src/test/resources/mailetcontainer.xml | 5 ++--- .../org/apache/james/transport/matchers/IsMarkedAsSpam.java | 5 ++--- .../src/test/resources/mailetcontainer.xml | 5 ++--- .../src/test/resources/mailetcontainer.xml | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d335c7bf/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 263738b..37cac19 100644 --- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml @@ -63,9 +63,8 @@ <spamdHost>localhost</spamdHost> <spamdPort>783</spamdPort> </mailet> - <mailet match="IsMarkedAsSpam" class="ToRecipientFolder"> - <folder>Spam</folder> - <consume>true</consume> + <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + <targetFolderName>Spam</targetFolderName> </mailet> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> http://git-wip-us.apache.org/repos/asf/james-project/blob/d335c7bf/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- 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 71de139..bcfae5f 100644 --- a/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml +++ b/server/container/guice/memory-guice/src/test/resources/mailetcontainer.xml @@ -60,9 +60,8 @@ <spamdHost>localhost</spamdHost> <spamdPort>783</spamdPort> </mailet> - <mailet match="IsMarkedAsSpam" class="ToRecipientFolder"> - <folder>Spam</folder> - <consume>true</consume> + <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + <targetFolderName>Spam</targetFolderName> </mailet> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> http://git-wip-us.apache.org/repos/asf/james-project/blob/d335c7bf/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java index bbea0c9..596d2b7 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsMarkedAsSpam.java @@ -43,9 +43,8 @@ import com.github.steveash.guavate.Guavate; * <spamdHost>spamassassin</spamdHost> * <spamdPort>783</spamdPort> * </mailet> - * <mailet match="IsMarkedAsSpam" class="ToRecipientFolder"> - * <folder>Spam</folder> - * <consume>true</consume> + * <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + * <targetFolderName>Spam</targetFolderName> * </mailet> * <!-- End of SpamAssassing mailets pipeline --> * }</pre> http://git-wip-us.apache.org/repos/asf/james-project/blob/d335c7bf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml index 6c27de9..7148bac 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml @@ -58,9 +58,8 @@ <spamdHost>localhost</spamdHost> <spamdPort>783</spamdPort> </mailet> - <mailet match="IsMarkedAsSpam" class="ToRecipientFolder"> - <folder>Spam</folder> - <consume>true</consume> + <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + <targetFolderName>Spam</targetFolderName> </mailet> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> http://git-wip-us.apache.org/repos/asf/james-project/blob/d335c7bf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml index 8c8e2dd..c4ca2b1 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml @@ -58,9 +58,8 @@ <spamdHost>localhost</spamdHost> <spamdPort>783</spamdPort> </mailet> - <mailet match="IsMarkedAsSpam" class="ToRecipientFolder"> - <folder>Spam</folder> - <consume>true</consume> + <mailet match="IsMarkedAsSpam" class="WithStorageDirective"> + <targetFolderName>Spam</targetFolderName> </mailet> <mailet match="RecipientIsLocal" class="LocalDelivery"/> <mailet match="HostIsLocal" class="ToProcessor"> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
