Merge branch 'debugcrdomaintest' into 'main'

Fix for ItCrossDomainTransaction test failures in 1412

See merge request weblogic-cloud/weblogic-kubernetes-operator!4610

Author: ddsharpe

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java

@@ -536,8 +536,9 @@ private boolean checkLocalQueue() {
             hostAndPort);
 
     logger.info("curl command {0}", curlString);
+
     testUntil(
-        () -> exec(new String(curlString), true).stdout().contains("Messages are distributed"),
+        () -> execCurl(curlString).contains("Messages are distributed"),
         logger,
         "local queue to be updated");
     return true;
@@ -650,10 +651,10 @@ private static void createDomainResource(String domainUid, String domNamespace,
             .serverPod(new ServerPod()
                 .addEnvItem(new V1EnvVar()
                     .name("JAVA_OPTIONS")
-                    .value("-Dweblogic.transaction.EnableInstrumentedTM=true -Dweblogic.StdoutDebugEnabled=false"
+                    .value("-Dweblogic.transaction.EnableInstrumentedTM=true -Dweblogic.StdoutDebugEnabled=false "
                         + "-Dweblogic.debug.DebugJTAXA=true "
                         + "-Dweblogic.debug.DebugJTA2PC=true "
-                        + "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
+                        + "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true "))
                 .addEnvItem(new V1EnvVar()
                     .name("USER_MEM_ARGS")
                     .value("-Djava.security.egd=file:/dev/./urandom ")))
@@ -728,4 +729,10 @@ private static void createNginxIngressPathRoutingRules() {
     logger.info("Executing curl command {0}", curlCmd);
     assertTrue(callWebAppAndWaitTillReady(curlCmd, 60));
   }
+
+  String execCurl(String curlString) {
+    ExecResult result = assertDoesNotThrow(() -> exec(new String(curlString), true));
+    logger.info("curl command returned {0}", result.toString());
+    return result.stdout();
+  }
 }

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java

@@ -552,8 +552,7 @@ private boolean checkLocalQueue() {
             + "action=receive&dest=jms.testAccountingQueue\"", host, istioIngressPort);
 
     logger.info("curl command {0}", curlString);
-    testUntil(assertDoesNotThrow(
-        () -> () -> exec(curlString, true).stdout().contains("Messages are distributed")),
+    testUntil(() -> execCurl(curlString).contains("Messages are distributed"),
         logger, "local queue to be updated");
     return true;
   }
@@ -641,7 +640,7 @@ private static void createDomainResource(String domainUid, String domNamespace,
                         + "-Dweblogic.kernel.debug=true -Dweblogic.log.LoggerSeverity=Debug "
                         + "-Dweblogic.log.LogSeverity=Debug -Dweblogic.StdoutDebugEnabled=true "
                         + "-Dweblogic.log.StdoutSeverity=Debug "
-                        + "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true"))
+                        + "-Dweblogic.security.remoteAnonymousRMIT3Enabled=true "))
                 .addEnvItem(new V1EnvVar()
                     .name("USER_MEM_ARGS")
                     .value("-Djava.security.egd=file:/dev/./urandom ")))
@@ -658,4 +657,10 @@ private static void createDomainResource(String domainUid, String domNamespace,
     assertTrue(domCreated, String.format("Create domain custom resource failed with ApiException "
         + "for %s in namespace %s", domainUid, domNamespace));
   }
+
+  String execCurl(String curlString) {
+    ExecResult result = assertDoesNotThrow(() -> exec(new String(curlString), true));
+    logger.info("curl command returned {0}", result.toString());
+    return result.stdout();
+  }
 }

integration-tests/src/test/resources/apps/cdtservlet/src/application/CdtTxServlet.java

@@ -204,13 +204,15 @@ private void createTable(Connection conn, String tableName) throws SQLException
       stmt = conn.createStatement();
       stmt.execute(createSQL);
     } catch (SQLException sqle) {
-      System.out.println("Got SQL Exception when creating table ");
-      out.println("Got SQL Exception when creating table ");
+      System.out.println("Got SQL Exception when creating table " + sqle.getMessage());
+      out.println("Got SQL Exception when creating table " + sqle.getMessage());
       sqle.getMessage();
       throw sqle;
     } finally {
       out.println("Created table - closing stmt");
-      stmt.close();
+      if (stmt != null) {
+        stmt.close();
+      }
     }
   }
 
@@ -229,7 +231,9 @@ private void dropTable(Connection conn, String tableName) throws SQLException {
       throw sqle;
     } finally {
       out.println("Created table - closing stmt");
-      stmt.close();
+      if (stmt != null) {
+        stmt.close();
+      }
     }
   }
   private void insertData(Connection conn, String tableName) throws SQLException {

integration-tests/src/test/resources/wdt-models/model-crossdomaintransaction-domain1.yaml

@@ -21,11 +21,14 @@ topology:
     "admin-server":
       ListenPort: 7001
       ExternalDNSName: '@@PROP:DOMAIN_NAME@@-admin-server.@@PROP:NAMESPACE@@'
+
   ServerTemplate:
     "cluster-1-template":
       Cluster: "cluster-1"
       ListenPort : 8001
       ExternalDNSName: '@@PROP:DOMAIN_NAME@@-managed-server${id}.@@PROP:NAMESPACE@@'
+      DataSource:
+        RmiJDBCSecurity: Compatibility
 
 appDeployments:
   Application:

integration-tests/src/test/resources/wdt-models/model-crossdomaintransaction-domain2.yaml

@@ -26,6 +26,8 @@ topology:
       Cluster: "cluster-1"
       ListenPort : 8001
       ExternalDNSName: '@@PROP:DOMAIN_NAME@@-managed-server${id}.@@PROP:NAMESPACE@@'
+      DataSource:
+        RmiJDBCSecurity: Compatibility
 
 appDeployments:
   Application: