From 2ac23fb8137c3db03142a3b11314725603743919 Mon Sep 17 00:00:00 2001
From: mansal <mansal@us.ibm.com>
Date: Thu, 5 Dec 2024 09:49:48 -0500
Subject: [PATCH] Adding retry port TCP option to Servlet 4.0 Fat_2

---
 .../publish/files/serverConfigs/ResponseHeadersServer.xml      | 3 ++-
 .../publish/servers/servlet40_headers/server.xml               | 3 ++-
 .../publish/servers/servlet40_incompatible/server.xml          | 1 +
 .../publish/servers/servlet40_partitioned/server.xml           | 3 ++-
 .../publish/servers/servlet40_partitionedSecurity/server.xml   | 3 ++-
 .../publish/servers/servlet40_sameSite/server.xml              | 3 ++-
 .../publish/servers/servlet40_sameSiteSecurity/server.xml      | 3 ++-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/files/serverConfigs/ResponseHeadersServer.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/files/serverConfigs/ResponseHeadersServer.xml
index e556f1945921..ae95c8bc7990 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/files/serverConfigs/ResponseHeadersServer.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/files/serverConfigs/ResponseHeadersServer.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2021 IBM Corporation and others.
+    Copyright (c) 2021, 2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@
                   httpPort="${bvt.prop.HTTP_default}"
                   httpsPort="${bvt.prop.HTTP_default.secure}">
         <headers add="foo:bar"/>
+        <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
 </server>
\ No newline at end of file
diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_headers/server.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_headers/server.xml
index ad2ce2e861a9..30c0b4dd6ce5 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_headers/server.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_headers/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2021 IBM Corporation and others.
+    Copyright (c) 2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
                   host="*"
                   httpPort="${bvt.prop.HTTP_default}"
                   httpsPort="${bvt.prop.HTTP_default.secure}">
+                  <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
     <javaPermission className="java.util.PropertyPermission"
diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_incompatible/server.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_incompatible/server.xml
index cc140da01f01..1ef1469eedec 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_incompatible/server.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_incompatible/server.xml
@@ -23,6 +23,7 @@
                   httpPort="${bvt.prop.HTTP_default}"
                   httpsPort="${bvt.prop.HTTP_default.secure}">
                   <samesite none="AddCookieCookie"/>
+                  <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
     <javaPermission className="java.util.PropertyPermission"
diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitioned/server.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitioned/server.xml
index 9b0165787bf3..a274bf98cade 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitioned/server.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitioned/server.xml
@@ -9,7 +9,7 @@
  -->
 <server description="Partitioned Cookies Test">
     <!-- No SameSite Configurations in this server.xml because they are all setup individually in each test -->
-  <include location="../fatTestPorts.xml"/>
+  <include location="../fatTestCommon.xml"/>
 
     <featureManager>
         <feature>servlet-4.0</feature>
@@ -19,6 +19,7 @@
                   host="*"
                   httpPort="${bvt.prop.HTTP_default}"
                   httpsPort="${bvt.prop.HTTP_default.secure}">
+                  <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
 </server>
diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitionedSecurity/server.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitionedSecurity/server.xml
index c52e8d77f7c3..3a7f8dfe20ea 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitionedSecurity/server.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitionedSecurity/server.xml
@@ -9,7 +9,7 @@
  -->
 <server description="Server for testing the Cookie SameSite attribute">
 
-    <include location="../fatTestPorts.xml" />
+    <include location="../fatTestCommon.xml"/>
 
     <featureManager>
         <feature>servlet-4.0</feature>
@@ -22,6 +22,7 @@
         httpPort="${bvt.prop.HTTP_default}"
         httpsPort="${bvt.prop.HTTP_default.secure}">
         <samesite none="*" partitioned="false" />
+        <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
     <keyStore id="defaultKeyStore" password="{xor}EzY9Oi0rJg==" /> <!-- pwd: Liberty, expires
diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSite/server.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSite/server.xml
index e389060eb37a..04f7dbb7505d 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSite/server.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSite/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2020, 2021 IBM Corporation and others.
+    Copyright (c) 2020, 2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
                   host="*"
                   httpPort="${bvt.prop.HTTP_default}"
                   httpsPort="${bvt.prop.HTTP_default.secure}">
+                  <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
     <javaPermission className="java.util.PropertyPermission"
diff --git a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSiteSecurity/server.xml b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSiteSecurity/server.xml
index a8aff7979b0c..6674da0cd423 100644
--- a/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSiteSecurity/server.xml
+++ b/dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSiteSecurity/server.xml
@@ -9,7 +9,7 @@
  -->
 <server description="Server for testing the Cookie SameSite attribute">
 
-    <include location="../fatTestPorts.xml" />
+    <include location="../fatTestCommon.xml"/>
 
     <featureManager>
         <feature>servlet-4.0</feature>
@@ -22,6 +22,7 @@
         httpPort="${bvt.prop.HTTP_default}"
         httpsPort="${bvt.prop.HTTP_default.secure}">
         <samesite lax="*" />
+        <tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
     </httpEndpoint>
 
     <keyStore id="defaultKeyStore" password="{xor}EzY9Oi0rJg==" /> <!-- pwd: Liberty, expires1/4/2099 -->