Remove ClearResourcesServlet

dev/com.ibm.ws.transaction.fat.util/src/com/ibm/ws/wsat/fat/util/WSATTest.java

@@ -85,26 +85,4 @@ public static void deleteStateFiles(LibertyServer... servers) throws Exception {
 			server.deleteFileFromLibertyServerRoot(stateFile);
 		}    	
     }
-
-	public static void callClearResourcesServlet(String app, LibertyServer... servers) throws Exception{
-		final String method = "callClearResourcesServlet";
-		int expectedConnectionCode = HttpURLConnection.HTTP_OK;
-		String servletName = "ClearResourcesServlet";
-
-		for (LibertyServer server : servers) {
-			String urlStr = "http://" + server.getHostname() + ":" + server.getHttpDefaultPort() + "/" + app + "/" + servletName;
-
-			Log.info(WSATTest.class, method, "callClearResourcesServlet URL: " + urlStr);
-			HttpURLConnection con = HttpUtils.getHttpConnection(new URL(urlStr), 
-				expectedConnectionCode, REQUEST_TIMEOUT);
-			try {
-				HttpUtils.getConnectionStream(con).readLine();
-			} finally {
-				con.disconnect();
-			}
-
-			server.setMarkToEndOfLog();
-			server.setTraceMarkToEndOfDefaultTrace();
-		}
-	}
 }

dev/com.ibm.ws.wsat.recovery_fat.lps/test-applications/recoveryClient/src/client/RecoverySetupServlet.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 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
@@ -25,6 +25,7 @@
 import javax.xml.ws.BindingProvider;
 
 import com.ibm.tx.jta.ut.util.TxTestUtils;
+import com.ibm.tx.jta.ut.util.XAResourceImpl;
 
 @WebServlet({ "/RecoverySetupServlet" })
 public class RecoverySetupServlet extends HttpServlet {
@@ -37,10 +38,13 @@ public class RecoverySetupServlet extends HttpServlet {
 
 	protected void doGet(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {
-		TxTestUtils.setTestResourcesFile();
 			int number = Integer.parseInt(request.getParameter("number").trim());
 			System.out.println("==============RecoverySetupServlet Test Number: " + number
 					+ "================");
+
+			TxTestUtils.setTestResourcesFile();
+			XAResourceImpl.clear();
+
 			String BASE_URL = request.getParameter("baseurl");
 			if (BASE_URL == null || BASE_URL.equals("")){
 				BASE_URL = "http://localhost:"+Integer.parseInt(System.getProperty("HTTP_secondary"));

dev/com.ibm.ws.wsat.recovery_fat.multi.9/fat/src/tests/ReroutePeerRecoveryTest.java

@@ -121,8 +121,8 @@ public void after() throws Exception {
 	@Before
 	public void before() throws Exception {
 		Log.info(ReroutePeerRecoveryTest.class, "before", "");
+		WSATTest.deleteStateFiles(server3, server5);
 		FATUtils.startServers(runner, server1, server2, server3, server4, server5, server6);
-		WSATTest.callClearResourcesServlet(recoveryServer, server3, server5);
 		server3.setTraceMarkToEndOfDefaultTrace();
 		server5.setTraceMarkToEndOfDefaultTrace();
 	}

dev/com.ibm.ws.wsat.recovery_fat.single.1/fat/src/tests/SingleRecoveryTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 IBM Corporation and others.
+ * Copyright (c) 2022, 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
@@ -58,21 +58,13 @@ public static void beforeTests() throws Exception {
 
 		FATUtils.startServers(server1);
 	}
-
-	@Before
-	public void before() throws Exception {
-		WSATTest.callClearResourcesServlet("recoveryServer", server1);
-	}
 
 	@AfterClass
 	public static void tearDown() throws Exception {
 		FATUtils.stopServers((String[])null, server1);
 	}
 
 	protected void recoveryTest(String id) throws Exception {
-//		Log.info(this.getClass(), "recoveryTest", "We are in "+new File(".").getCanonicalPath());
-//		Log.info(this.getClass(), "recoveryTest", "Printing "+new File("../../").getCanonicalPath());
-//		Log.info(this.getClass(), "recoveryTest", printDirectoryTree(new File("../../")));
 		final String method = "recoveryTest";
 		String result = null;
 		String logKeyword = "Jordan said in test: ";