This is an automated email from the ASF dual-hosted git repository.
rcordier 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 ca2f810bc2 [FIX] outgoingQueue => outgoing for RemoteDelivery mailet
in mailetcontainer.xml examples
ca2f810bc2 is described below
commit ca2f810bc297ad57324328d827bb0091d374a238
Author: Rene Cordier <[email protected]>
AuthorDate: Tue Feb 24 16:07:13 2026 +0700
[FIX] outgoingQueue => outgoing for RemoteDelivery mailet in
mailetcontainer.xml examples
---
docs/modules/servers/partials/configure/dsn.adoc | 2 +-
.../servers/partials/configure/remote-delivery-error-handling.adoc | 2 +-
examples/custom-imap/src/test/resources/mailetcontainer.xml | 2 +-
examples/custom-james-assembly/sample-configuration/mailetcontainer.xml | 2 +-
examples/custom-mailets/src/main/resources/mailetcontainer.xml | 2 +-
.../src/test/resources/mailetcontainer.xml | 2 +-
mpt/impl/smtp/jpa-pulsar/src/test/resources/mailetcontainer.xml | 2 +-
.../apps/cli-integration-tests/src/test/resources/mailetcontainer.xml | 2 +-
server/apps/distributed-app/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/distributed-app/src/test/resources/mailetcontainer.xml | 2 +-
.../apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/distributed-pop3-app/src/test/resources/mailetcontainer.xml | 2 +-
server/apps/jpa-app/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml | 2 +-
server/apps/jpa-app/src/test/resources/mailetcontainer.xml | 2 +-
server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml | 2 +-
server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml | 2 +-
server/apps/memory-app/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/memory-app/src/test/resources/mailetcontainer.xml | 2 +-
server/apps/postgres-app/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/postgres-app/src/main/resources/defaultMailetContainer.xml | 2 +-
server/apps/postgres-app/src/test/resources/mailetcontainer.xml | 2 +-
.../apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml | 2 +-
server/apps/scaling-pulsar-smtp/src/test/resources/mailetcontainer.xml | 2 +-
server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml | 2 +-
.../protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml | 2 +-
.../java/org/apache/james/mailets/configuration/CommonProcessors.java | 2 +-
.../org/apache/james/mailets/configuration/MailetConfiguration.java | 2 +-
.../mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml | 2 +-
server/mailet/rate-limiter-redis/mailetcontainer.xml | 2 +-
server/mailet/rate-limiter/mailetcontainer.xml | 2 +-
.../src/test/java/org/apache/james/SubAddressingRelayTest.java | 2 +-
.../src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java | 2 +-
.../test/java/org/apache/james/mailets/RemoteDeliveryOnSuccessTest.java | 2 +-
.../src/test/java/org/apache/james/smtp/dsn/DSNRelayTest.java | 2 +-
.../java/org/apache/james/smtp/priority/SmtpMtPriorityRelayTest.java | 2 +-
.../test/java/org/apache/james/smtp/tls/SmtpRequireTlsRelayTest.java | 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 +-
third-party/clamav/sample-configuration/mailetcontainer.xml | 2 +-
third-party/crowdsec/src/test/resources/mailetcontainer.xml | 2 +-
third-party/rspamd/sample-configuration/mailetcontainer_distributed.xml | 2 +-
third-party/rspamd/sample-configuration/mailetcontainer_memory.xml | 2 +-
third-party/spamassassin/sample-configuration/mailetcontainer.xml | 2 +-
third-party/spamassassin/src/test/resources/mailetcontainer.xml | 2 +-
50 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/docs/modules/servers/partials/configure/dsn.adoc
b/docs/modules/servers/partials/configure/dsn.adoc
index 9ff0cfb3f7..87ee6ea6c7 100644
--- a/docs/modules/servers/partials/configure/dsn.adoc
+++ b/docs/modules/servers/partials/configure/dsn.adoc
@@ -99,7 +99,7 @@ not imply they read it.</messageString>
<processor state="relay" enableJmx="true">
<!-- Perform at most 5 RemoteDelivery attempts -->
<mailet match="AtMost=5" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoingQueue>
<maxRetries>0</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
diff --git
a/docs/modules/servers/partials/configure/remote-delivery-error-handling.adoc
b/docs/modules/servers/partials/configure/remote-delivery-error-handling.adoc
index 25d7c121bc..076833a7ed 100644
---
a/docs/modules/servers/partials/configure/remote-delivery-error-handling.adoc
+++
b/docs/modules/servers/partials/configure/remote-delivery-error-handling.adoc
@@ -51,7 +51,7 @@ Here is an example of configuration achieving the proposed
solution:
<processor state="relay" enableJmx="true">
<!-- Perform at most 5 RemoteDelivery attemps -->
<mailet match="AtMost=5" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoingQueue>
<maxRetries>0</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
<deliveryThreads>10</deliveryThreads>
diff --git a/examples/custom-imap/src/test/resources/mailetcontainer.xml
b/examples/custom-imap/src/test/resources/mailetcontainer.xml
index a721c7cde5..7d03605f96 100644
--- a/examples/custom-imap/src/test/resources/mailetcontainer.xml
+++ b/examples/custom-imap/src/test/resources/mailetcontainer.xml
@@ -81,7 +81,7 @@
<RelayAllowed>true</RelayAllowed>
</mailet>
<mailet match="HasMailAttribute=RelayAllowed"
class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/examples/custom-james-assembly/sample-configuration/mailetcontainer.xml
b/examples/custom-james-assembly/sample-configuration/mailetcontainer.xml
index 5d247dcbb5..f98da64721 100644
--- a/examples/custom-james-assembly/sample-configuration/mailetcontainer.xml
+++ b/examples/custom-james-assembly/sample-configuration/mailetcontainer.xml
@@ -93,7 +93,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/examples/custom-mailets/src/main/resources/mailetcontainer.xml
b/examples/custom-mailets/src/main/resources/mailetcontainer.xml
index 4817d3ff5b..d260588b64 100644
--- a/examples/custom-mailets/src/main/resources/mailetcontainer.xml
+++ b/examples/custom-mailets/src/main/resources/mailetcontainer.xml
@@ -99,7 +99,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
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 bf6baa0cd2..311c535fb9 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
@@ -70,7 +70,7 @@
<errorProcessor>rrt-error</errorProcessor>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5 minutes</delayTime>
<delayTime>10 minutes</delayTime>
<delayTime>45 minutes</delayTime>
diff --git a/mpt/impl/smtp/jpa-pulsar/src/test/resources/mailetcontainer.xml
b/mpt/impl/smtp/jpa-pulsar/src/test/resources/mailetcontainer.xml
index b917304627..48353de8cc 100644
--- a/mpt/impl/smtp/jpa-pulsar/src/test/resources/mailetcontainer.xml
+++ b/mpt/impl/smtp/jpa-pulsar/src/test/resources/mailetcontainer.xml
@@ -62,7 +62,7 @@
<errorProcessor>rrt-error</errorProcessor>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5 minutes</delayTime>
<delayTime>10 minutes</delayTime>
<delayTime>45 minutes</delayTime>
diff --git
a/server/apps/cli-integration-tests/src/test/resources/mailetcontainer.xml
b/server/apps/cli-integration-tests/src/test/resources/mailetcontainer.xml
index c450e90b15..053b914936 100644
--- a/server/apps/cli-integration-tests/src/test/resources/mailetcontainer.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/mailetcontainer.xml
@@ -70,7 +70,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
index 0cb3fd52c9..26c11e38e0 100644
--- a/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-app/sample-configuration/mailetcontainer.xml
@@ -111,7 +111,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
b/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
index 119f0f89c1..8cfaad6fab 100644
--- a/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/distributed-app/src/test/resources/mailetcontainer.xml
@@ -82,7 +82,7 @@
<notice>550 - Requested action not taken: no such user
here</notice>
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
b/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
index ee0448eaf8..1d3786df93 100644
--- a/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/distributed-pop3-app/sample-configuration/mailetcontainer.xml
@@ -101,7 +101,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/apps/distributed-pop3-app/src/test/resources/mailetcontainer.xml
b/server/apps/distributed-pop3-app/src/test/resources/mailetcontainer.xml
index cb0a08af66..8176350f4d 100644
--- a/server/apps/distributed-pop3-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/distributed-pop3-app/src/test/resources/mailetcontainer.xml
@@ -80,7 +80,7 @@
<notice>550 - Requested action not taken: no such user
here</notice>
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
index 5be2bf0976..1756a3e7ed 100644
--- a/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/jpa-app/sample-configuration/mailetcontainer.xml
@@ -94,7 +94,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml
b/server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml
index 3822f0c210..dc1bd055cd 100644
--- a/server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml
+++ b/server/apps/jpa-app/src/main/resources/defaultMailetContainer.xml
@@ -47,7 +47,7 @@
<notice>550 - Requested action not taken: no such user
here</notice>
</mailet>
<mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/jpa-app/src/test/resources/mailetcontainer.xml
b/server/apps/jpa-app/src/test/resources/mailetcontainer.xml
index d8bc8c5017..4678fdf4f1 100644
--- a/server/apps/jpa-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/jpa-app/src/test/resources/mailetcontainer.xml
@@ -72,7 +72,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
index dab98ab375..d6db8ce648 100644
--- a/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/jpa-smtp-app/sample-configuration/mailetcontainer.xml
@@ -81,7 +81,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml
b/server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml
index 4b07dc0306..7cf59cc455 100644
--- a/server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml
+++ b/server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml
@@ -41,7 +41,7 @@
</mailet>
<mailet match="All" class="RecipientRewriteTable" />
<mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml
b/server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml
index 23733124cb..74aa497738 100644
--- a/server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/jpa-smtp-app/src/test/resources/mailetcontainer.xml
@@ -65,7 +65,7 @@
<errorProcessor>rrt-error</errorProcessor>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5 minutes</delayTime>
<delayTime>10 minutes</delayTime>
<delayTime>45 minutes</delayTime>
diff --git a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
index 8166c3b05a..4e54b438a2 100644
--- a/server/apps/memory-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/memory-app/sample-configuration/mailetcontainer.xml
@@ -111,7 +111,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/memory-app/src/test/resources/mailetcontainer.xml
b/server/apps/memory-app/src/test/resources/mailetcontainer.xml
index af23d57e94..c5293c77c0 100644
--- a/server/apps/memory-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/memory-app/src/test/resources/mailetcontainer.xml
@@ -103,7 +103,7 @@
<RelayAllowed>true</RelayAllowed>
</mailet>
<mailet match="HasMailAttribute=RelayAllowed"
class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/postgres-app/sample-configuration/mailetcontainer.xml
b/server/apps/postgres-app/sample-configuration/mailetcontainer.xml
index c5e09b8bda..d0d9ae0895 100644
--- a/server/apps/postgres-app/sample-configuration/mailetcontainer.xml
+++ b/server/apps/postgres-app/sample-configuration/mailetcontainer.xml
@@ -98,7 +98,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/apps/postgres-app/src/main/resources/defaultMailetContainer.xml
b/server/apps/postgres-app/src/main/resources/defaultMailetContainer.xml
index 3822f0c210..dc1bd055cd 100644
--- a/server/apps/postgres-app/src/main/resources/defaultMailetContainer.xml
+++ b/server/apps/postgres-app/src/main/resources/defaultMailetContainer.xml
@@ -47,7 +47,7 @@
<notice>550 - Requested action not taken: no such user
here</notice>
</mailet>
<mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/apps/postgres-app/src/test/resources/mailetcontainer.xml
b/server/apps/postgres-app/src/test/resources/mailetcontainer.xml
index b9b7a7eba4..cd9b499e3c 100644
--- a/server/apps/postgres-app/src/test/resources/mailetcontainer.xml
+++ b/server/apps/postgres-app/src/test/resources/mailetcontainer.xml
@@ -78,7 +78,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
b/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
index 8339741952..f503d8c6e6 100644
--- a/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
+++ b/server/apps/scaling-pulsar-smtp/sample-configuration/mailetcontainer.xml
@@ -67,7 +67,7 @@
<errorProcessor>rrt-error</errorProcessor>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>10 seconds</delayTime>
<delayTime>30 seconds</delayTime>
diff --git
a/server/apps/scaling-pulsar-smtp/src/test/resources/mailetcontainer.xml
b/server/apps/scaling-pulsar-smtp/src/test/resources/mailetcontainer.xml
index c2a7e73f5e..a10e186472 100644
--- a/server/apps/scaling-pulsar-smtp/src/test/resources/mailetcontainer.xml
+++ b/server/apps/scaling-pulsar-smtp/src/test/resources/mailetcontainer.xml
@@ -65,7 +65,7 @@
<errorProcessor>rrt-error</errorProcessor>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5 minutes</delayTime>
<delayTime>10 minutes</delayTime>
<delayTime>45 minutes</delayTime>
diff --git a/server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml
b/server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml
index ae66343c59..af29a690c2 100644
--- a/server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml
+++ b/server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml
@@ -75,7 +75,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
index bde631415e..489f880b19 100644
---
a/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
+++
b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml
@@ -63,7 +63,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 23*500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/CommonProcessors.java
b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/CommonProcessors.java
index 5d69f617a1..f806e240f3 100644
---
a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++
b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -112,7 +112,7 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "5000, 100000, 500000")
.addProperty("maxRetries", "3")
.addProperty("maxDnsProblemRetries", "0")
diff --git
a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/MailetConfiguration.java
b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index 8896bdfa4c..ed0c1892c9 100644
---
a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++
b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -112,7 +112,7 @@ public class MailetConfiguration implements
SerializableAsXml {
public static MailetConfiguration.Builder remoteDeliveryBuilderNoBounces()
{
return MailetConfiguration.builder()
.mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "5000, 100000, 500000")
.addProperty("maxRetries", "2")
.addProperty("maxDnsProblemRetries", "0")
diff --git
a/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
b/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
index c5114cf461..2a826b35c4 100644
--- a/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
+++ b/server/mailet/mailetcontainer-api/src/main/resources/mailetcontainer.xml
@@ -56,7 +56,7 @@
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5 minutes</delayTime>
<delayTime>10 minutes</delayTime>
<delayTime>45 minutes</delayTime>
diff --git a/server/mailet/rate-limiter-redis/mailetcontainer.xml
b/server/mailet/rate-limiter-redis/mailetcontainer.xml
index 56e007ed4d..763eaa832d 100644
--- a/server/mailet/rate-limiter-redis/mailetcontainer.xml
+++ b/server/mailet/rate-limiter-redis/mailetcontainer.xml
@@ -111,7 +111,7 @@
<totalSize>200M</totalSize>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/server/mailet/rate-limiter/mailetcontainer.xml
b/server/mailet/rate-limiter/mailetcontainer.xml
index 5a5ada9890..f5b897fae3 100644
--- a/server/mailet/rate-limiter/mailetcontainer.xml
+++ b/server/mailet/rate-limiter/mailetcontainer.xml
@@ -130,7 +130,7 @@
<exceededProcessor>tooMuchMails</exceededProcessor>
</mailet>
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/SubAddressingRelayTest.java
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/SubAddressingRelayTest.java
index 899370b244..54403a0e64 100644
---
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/SubAddressingRelayTest.java
+++
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/SubAddressingRelayTest.java
@@ -178,7 +178,7 @@ class SubAddressingRelayTest {
.addMailet(MailetConfiguration.builder()
.mailet(RemoteDelivery.class)
.matcher(All.class)
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "3 * 10 ms")
.addProperty("maxRetries", "3")
.addProperty("maxDnsProblemRetries", "0")
diff --git
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java
index 84f14c7813..0d944acfd6 100644
---
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java
+++
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java
@@ -425,7 +425,7 @@ class RemoteDeliveryErrorTest {
.addMailet(MailetConfiguration.builder()
.mailet(RemoteDelivery.class)
.matcher(All.class)
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "3 * 10 ms")
.addProperty("maxRetries", "3")
.addProperty("maxDnsProblemRetries", "0")
diff --git
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryOnSuccessTest.java
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryOnSuccessTest.java
index 8b96310b01..48ce8f01a4 100644
---
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryOnSuccessTest.java
+++
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryOnSuccessTest.java
@@ -226,7 +226,7 @@ class RemoteDeliveryOnSuccessTest {
.addMailet(MailetConfiguration.builder()
.mailet(RemoteDelivery.class)
.matcher(All.class)
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "3 * 10 ms")
.addProperty("maxRetries", "3")
.addProperty("maxDnsProblemRetries", "0")
diff --git
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/dsn/DSNRelayTest.java
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/dsn/DSNRelayTest.java
index 8ed10aaae4..8e5926e3a1 100644
---
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/dsn/DSNRelayTest.java
+++
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/dsn/DSNRelayTest.java
@@ -399,7 +399,7 @@ class DSNRelayTest {
.addMailet(MailetConfiguration.builder()
.mailet(RemoteDelivery.class)
.matcher(All.class)
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "3 * 10 ms")
.addProperty("maxRetries", "3")
.addProperty("maxDnsProblemRetries", "0")
diff --git
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/priority/SmtpMtPriorityRelayTest.java
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/priority/SmtpMtPriorityRelayTest.java
index 12c6ab3da0..366aae2d80 100644
---
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/priority/SmtpMtPriorityRelayTest.java
+++
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/priority/SmtpMtPriorityRelayTest.java
@@ -134,7 +134,7 @@ class SmtpMtPriorityRelayTest {
.mailet(RemoteDelivery.class)
.matcher(All.class)
.addProperty("usePriority", usePriority.toString())
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "3 * 10 ms")
.addProperty("maxRetries", "3")
.addProperty("deliveryThreads", "2")
diff --git
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/tls/SmtpRequireTlsRelayTest.java
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/tls/SmtpRequireTlsRelayTest.java
index fa86fa9797..b157689911 100644
---
a/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/tls/SmtpRequireTlsRelayTest.java
+++
b/server/mailet/remote-delivery-integration-testing/src/test/java/org/apache/james/smtp/tls/SmtpRequireTlsRelayTest.java
@@ -145,7 +145,7 @@ class SmtpRequireTlsRelayTest {
.mailet(RemoteDelivery.class)
.matcher(All.class)
.addProperty("usePriority", usePriority.toString())
- .addProperty("outgoingQueue", "outgoing")
+ .addProperty("outgoing", "outgoing")
.addProperty("delayTime", "3 * 10 ms")
.addProperty("maxRetries", "1")
.addProperty("maxDnsProblemRetries", "0")
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 a30c7cf6b1..109f6ed5fb 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
@@ -84,7 +84,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
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 cf33795cf7..62b44dcf39 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
@@ -79,7 +79,7 @@
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml
b/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml
index f429a43156..e98577bb1d 100644
---
a/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml
+++
b/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/resources/mailetcontainer.xml
@@ -79,7 +79,7 @@
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
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 040aeed232..bf03962346 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
@@ -83,7 +83,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
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 be73c0ed58..587ed36947 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
@@ -83,7 +83,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/resources/mailetcontainer.xml
b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/resources/mailetcontainer.xml
index 5b3de6b325..69ff7e731a 100644
---
a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/resources/mailetcontainer.xml
+++
b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/resources/mailetcontainer.xml
@@ -83,7 +83,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/third-party/clamav/sample-configuration/mailetcontainer.xml
b/third-party/clamav/sample-configuration/mailetcontainer.xml
index ad69dbd7bd..2ac4309c3c 100644
--- a/third-party/clamav/sample-configuration/mailetcontainer.xml
+++ b/third-party/clamav/sample-configuration/mailetcontainer.xml
@@ -111,7 +111,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/third-party/crowdsec/src/test/resources/mailetcontainer.xml
b/third-party/crowdsec/src/test/resources/mailetcontainer.xml
index a721c7cde5..7d03605f96 100644
--- a/third-party/crowdsec/src/test/resources/mailetcontainer.xml
+++ b/third-party/crowdsec/src/test/resources/mailetcontainer.xml
@@ -81,7 +81,7 @@
<RelayAllowed>true</RelayAllowed>
</mailet>
<mailet match="HasMailAttribute=RelayAllowed"
class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git
a/third-party/rspamd/sample-configuration/mailetcontainer_distributed.xml
b/third-party/rspamd/sample-configuration/mailetcontainer_distributed.xml
index 83c35cedb6..7266615044 100644
--- a/third-party/rspamd/sample-configuration/mailetcontainer_distributed.xml
+++ b/third-party/rspamd/sample-configuration/mailetcontainer_distributed.xml
@@ -110,7 +110,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/third-party/rspamd/sample-configuration/mailetcontainer_memory.xml
b/third-party/rspamd/sample-configuration/mailetcontainer_memory.xml
index 0d3a97150d..27ae77e3c9 100644
--- a/third-party/rspamd/sample-configuration/mailetcontainer_memory.xml
+++ b/third-party/rspamd/sample-configuration/mailetcontainer_memory.xml
@@ -110,7 +110,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/third-party/spamassassin/sample-configuration/mailetcontainer.xml
b/third-party/spamassassin/sample-configuration/mailetcontainer.xml
index 75d7e1d8f0..d5530b6da1 100644
--- a/third-party/spamassassin/sample-configuration/mailetcontainer.xml
+++ b/third-party/spamassassin/sample-configuration/mailetcontainer.xml
@@ -108,7 +108,7 @@
<processor state="relay" enableJmx="true">
<mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
diff --git a/third-party/spamassassin/src/test/resources/mailetcontainer.xml
b/third-party/spamassassin/src/test/resources/mailetcontainer.xml
index f67bfae612..cdefdad9b9 100644
--- a/third-party/spamassassin/src/test/resources/mailetcontainer.xml
+++ b/third-party/spamassassin/src/test/resources/mailetcontainer.xml
@@ -85,7 +85,7 @@
</mailet>
<mailet match="relay-allowed" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
+ <outgoing>outgoing</outgoing>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>3</maxRetries>
<maxDnsProblemRetries>0</maxDnsProblemRetries>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
