JAMES-3715 Disable graceful shutdown in tests

apache · Mar 22, 2022 · d0575f1 · d0575f1
1 parent b55c88c
commit d0575f1
Show file tree

Hide file tree

Showing 99 changed files with 137 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>