You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/10/01 02:02:35 UTC
[james-project] branch master updated: JAMES-3656 Ignore by default
failures in non essential feature prior delivery (#677)
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
The following commit(s) were added to refs/heads/master by this push:
new 1d498d8 JAMES-3656 Ignore by default failures in non essential feature prior delivery (#677)
1d498d8 is described below
commit 1d498d8898f4f9407d51262b40c4ac4ddce6e6c0
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Fri Oct 1 09:02:28 2021 +0700
JAMES-3656 Ignore by default failures in non essential feature prior delivery (#677)
---
.../src/test/resources/mailetcontainer.xml | 8 ++++++--
.../smtp/cassandra/src/test/resources/mailetcontainer.xml | 8 ++++++--
.../cassandra-app/sample-configuration/mailetcontainer.xml | 12 +++++++++---
.../cassandra-app/src/test/resources/mailetcontainer.xml | 12 +++++++++---
.../distributed-app/sample-configuration/mailetcontainer.xml | 12 +++++++++---
.../distributed-app/src/test/resources/mailetcontainer.xml | 8 ++++++--
.../apps/memory-app/sample-configuration/mailetcontainer.xml | 12 +++++++++---
.../apps/memory-app/src/test/resources/mailetcontainer.xml | 12 +++++++++---
.../src/test/resources/mailetcontainer.xml | 12 +++++++++---
.../src/test/resources/mailetcontainer.xml | 8 ++++++--
.../src/test/resources/mailetcontainer.xml | 12 +++++++++---
.../src/test/resources/mailetcontainer.xml | 12 +++++++++---
12 files changed, 96 insertions(+), 32 deletions(-)
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 0ea7b33..42ed24c 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
@@ -60,8 +60,12 @@
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="RecipientRewriteTable">
<errorProcessor>rrt-error</errorProcessor>
</mailet>
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
index ed587d5..c71fd63 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
@@ -63,8 +63,12 @@
<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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5 minutes</delayTime>
diff --git a/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
index c0a2749..300583a 100644
--- a/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/cassandra-app/sample-configuration/mailetcontainer.xml
@@ -87,10 +87,16 @@
</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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="AddDeliveredToHeader"/>
- <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="LocalDelivery"/>
</processor>
diff --git a/server/apps/cassandra-app/src/test/resources/mailetcontainer.xml b/server/apps/cassandra-app/src/test/resources/mailetcontainer.xml
index 3d0345a..21cdbdd 100644
--- a/server/apps/cassandra-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/cassandra-app/src/test/resources/mailetcontainer.xml
@@ -95,10 +95,16 @@
<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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="AddDeliveredToHeader"/>
- <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="LocalDelivery"/>
</processor>
diff --git a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
index c0a2749..300583a 100644
--- a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
@@ -87,10 +87,16 @@
</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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="AddDeliveredToHeader"/>
- <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="LocalDelivery"/>
</processor>
diff --git a/server/apps/distributed-app/src/test/resources/mailetcontainer.xml b/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
index 3ccc730..bf8cb05 100644
--- a/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
@@ -94,8 +94,12 @@
<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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="LocalDelivery"/>
</processor>
diff --git a/server/apps/memory-app/sample-configuration/mailetcontainer.xml b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
index 492ccde..4e52c25 100644
--- a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
@@ -87,10 +87,16 @@
</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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="AddDeliveredToHeader"/>
- <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="LocalDelivery"/>
</processor>
diff --git a/server/apps/memory-app/src/test/resources/mailetcontainer.xml b/server/apps/memory-app/src/test/resources/mailetcontainer.xml
index 7618748..035281a 100644
--- a/server/apps/memory-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/memory-app/src/test/resources/mailetcontainer.xml
@@ -106,10 +106,16 @@
<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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="All" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="AddDeliveredToHeader"/>
- <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="All" class="LocalDelivery"/>
</processor>
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 fb735a5..5cf26c8 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
@@ -65,11 +65,15 @@
<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.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="mdn-matcher" class="org.apache.james.jmap.mailet.ExtractMDNOriginalJMAPMessageId" >
<onMailetException>ignore</onMailetException>
</mailet>
- <mailet match="RecipientIsLocal" class="Sieve"/>
+ <mailet match="RecipientIsLocal" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="RecipientIsLocal" class="SpamAssassin">
<onMailetException>ignore</onMailetException>
<spamdHost>localhost</spamdHost>
@@ -78,7 +82,9 @@
<mailet match="IsMarkedAsSpam" class="WithStorageDirective">
<targetFolderName>Spam</targetFolderName>
</mailet>
- <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
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 dcb465d..14db532 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
@@ -61,11 +61,15 @@
<mailet match="All" class="RecipientRewriteTable">
<errorProcessor>error</errorProcessor>
</mailet>
- <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="mdn-matcher" class="org.apache.james.jmap.mailet.ExtractMDNOriginalJMAPMessageId" >
<onMailetException>ignore</onMailetException>
</mailet>
- <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="relay-allowed" class="RemoteDelivery">
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 4f8938d..af50fa7 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
@@ -62,9 +62,15 @@
<name>bcc</name>
</mailet>
<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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="RecipientIsLocal" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
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 36577ea..b20ee52 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
@@ -62,9 +62,15 @@
<name>bcc</name>
</mailet>
<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="org.apache.james.jmap.mailet.VacationMailet">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="RecipientIsLocal" class="Sieve">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
+ <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering">
+ <onMailetException>ignore</onMailetException>
+ </mailet>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org