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 2022/04/04 05:45:25 UTC
[james-project] branch master updated (1b3c66c07d -> 8d6ede0e61)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 1b3c66c07d JAMES-3715 Configure bootstrap before binding it...
new 678997e9b0 JAMES-3715 Graceful shutdown for Netty servers
new 521b3c60db JAMES-3715 Allow disabling graceful shutdown
new 8d6ede0e61 JAMES-3715 Disable graceful shutdown in tests
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/smtpserver.xml | 3 +++
.../cassandra/src/test/resources/smtpserver.xml | 3 +++
.../james/protocols/netty/AbstractAsyncServer.java | 23 ++++++++++++++++++----
.../james/protocols/netty/NettyServerTest.java | 2 --
.../src/test/resources/imapserver.xml | 2 ++
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/imapserver.xml | 2 ++
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 2 +-
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/imapserver.xml | 2 ++
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
.../apps/jpa-app/src/test/resources/imapserver.xml | 2 ++
.../apps/jpa-app/src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 1 +
.../apps/jpa-app/src/test/resources/pop3server.xml | 1 +
.../apps/jpa-app/src/test/resources/smtpserver.xml | 3 +++
.../jpa-smtp-app/src/test/resources/smtpserver.xml | 3 +++
.../memory-app/src/test/resources/imapserver.xml | 2 ++
.../memory-app/src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 1 +
.../memory-app/src/test/resources/pop3server.xml | 1 +
.../memory-app/src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/smtpserver.xml | 3 +++
.../spring-app/src/test/resources/imapserver.xml | 3 ++-
.../src/test/resources/managesieveserver.xml | 1 +
.../spring-app/src/test/resources/pop3server.xml | 1 +
.../spring-app/src/test/resources/smtpserver.xml | 3 ++-
.../webadmin-cli/src/test/resources/imapserver.xml | 2 ++
.../webadmin-cli/src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 1 +
.../webadmin-cli/src/test/resources/pop3server.xml | 1 +
.../webadmin-cli/src/test/resources/smtpserver.xml | 3 +++
.../src/main/resources/imapserver.xml | 1 +
.../src/main/resources/smtpserver.xml | 2 ++
.../src/test/resources/imapserver.xml | 1 +
.../src/test/resources/smtpserver.xml | 1 +
.../src/test/resources/imapserver.xml | 2 ++
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/smtpserver.xml | 1 +
.../src/test/resources/smtpserver.xml | 1 +
.../src/test/resources/imapServer.xml | 1 +
.../src/test/resources/imapServerNoLimits.xml | 1 +
.../test/resources/imapServerPlainAuthAllowed.xml | 1 +
.../test/resources/imapServerPlainAuthDisabled.xml | 1 +
.../resources/imapServerPlainAuthDisallowed.xml | 1 +
...imapServerPlainAuthEnabledWithoutRequireSSL.xml | 1 +
...apServerRequireSSLIsFalseAndStartSSLIsFalse.xml | 1 +
...mapServerRequireSSLIsFalseAndStartSSLIsTrue.xml | 1 +
...mapServerRequireSSLIsTrueAndStartSSLIsFalse.xml | 1 +
...imapServerRequireSSLIsTrueAndStartSSLIsTrue.xml | 1 +
.../src/test/resources/imapServerSslDefaultJKS.xml | 1 +
.../src/test/resources/imapServerSslJKS.xml | 1 +
.../test/resources/imapServerSslJKSBadPassword.xml | 1 +
.../test/resources/imapServerSslJKSNotFound.xml | 1 +
.../src/test/resources/imapServerSslNoKeys.xml | 1 +
.../src/test/resources/imapServerSslPEM.xml | 1 +
.../src/test/resources/imapServerSslPEMBadPass.xml | 1 +
.../test/resources/imapServerSslPEMExtraPass.xml | 1 +
.../test/resources/imapServerSslPEMMissingPass.xml | 1 +
.../src/test/resources/imapServerSslPEMNoPass.xml | 1 +
.../src/test/resources/imapServerSslPKCS12.xml | 1 +
.../imapServerSslPKCS12MissingPassword.xml | 1 +
.../resources/imapServerSslPKCS12WrongPassword.xml | 1 +
.../src/test/resources/imapServerStartTLS.xml | 1 +
.../protocols-imap4/src/test/resources/oauth.xml | 1 +
.../lib/netty/AbstractConfigurableAsyncServer.java | 2 ++
.../protocols-lmtp/src/test/resources/lmtp.xml | 1 +
.../protocols-lmtp/src/test/resources/lmtpdsn.xml | 1 +
.../src/test/resources/lmtpmailet.xml | 1 +
.../src/test/resources/lmtpnormaldsn.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../apache/james/smtpserver/SMTPServerTest.java | 1 +
.../test/resources/smtpserver-advancedSecurity.xml | 1 +
.../resources/smtpserver-authAnnounceAlways.xml | 1 +
.../resources/smtpserver-authAnnounceNever.xml | 1 +
.../smtpserver-authAnnounceSometimeMatching.xml | 1 +
.../smtpserver-authAnnounceSometimeNotMatching.xml | 1 +
.../src/test/resources/smtpserver-dsn.xml | 1 +
.../src/test/resources/smtpserver-no-plain.xml | 1 +
.../src/test/resources/smtpserver-noauth.xml | 1 +
.../src/test/resources/smtpserver-requireSSL.xml | 1 +
.../src/test/resources/imapserver.xml | 1 +
.../src/test/resources/smtpserver.xml | 1 +
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 2 +-
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
102 files changed, 158 insertions(+), 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 03/03: JAMES-3715 Disable graceful shutdown in tests
Posted by bt...@apache.org.
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 8d6ede0e61c8da07d9711254d483a8df5d3a7a23
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Feb 28 22:41:36 2022 +0700
JAMES-3715 Disable graceful shutdown in tests
---
mpt/impl/smtp/cassandra-pulsar/src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/smtpserver.xml | 3 +++
mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml | 3 +++
server/apps/cassandra-app/src/test/resources/imapserver.xml | 2 ++
server/apps/cassandra-app/src/test/resources/lmtpserver.xml | 1 +
server/apps/cassandra-app/src/test/resources/managesieveserver.xml | 1 +
server/apps/cassandra-app/src/test/resources/pop3server.xml | 1 +
server/apps/cassandra-app/src/test/resources/smtpserver.xml | 3 +++
server/apps/cli-integration-tests/src/test/resources/imapserver.xml | 2 ++
server/apps/cli-integration-tests/src/test/resources/lmtpserver.xml | 1 +
.../cli-integration-tests/src/test/resources/managesieveserver.xml | 2 +-
server/apps/cli-integration-tests/src/test/resources/pop3server.xml | 1 +
server/apps/cli-integration-tests/src/test/resources/smtpserver.xml | 3 +++
server/apps/distributed-app/src/test/resources/imapserver.xml | 2 ++
server/apps/distributed-app/src/test/resources/lmtpserver.xml | 1 +
server/apps/distributed-app/src/test/resources/managesieveserver.xml | 1 +
server/apps/distributed-app/src/test/resources/pop3server.xml | 1 +
server/apps/distributed-app/src/test/resources/smtpserver.xml | 3 +++
server/apps/distributed-pop3-app/src/test/resources/lmtpserver.xml | 1 +
server/apps/distributed-pop3-app/src/test/resources/pop3server.xml | 1 +
server/apps/distributed-pop3-app/src/test/resources/smtpserver.xml | 3 +++
server/apps/jpa-app/src/test/resources/imapserver.xml | 2 ++
server/apps/jpa-app/src/test/resources/lmtpserver.xml | 1 +
server/apps/jpa-app/src/test/resources/managesieveserver.xml | 1 +
server/apps/jpa-app/src/test/resources/pop3server.xml | 1 +
server/apps/jpa-app/src/test/resources/smtpserver.xml | 3 +++
server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml | 3 +++
server/apps/memory-app/src/test/resources/imapserver.xml | 2 ++
server/apps/memory-app/src/test/resources/lmtpserver.xml | 1 +
server/apps/memory-app/src/test/resources/managesieveserver.xml | 1 +
server/apps/memory-app/src/test/resources/pop3server.xml | 1 +
server/apps/memory-app/src/test/resources/smtpserver.xml | 3 +++
.../apps/smtp-pulsar-cassandra-app/src/test/resources/smtpserver.xml | 3 +++
server/apps/spring-app/src/test/resources/imapserver.xml | 3 ++-
server/apps/spring-app/src/test/resources/managesieveserver.xml | 1 +
server/apps/spring-app/src/test/resources/pop3server.xml | 1 +
server/apps/spring-app/src/test/resources/smtpserver.xml | 3 ++-
server/apps/webadmin-cli/src/test/resources/imapserver.xml | 2 ++
server/apps/webadmin-cli/src/test/resources/lmtpserver.xml | 1 +
server/apps/webadmin-cli/src/test/resources/managesieveserver.xml | 1 +
server/apps/webadmin-cli/src/test/resources/pop3server.xml | 1 +
server/apps/webadmin-cli/src/test/resources/smtpserver.xml | 3 +++
server/mailet/integration-testing/src/main/resources/imapserver.xml | 1 +
server/mailet/integration-testing/src/main/resources/smtpserver.xml | 2 ++
.../src/test/resources/imapserver.xml | 1 +
.../src/test/resources/smtpserver.xml | 1 +
.../src/test/resources/imapserver.xml | 2 ++
.../src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/pop3server.xml | 1 +
.../src/test/resources/smtpserver.xml | 3 +++
.../src/test/resources/smtpserver.xml | 1 +
.../src/test/resources/smtpserver.xml | 1 +
server/protocols/protocols-imap4/src/test/resources/imapServer.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerNoLimits.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerPlainAuthAllowed.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerPlainAuthDisabled.xml | 1 +
.../src/test/resources/imapServerPlainAuthDisallowed.xml | 1 +
.../src/test/resources/imapServerPlainAuthEnabledWithoutRequireSSL.xml | 1 +
.../test/resources/imapServerRequireSSLIsFalseAndStartSSLIsFalse.xml | 1 +
.../test/resources/imapServerRequireSSLIsFalseAndStartSSLIsTrue.xml | 1 +
.../test/resources/imapServerRequireSSLIsTrueAndStartSSLIsFalse.xml | 1 +
.../src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsTrue.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslDefaultJKS.xml | 1 +
.../protocols/protocols-imap4/src/test/resources/imapServerSslJKS.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslJKSBadPassword.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslJKSNotFound.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslNoKeys.xml | 1 +
.../protocols/protocols-imap4/src/test/resources/imapServerSslPEM.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslPEMBadPass.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslPEMExtraPass.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslPEMMissingPass.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslPEMNoPass.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerSslPKCS12.xml | 1 +
.../src/test/resources/imapServerSslPKCS12MissingPassword.xml | 1 +
.../src/test/resources/imapServerSslPKCS12WrongPassword.xml | 1 +
.../protocols-imap4/src/test/resources/imapServerStartTLS.xml | 1 +
server/protocols/protocols-imap4/src/test/resources/oauth.xml | 1 +
server/protocols/protocols-lmtp/src/test/resources/lmtp.xml | 1 +
server/protocols/protocols-lmtp/src/test/resources/lmtpdsn.xml | 1 +
server/protocols/protocols-lmtp/src/test/resources/lmtpmailet.xml | 1 +
server/protocols/protocols-lmtp/src/test/resources/lmtpnormaldsn.xml | 1 +
.../protocols-pop3-distributed/src/test/resources/pop3server.xml | 1 +
server/protocols/protocols-pop3/src/test/resources/pop3server.xml | 1 +
.../src/test/java/org/apache/james/smtpserver/SMTPServerTest.java | 1 +
.../protocols-smtp/src/test/resources/smtpserver-advancedSecurity.xml | 1 +
.../src/test/resources/smtpserver-authAnnounceAlways.xml | 1 +
.../protocols-smtp/src/test/resources/smtpserver-authAnnounceNever.xml | 1 +
.../src/test/resources/smtpserver-authAnnounceSometimeMatching.xml | 1 +
.../src/test/resources/smtpserver-authAnnounceSometimeNotMatching.xml | 1 +
server/protocols/protocols-smtp/src/test/resources/smtpserver-dsn.xml | 1 +
.../protocols-smtp/src/test/resources/smtpserver-no-plain.xml | 1 +
.../protocols/protocols-smtp/src/test/resources/smtpserver-noauth.xml | 1 +
.../protocols-smtp/src/test/resources/smtpserver-requireSSL.xml | 1 +
.../src/test/resources/imapserver.xml | 1 +
.../src/test/resources/smtpserver.xml | 1 +
.../memory-webadmin-integration-test/src/test/resources/lmtpserver.xml | 1 +
.../src/test/resources/managesieveserver.xml | 2 +-
.../memory-webadmin-integration-test/src/test/resources/pop3server.xml | 1 +
.../memory-webadmin-integration-test/src/test/resources/smtpserver.xml | 3 +++
99 files changed, 137 insertions(+), 4 deletions(-)
diff --git a/mpt/impl/smtp/cassandra-pulsar/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra-pulsar/src/test/resources/smtpserver.xml
index 31b5d84066..c935787bfd 100644
--- a/mpt/impl/smtp/cassandra-pulsar/src/test/resources/smtpserver.xml
+++ b/mpt/impl/smtp/cassandra-pulsar/src/test/resources/smtpserver.xml
@@ -43,6 +43,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -70,6 +71,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -97,6 +99,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml
index 20bfc3f770..b85ebee8ba 100644
--- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml
+++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -74,6 +75,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -101,6 +103,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
index 20bfc3f770..b85ebee8ba 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -74,6 +75,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -101,6 +103,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/cassandra-app/src/test/resources/imapserver.xml b/server/apps/cassandra-app/src/test/resources/imapserver.xml
index e4cc505497..3434dbce39 100644
--- a/server/apps/cassandra-app/src/test/resources/imapserver.xml
+++ b/server/apps/cassandra-app/src/test/resources/imapserver.xml
@@ -36,6 +36,7 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -51,5 +52,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/cassandra-app/src/test/resources/lmtpserver.xml b/server/apps/cassandra-app/src/test/resources/lmtpserver.xml
index ffa6eaeae7..1429ca6866 100644
--- a/server/apps/cassandra-app/src/test/resources/lmtpserver.xml
+++ b/server/apps/cassandra-app/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/cassandra-app/src/test/resources/managesieveserver.xml b/server/apps/cassandra-app/src/test/resources/managesieveserver.xml
index eee405253d..b644fa4317 100644
--- a/server/apps/cassandra-app/src/test/resources/managesieveserver.xml
+++ b/server/apps/cassandra-app/src/test/resources/managesieveserver.xml
@@ -57,6 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
diff --git a/server/apps/cassandra-app/src/test/resources/pop3server.xml b/server/apps/cassandra-app/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/cassandra-app/src/test/resources/pop3server.xml
+++ b/server/apps/cassandra-app/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/cassandra-app/src/test/resources/smtpserver.xml b/server/apps/cassandra-app/src/test/resources/smtpserver.xml
index 15c8f3f018..456f4c4a68 100644
--- a/server/apps/cassandra-app/src/test/resources/smtpserver.xml
+++ b/server/apps/cassandra-app/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -77,6 +78,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -108,6 +110,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/cli-integration-tests/src/test/resources/imapserver.xml b/server/apps/cli-integration-tests/src/test/resources/imapserver.xml
index e99702248f..dc418150be 100644
--- a/server/apps/cli-integration-tests/src/test/resources/imapserver.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/imapserver.xml
@@ -35,6 +35,7 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -50,5 +51,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/cli-integration-tests/src/test/resources/lmtpserver.xml b/server/apps/cli-integration-tests/src/test/resources/lmtpserver.xml
index 7739071b72..30caa8c185 100644
--- a/server/apps/cli-integration-tests/src/test/resources/lmtpserver.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/cli-integration-tests/src/test/resources/managesieveserver.xml b/server/apps/cli-integration-tests/src/test/resources/managesieveserver.xml
index eee405253d..cf1e628a56 100644
--- a/server/apps/cli-integration-tests/src/test/resources/managesieveserver.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/managesieveserver.xml
@@ -57,7 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
-
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
</managesieveservers>
diff --git a/server/apps/cli-integration-tests/src/test/resources/pop3server.xml b/server/apps/cli-integration-tests/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/cli-integration-tests/src/test/resources/pop3server.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml b/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml
index 0fef5ecc86..c757c41557 100644
--- a/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml
+++ b/server/apps/cli-integration-tests/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -82,6 +83,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -117,6 +119,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/distributed-app/src/test/resources/imapserver.xml b/server/apps/distributed-app/src/test/resources/imapserver.xml
index e4cc505497..3434dbce39 100644
--- a/server/apps/distributed-app/src/test/resources/imapserver.xml
+++ b/server/apps/distributed-app/src/test/resources/imapserver.xml
@@ -36,6 +36,7 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -51,5 +52,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/distributed-app/src/test/resources/lmtpserver.xml b/server/apps/distributed-app/src/test/resources/lmtpserver.xml
index ffa6eaeae7..1429ca6866 100644
--- a/server/apps/distributed-app/src/test/resources/lmtpserver.xml
+++ b/server/apps/distributed-app/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/distributed-app/src/test/resources/managesieveserver.xml b/server/apps/distributed-app/src/test/resources/managesieveserver.xml
index eee405253d..b644fa4317 100644
--- a/server/apps/distributed-app/src/test/resources/managesieveserver.xml
+++ b/server/apps/distributed-app/src/test/resources/managesieveserver.xml
@@ -57,6 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
diff --git a/server/apps/distributed-app/src/test/resources/pop3server.xml b/server/apps/distributed-app/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/distributed-app/src/test/resources/pop3server.xml
+++ b/server/apps/distributed-app/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/distributed-app/src/test/resources/smtpserver.xml b/server/apps/distributed-app/src/test/resources/smtpserver.xml
index f750454b89..b995a36016 100644
--- a/server/apps/distributed-app/src/test/resources/smtpserver.xml
+++ b/server/apps/distributed-app/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -75,6 +76,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -103,6 +105,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/distributed-pop3-app/src/test/resources/lmtpserver.xml b/server/apps/distributed-pop3-app/src/test/resources/lmtpserver.xml
index ffa6eaeae7..1429ca6866 100644
--- a/server/apps/distributed-pop3-app/src/test/resources/lmtpserver.xml
+++ b/server/apps/distributed-pop3-app/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/distributed-pop3-app/src/test/resources/pop3server.xml b/server/apps/distributed-pop3-app/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/distributed-pop3-app/src/test/resources/pop3server.xml
+++ b/server/apps/distributed-pop3-app/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/distributed-pop3-app/src/test/resources/smtpserver.xml b/server/apps/distributed-pop3-app/src/test/resources/smtpserver.xml
index 402869c682..36ac142375 100644
--- a/server/apps/distributed-pop3-app/src/test/resources/smtpserver.xml
+++ b/server/apps/distributed-pop3-app/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -74,6 +75,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -102,6 +104,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/jpa-app/src/test/resources/imapserver.xml b/server/apps/jpa-app/src/test/resources/imapserver.xml
index e4cc505497..3434dbce39 100644
--- a/server/apps/jpa-app/src/test/resources/imapserver.xml
+++ b/server/apps/jpa-app/src/test/resources/imapserver.xml
@@ -36,6 +36,7 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -51,5 +52,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/jpa-app/src/test/resources/lmtpserver.xml b/server/apps/jpa-app/src/test/resources/lmtpserver.xml
index 7739071b72..30caa8c185 100644
--- a/server/apps/jpa-app/src/test/resources/lmtpserver.xml
+++ b/server/apps/jpa-app/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/jpa-app/src/test/resources/managesieveserver.xml b/server/apps/jpa-app/src/test/resources/managesieveserver.xml
index eee405253d..b644fa4317 100644
--- a/server/apps/jpa-app/src/test/resources/managesieveserver.xml
+++ b/server/apps/jpa-app/src/test/resources/managesieveserver.xml
@@ -57,6 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
diff --git a/server/apps/jpa-app/src/test/resources/pop3server.xml b/server/apps/jpa-app/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/jpa-app/src/test/resources/pop3server.xml
+++ b/server/apps/jpa-app/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/jpa-app/src/test/resources/smtpserver.xml b/server/apps/jpa-app/src/test/resources/smtpserver.xml
index 402869c682..36ac142375 100644
--- a/server/apps/jpa-app/src/test/resources/smtpserver.xml
+++ b/server/apps/jpa-app/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -74,6 +75,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -102,6 +104,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml b/server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml
index 8064b4bc5f..f981c98fd1 100644
--- a/server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml
+++ b/server/apps/jpa-smtp-app/src/test/resources/smtpserver.xml
@@ -45,6 +45,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -72,6 +73,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -99,6 +101,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/memory-app/src/test/resources/imapserver.xml b/server/apps/memory-app/src/test/resources/imapserver.xml
index e4cc505497..3434dbce39 100644
--- a/server/apps/memory-app/src/test/resources/imapserver.xml
+++ b/server/apps/memory-app/src/test/resources/imapserver.xml
@@ -36,6 +36,7 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -51,5 +52,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/memory-app/src/test/resources/lmtpserver.xml b/server/apps/memory-app/src/test/resources/lmtpserver.xml
index 2f7634fa24..c3a2af233b 100644
--- a/server/apps/memory-app/src/test/resources/lmtpserver.xml
+++ b/server/apps/memory-app/src/test/resources/lmtpserver.xml
@@ -39,6 +39,7 @@
<splitExecution>true</splitExecution>
</handler>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/memory-app/src/test/resources/managesieveserver.xml b/server/apps/memory-app/src/test/resources/managesieveserver.xml
index eee405253d..b644fa4317 100644
--- a/server/apps/memory-app/src/test/resources/managesieveserver.xml
+++ b/server/apps/memory-app/src/test/resources/managesieveserver.xml
@@ -57,6 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
diff --git a/server/apps/memory-app/src/test/resources/pop3server.xml b/server/apps/memory-app/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/memory-app/src/test/resources/pop3server.xml
+++ b/server/apps/memory-app/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/memory-app/src/test/resources/smtpserver.xml b/server/apps/memory-app/src/test/resources/smtpserver.xml
index 8064b4bc5f..f981c98fd1 100644
--- a/server/apps/memory-app/src/test/resources/smtpserver.xml
+++ b/server/apps/memory-app/src/test/resources/smtpserver.xml
@@ -45,6 +45,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -72,6 +73,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -99,6 +101,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/smtp-pulsar-cassandra-app/src/test/resources/smtpserver.xml b/server/apps/smtp-pulsar-cassandra-app/src/test/resources/smtpserver.xml
index d2e007529a..587a6cc34c 100644
--- a/server/apps/smtp-pulsar-cassandra-app/src/test/resources/smtpserver.xml
+++ b/server/apps/smtp-pulsar-cassandra-app/src/test/resources/smtpserver.xml
@@ -42,6 +42,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -69,6 +70,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -96,6 +98,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/spring-app/src/test/resources/imapserver.xml b/server/apps/spring-app/src/test/resources/imapserver.xml
index 4312f277cb..cbc5ec9fb9 100644
--- a/server/apps/spring-app/src/test/resources/imapserver.xml
+++ b/server/apps/spring-app/src/test/resources/imapserver.xml
@@ -68,7 +68,8 @@
<!-- Set the maximum simultaneous incoming connections per IP for this service -->
<connectionLimitPerIP>0</connectionLimitPerIP>
- <plainAuthDisallowed>false</plainAuthDisallowed>
+ <plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/spring-app/src/test/resources/managesieveserver.xml b/server/apps/spring-app/src/test/resources/managesieveserver.xml
index f8c83ee7f9..b6ba8b5f9b 100644
--- a/server/apps/spring-app/src/test/resources/managesieveserver.xml
+++ b/server/apps/spring-app/src/test/resources/managesieveserver.xml
@@ -57,6 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
diff --git a/server/apps/spring-app/src/test/resources/pop3server.xml b/server/apps/spring-app/src/test/resources/pop3server.xml
index b6101372bf..f2fee8e0e5 100644
--- a/server/apps/spring-app/src/test/resources/pop3server.xml
+++ b/server/apps/spring-app/src/test/resources/pop3server.xml
@@ -73,6 +73,7 @@
<!-- know what you are doing -->
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
diff --git a/server/apps/spring-app/src/test/resources/smtpserver.xml b/server/apps/spring-app/src/test/resources/smtpserver.xml
index f690acddef..acfa55aded 100644
--- a/server/apps/spring-app/src/test/resources/smtpserver.xml
+++ b/server/apps/spring-app/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handlerchain enableJmx="true">
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
+ </handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/apps/webadmin-cli/src/test/resources/imapserver.xml b/server/apps/webadmin-cli/src/test/resources/imapserver.xml
index e99702248f..dc418150be 100644
--- a/server/apps/webadmin-cli/src/test/resources/imapserver.xml
+++ b/server/apps/webadmin-cli/src/test/resources/imapserver.xml
@@ -35,6 +35,7 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -50,5 +51,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/apps/webadmin-cli/src/test/resources/lmtpserver.xml b/server/apps/webadmin-cli/src/test/resources/lmtpserver.xml
index 7739071b72..30caa8c185 100644
--- a/server/apps/webadmin-cli/src/test/resources/lmtpserver.xml
+++ b/server/apps/webadmin-cli/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/apps/webadmin-cli/src/test/resources/managesieveserver.xml b/server/apps/webadmin-cli/src/test/resources/managesieveserver.xml
index eee405253d..b644fa4317 100644
--- a/server/apps/webadmin-cli/src/test/resources/managesieveserver.xml
+++ b/server/apps/webadmin-cli/src/test/resources/managesieveserver.xml
@@ -57,6 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
diff --git a/server/apps/webadmin-cli/src/test/resources/pop3server.xml b/server/apps/webadmin-cli/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/apps/webadmin-cli/src/test/resources/pop3server.xml
+++ b/server/apps/webadmin-cli/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/apps/webadmin-cli/src/test/resources/smtpserver.xml b/server/apps/webadmin-cli/src/test/resources/smtpserver.xml
index f7571b8bf4..fbef830008 100644
--- a/server/apps/webadmin-cli/src/test/resources/smtpserver.xml
+++ b/server/apps/webadmin-cli/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -74,6 +75,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -102,6 +104,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/mailet/integration-testing/src/main/resources/imapserver.xml b/server/mailet/integration-testing/src/main/resources/imapserver.xml
index a22b8399c1..f7429d1ac3 100644
--- a/server/mailet/integration-testing/src/main/resources/imapserver.xml
+++ b/server/mailet/integration-testing/src/main/resources/imapserver.xml
@@ -36,5 +36,6 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/mailet/integration-testing/src/main/resources/smtpserver.xml b/server/mailet/integration-testing/src/main/resources/smtpserver.xml
index 8af96e3e09..8fe58aed96 100644
--- a/server/mailet/integration-testing/src/main/resources/smtpserver.xml
+++ b/server/mailet/integration-testing/src/main/resources/smtpserver.xml
@@ -52,6 +52,7 @@
<handler class="{{hookFqcn}}"/>
{{/hooks}}
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -95,6 +96,7 @@
<handler class="{{hookFqcn}}"/>
{{/hooks}}
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml
index a22b8399c1..f7429d1ac3 100644
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/imapserver.xml
@@ -36,5 +36,6 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
index 2ccbf3690a..060b057cd6 100644
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml
index 9f2901f42b..ec86ad6ed7 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/imapserver.xml
@@ -36,6 +36,7 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
<imapserver enabled="true">
<jmxName>imapserver-ssl</jmxName>
@@ -51,5 +52,6 @@ under the License.
</tls>
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
index ffa6eaeae7..1429ca6866 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
index 7f5c694acb..8af3fb29a9 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -73,6 +74,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -100,6 +102,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
index 2ccbf3690a..060b057cd6 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
index 7abe025142..21dc0a9af9 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/resources/smtpserver.xml
@@ -46,6 +46,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServer.xml b/server/protocols/protocols-imap4/src/test/resources/imapServer.xml
index bfc991f9ba..6851c8c75e 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServer.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServer.xml
@@ -11,4 +11,5 @@
<inMemorySizeLimit>64K</inMemorySizeLimit>
<literalSizeLimit>128K</literalSizeLimit>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerNoLimits.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerNoLimits.xml
index 643930cdc4..3cf6273864 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerNoLimits.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerNoLimits.xml
@@ -10,4 +10,5 @@
<enableIdle>true</enableIdle>
<inMemorySizeLimit>65536</inMemorySizeLimit> <!-- 64 KB -->
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthAllowed.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthAllowed.xml
index bc9937a611..47784db064 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthAllowed.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthAllowed.xml
@@ -8,4 +8,5 @@
<algorithm>SunX509</algorithm>
</tls>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisabled.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisabled.xml
index dbf5184c0d..90ee4d51ac 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisabled.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisabled.xml
@@ -10,4 +10,5 @@
<auth>
<plainAuthEnabled>false</plainAuthEnabled>
</auth>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisallowed.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisallowed.xml
index 2ca7b81d27..7798200f5f 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisallowed.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthDisallowed.xml
@@ -8,4 +8,5 @@
<algorithm>SunX509</algorithm>
</tls>
<plainAuthDisallowed>true</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthEnabledWithoutRequireSSL.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthEnabledWithoutRequireSSL.xml
index e8ce7554b2..1ef693471e 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthEnabledWithoutRequireSSL.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerPlainAuthEnabledWithoutRequireSSL.xml
@@ -11,4 +11,5 @@
<plainAuthEnabled>true</plainAuthEnabled>
</auth>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsFalse.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsFalse.xml
index 0159625d8e..9292202a7d 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsFalse.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsFalse.xml
@@ -11,4 +11,5 @@
<plainAuthEnabled>true</plainAuthEnabled>
<requireSSL>false</requireSSL>
</auth>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsTrue.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsTrue.xml
index 9d3693537b..1c23b84c3b 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsTrue.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsFalseAndStartSSLIsTrue.xml
@@ -11,4 +11,5 @@
<plainAuthEnabled>true</plainAuthEnabled>
<requireSSL>false</requireSSL>
</auth>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsFalse.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsFalse.xml
index edc4fd5d90..e39aadcffe 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsFalse.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsFalse.xml
@@ -11,4 +11,5 @@
<plainAuthEnabled>true</plainAuthEnabled>
<requireSSL>true</requireSSL>
</auth>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsTrue.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsTrue.xml
index 3b2bb91fba..7bdef7811e 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsTrue.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerRequireSSLIsTrueAndStartSSLIsTrue.xml
@@ -11,4 +11,5 @@
<plainAuthEnabled>true</plainAuthEnabled>
<requireSSL>true</requireSSL>
</auth>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslDefaultJKS.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslDefaultJKS.xml
index ece713e7a7..216d0892d7 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslDefaultJKS.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslDefaultJKS.xml
@@ -7,4 +7,5 @@
<secret>123456</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKS.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKS.xml
index 35d73941b3..d6bc61798a 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKS.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKS.xml
@@ -8,4 +8,5 @@
<secret>123456</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSBadPassword.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSBadPassword.xml
index 40b3551771..12964d1b86 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSBadPassword.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSBadPassword.xml
@@ -8,4 +8,5 @@
<secret>badbad</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSNotFound.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSNotFound.xml
index 66580bc976..96472399f8 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSNotFound.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslJKSNotFound.xml
@@ -8,4 +8,5 @@
<secret>123456</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslNoKeys.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslNoKeys.xml
index 4c2e3ff422..b19f471512 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslNoKeys.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslNoKeys.xml
@@ -4,4 +4,5 @@
<bind>0.0.0.0:0</bind>
<tls socketTLS="false" startTLS="true">
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEM.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEM.xml
index 7f78d318cb..8bc3a4a1f3 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEM.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEM.xml
@@ -7,4 +7,5 @@
<certificates>certs.self-signed.csr</certificates>
<secret>123456</secret>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMBadPass.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMBadPass.xml
index b27f0e2930..d087f3b9d5 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMBadPass.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMBadPass.xml
@@ -7,4 +7,5 @@
<certificates>certs.self-signed.csr</certificates>
<secret>badbad</secret>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMExtraPass.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMExtraPass.xml
index fe23331e56..0758b2eab8 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMExtraPass.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMExtraPass.xml
@@ -7,4 +7,5 @@
<certificates>certs.self-signed.csr</certificates>
<secret>123456</secret>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMMissingPass.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMMissingPass.xml
index c9a719164a..3ae176d2c4 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMMissingPass.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMMissingPass.xml
@@ -6,4 +6,5 @@
<privateKey>private.key</privateKey>
<certificates>certs.self-signed.csr</certificates>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMNoPass.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMNoPass.xml
index 9f83a2731f..06250d7acb 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMNoPass.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPEMNoPass.xml
@@ -6,4 +6,5 @@
<privateKey>private.nopass.key</privateKey>
<certificates>certs.self-signed.csr</certificates>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12.xml
index f72e129863..5819f7febb 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12.xml
@@ -8,4 +8,5 @@
<secret>123456</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12MissingPassword.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12MissingPassword.xml
index 0f24d5421b..51520f1ba8 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12MissingPassword.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12MissingPassword.xml
@@ -6,4 +6,5 @@
<keystoreType>PKCS12</keystoreType>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12WrongPassword.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12WrongPassword.xml
index 4496624283..8b8a0247f8 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12WrongPassword.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerSslPKCS12WrongPassword.xml
@@ -7,4 +7,5 @@
<secret>badbad</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/imapServerStartTLS.xml b/server/protocols/protocols-imap4/src/test/resources/imapServerStartTLS.xml
index c2b8eb8618..cb741f2531 100644
--- a/server/protocols/protocols-imap4/src/test/resources/imapServerStartTLS.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/imapServerStartTLS.xml
@@ -16,4 +16,5 @@
<inMemorySizeLimit>64K</inMemorySizeLimit>
<literalSizeLimit>128K</literalSizeLimit>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-imap4/src/test/resources/oauth.xml b/server/protocols/protocols-imap4/src/test/resources/oauth.xml
index 50a720a3fa..e79836ee69 100644
--- a/server/protocols/protocols-imap4/src/test/resources/oauth.xml
+++ b/server/protocols/protocols-imap4/src/test/resources/oauth.xml
@@ -10,4 +10,5 @@
<plainAuthEnabled>true</plainAuthEnabled>
<requireSSL>true</requireSSL>
</auth>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-lmtp/src/test/resources/lmtp.xml b/server/protocols/protocols-lmtp/src/test/resources/lmtp.xml
index 7ac37059fe..64926b7359 100644
--- a/server/protocols/protocols-lmtp/src/test/resources/lmtp.xml
+++ b/server/protocols/protocols-lmtp/src/test/resources/lmtp.xml
@@ -30,5 +30,6 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/protocols/protocols-lmtp/src/test/resources/lmtpdsn.xml b/server/protocols/protocols-lmtp/src/test/resources/lmtpdsn.xml
index a012ea3efe..5ea5dd7784 100644
--- a/server/protocols/protocols-lmtp/src/test/resources/lmtpdsn.xml
+++ b/server/protocols/protocols-lmtp/src/test/resources/lmtpdsn.xml
@@ -35,5 +35,6 @@
<handler class="org.apache.james.smtpserver.dsn.DSNRcptParameterHook"/>
<handler class="org.apache.james.smtpserver.dsn.DSNMessageHook"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/protocols/protocols-lmtp/src/test/resources/lmtpmailet.xml b/server/protocols/protocols-lmtp/src/test/resources/lmtpmailet.xml
index 3b1d4e12fe..41db65608d 100644
--- a/server/protocols/protocols-lmtp/src/test/resources/lmtpmailet.xml
+++ b/server/protocols/protocols-lmtp/src/test/resources/lmtpmailet.xml
@@ -30,5 +30,6 @@
<handlerchain coreHandlersPackage="org.apache.james.lmtpserver.MailetContainerCmdHandlerLoader">
<handler class="org.apache.james.lmtpserver.MailetContainerCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/protocols/protocols-lmtp/src/test/resources/lmtpnormaldsn.xml b/server/protocols/protocols-lmtp/src/test/resources/lmtpnormaldsn.xml
index 123584d3cd..682f1530c2 100644
--- a/server/protocols/protocols-lmtp/src/test/resources/lmtpnormaldsn.xml
+++ b/server/protocols/protocols-lmtp/src/test/resources/lmtpnormaldsn.xml
@@ -35,5 +35,6 @@
<handler class="org.apache.james.smtpserver.dsn.DSNRcptParameterHook"/>
<handler class="org.apache.james.smtpserver.dsn.DSNMessageHook"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/protocols/protocols-pop3-distributed/src/test/resources/pop3server.xml b/server/protocols/protocols-pop3-distributed/src/test/resources/pop3server.xml
index efcf6d89a9..6deb806e08 100644
--- a/server/protocols/protocols-pop3-distributed/src/test/resources/pop3server.xml
+++ b/server/protocols/protocols-pop3-distributed/src/test/resources/pop3server.xml
@@ -12,4 +12,5 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
\ No newline at end of file
diff --git a/server/protocols/protocols-pop3/src/test/resources/pop3server.xml b/server/protocols/protocols-pop3/src/test/resources/pop3server.xml
index efcf6d89a9..6deb806e08 100644
--- a/server/protocols/protocols-pop3/src/test/resources/pop3server.xml
+++ b/server/protocols/protocols-pop3/src/test/resources/pop3server.xml
@@ -12,4 +12,5 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
\ No newline at end of file
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
index 46ee7d6511..3bea5c4a55 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
@@ -259,6 +259,7 @@ public class SMTPServerTest {
smtpServer.setDnsService(dnsServer);
smtpServer.setFileSystem(fileSystem);
smtpServer.setProtocolHandlerLoader(chain);
+ smtpServer.setGracefulShutdown(false);
}
protected void init(SMTPTestConfiguration testConfiguration) throws Exception {
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-advancedSecurity.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-advancedSecurity.xml
index 57f0cdd384..1e94f9ad58 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-advancedSecurity.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-advancedSecurity.xml
@@ -17,4 +17,5 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
\ No newline at end of file
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceAlways.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceAlways.xml
index 676dc7b72b..cef5981a9d 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceAlways.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceAlways.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceNever.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceNever.xml
index bdfb5a6000..9bb2390872 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceNever.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceNever.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeMatching.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeMatching.xml
index bb2d6ac7be..e732466423 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeMatching.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeMatching.xml
@@ -43,6 +43,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeNotMatching.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeNotMatching.xml
index 73227b21c9..d1bc9920d1 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeNotMatching.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-authAnnounceSometimeNotMatching.xml
@@ -37,6 +37,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-dsn.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-dsn.xml
index 742922dc5d..debb6b4b27 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-dsn.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-dsn.xml
@@ -48,6 +48,7 @@
<handler class="org.apache.james.smtpserver.dsn.DSNMessageHook"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-no-plain.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-no-plain.xml
index 7bbb88e4a1..51f416640d 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-no-plain.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-no-plain.xml
@@ -39,6 +39,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-noauth.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-noauth.xml
index 827e2e53be..26b919275f 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-noauth.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-noauth.xml
@@ -34,6 +34,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/protocols-smtp/src/test/resources/smtpserver-requireSSL.xml b/server/protocols/protocols-smtp/src/test/resources/smtpserver-requireSSL.xml
index 83ee50d831..2d3c1a14e9 100644
--- a/server/protocols/protocols-smtp/src/test/resources/smtpserver-requireSSL.xml
+++ b/server/protocols/protocols-smtp/src/test/resources/smtpserver-requireSSL.xml
@@ -38,6 +38,7 @@
<handlerchain>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/imapserver.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/imapserver.xml
index a22b8399c1..f7429d1ac3 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/imapserver.xml
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/imapserver.xml
@@ -36,5 +36,6 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
<plainAuthDisallowed>false</plainAuthDisallowed>
+ <gracefulShutdown>false</gracefulShutdown>
</imapserver>
</imapservers>
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml
index 1f8eec29c6..2fd612d961 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/lmtpserver.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/lmtpserver.xml
index 7739071b72..30caa8c185 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/lmtpserver.xml
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/lmtpserver.xml
@@ -36,6 +36,7 @@
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</lmtpserver>
</lmtpservers>
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/managesieveserver.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/managesieveserver.xml
index eee405253d..6f0380d0b5 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/managesieveserver.xml
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/managesieveserver.xml
@@ -57,7 +57,7 @@
<connectionLimitPerIP>0</connectionLimitPerIP>
<maxmessagesize>0</maxmessagesize>
<addressBracketsEnforcement>true</addressBracketsEnforcement>
-
+ <gracefulShutdown>false</gracefulShutdown>
</managesieveserver>
</managesieveservers>
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/pop3server.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/pop3server.xml
index 595c313a70..6e4473aae2 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/pop3server.xml
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/pop3server.xml
@@ -38,5 +38,6 @@
<handlerchain>
<handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</pop3server>
</pop3servers>
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml
index 2c3a264844..a87c1d2574 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/resources/smtpserver.xml
@@ -47,6 +47,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-TLS</jmxName>
@@ -76,6 +77,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
<smtpserver enabled="true">
<jmxName>smtpserver-authenticated</jmxName>
@@ -105,6 +107,7 @@
<handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
+ <gracefulShutdown>false</gracefulShutdown>
</smtpserver>
</smtpservers>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/03: JAMES-3715 Allow disabling graceful shutdown
Posted by bt...@apache.org.
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 521b3c60db55ceaa764b317f62934e34a9d48070
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Feb 28 22:10:12 2022 +0700
JAMES-3715 Allow disabling graceful shutdown
---
.../apache/james/protocols/netty/AbstractAsyncServer.java | 14 ++++++++++++--
.../lib/netty/AbstractConfigurableAsyncServer.java | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
index 66682d6281..392c5a65f4 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
@@ -63,7 +63,10 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
private volatile int ioWorker = DEFAULT_IO_WORKER_COUNT;
private List<InetSocketAddress> addresses = new ArrayList<>();
+
protected String jmxName;
+
+ private boolean gracefulShutdown = true;
public synchronized void setListenAddresses(InetSocketAddress... addresses) {
if (started) {
@@ -71,7 +74,11 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
}
this.addresses = ImmutableList.copyOf(addresses);
}
-
+
+ public void setGracefulShutdown(boolean gracefulShutdown) {
+ this.gracefulShutdown = gracefulShutdown;
+ }
+
/**
* Set the IO-worker thread count to use. Default is nCores * 2
*/
@@ -143,7 +150,10 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
if (channels != null) {
futures.add(channels.close());
}
- futures.forEach(Throwing.<Future<?>>consumer(Future::await).sneakyThrow());
+
+ if (gracefulShutdown) {
+ futures.forEach(Throwing.<Future<?>>consumer(Future::await).sneakyThrow());
+ }
started = false;
}
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index e9342d1ea3..a744bdf44f 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -261,6 +261,8 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
LOGGER.info("TLS enabled with auth {} using truststore {}", clientAuth, truststore);
}
+ Optional.ofNullable(config.getBoolean("gracefulShutdown", null)).ifPresent(this::setGracefulShutdown);
+
doConfigure(config);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/03: JAMES-3715 Graceful shutdown for Netty servers
Posted by bt...@apache.org.
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 678997e9b0fdd92fa46d465a7f3d05a3cf2742b4
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Feb 26 19:22:00 2022 +0700
JAMES-3715 Graceful shutdown for Netty servers
Waits ongoing tasks being executed on Netty servers for a few seconds
before releasing underlying resources (like DB connections).
Especially on top of Cassandra components, this is a good first step
to minimize risks of shutdowns to cause inconsistencies.
The Netty4 migration enabled us to easily write such resilient
behaviour while it was not implemented for the previously existing
Netty 3 code.
---
.../org/apache/james/protocols/netty/AbstractAsyncServer.java | 11 ++++++++---
.../org/apache/james/protocols/netty/NettyServerTest.java | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
index d58ab40319..66682d6281 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.james.protocols.api.ProtocolServer;
import org.apache.james.util.concurrent.NamedThreadFactory;
+import com.github.fge.lambdas.Throwing;
import com.google.common.collect.ImmutableList;
import io.netty.bootstrap.ServerBootstrap;
@@ -37,9 +38,11 @@ import io.netty.channel.group.DefaultChannelGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.ImmediateEventExecutor;
+
/**
* Abstract base class for Servers which want to use async io
*/
@@ -128,17 +131,19 @@ public abstract class AbstractAsyncServer implements ProtocolServer {
return;
}
+ List<Future<?>> futures = new ArrayList<>();
if (bossGroup != null) {
- bossGroup.shutdownGracefully();
+ futures.add(bossGroup.shutdownGracefully());
}
if (workerGroup != null) {
- workerGroup.shutdownGracefully();
+ futures.add(workerGroup.shutdownGracefully());
}
if (channels != null) {
- channels.close();
+ futures.add(channels.close());
}
+ futures.forEach(Throwing.<Future<?>>consumer(Future::await).sneakyThrow());
started = false;
}
diff --git a/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java b/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java
index 6e8d2c5d87..61bf0f658d 100644
--- a/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java
+++ b/protocols/netty/src/test/java/org/apache/james/protocols/netty/NettyServerTest.java
@@ -26,8 +26,6 @@ import javax.net.ssl.SSLContext;
import org.apache.james.protocols.api.Encryption;
import org.apache.james.protocols.api.Protocol;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class NettyServerTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org