[CLOUD-2903] - Unable to define datasource properties

jboss/container/wildfly/launch/datasources/added/launch/datasource-common.sh

@@ -40,6 +40,8 @@ function clearDatasourceEnv() {
   unset ${prefix}_TX_ISOLATION
   unset ${prefix}_MIN_POOL_SIZE
   unset ${prefix}_MAX_POOL_SIZE
+  unset ${prefix}_SAME_RM_OVERRIDE
+  unset ${prefix}_NO_TX_SEPARATE_POOL
   unset ${prefix}_JTA
   unset ${prefix}_NONXA
   unset ${prefix}_DRIVER
@@ -405,7 +407,7 @@ function generate_external_datasource_xml() {
              <transaction-isolation>$tx_isolation</transaction-isolation>"
   fi
 
-  if [ -n "$min_pool_size" ] || [ -n "$max_pool_size" ]; then
+  if [ -n "$min_pool_size" ] || [ -n "$max_pool_size" ] || [ -n "$same_rm_override" ] || [ -n "$no_tx_separate_pool" ]; then
     if [ -n "$NON_XA_DATASOURCE" ] && [ "$NON_XA_DATASOURCE" = "true" ]; then
        ds="$ds
              <pool>"
@@ -422,6 +424,16 @@ function generate_external_datasource_xml() {
       ds="$ds
              <max-pool-size>$max_pool_size</max-pool-size>"
     fi
+    # CLOUD-2903: For Oracle XA Datasources, this configuration is required
+    if [ -n "$same_rm_override" ]; then
+      ds="$ds
+            <is-same-rm-override>$same_rm_override</is-same-rm-override>"
+    fi
+    # RHPAM-2261
+    if [ -n "$no_tx_separate_pool" ]; then
+      ds="$ds
+            <no-tx-separate-pools />"
+    fi
     if [ -n "$NON_XA_DATASOURCE" ] && [ "$NON_XA_DATASOURCE" = "true" ]; then
       ds="$ds
              </pool>"
@@ -527,6 +539,14 @@ function generate_external_datasource_cli() {
     ds_tmp_key_values["max-pool-size"]=$max_pool_size
   fi
 
+  if [ -n "${same_rm_override}"]; then
+    ds_tmp_key_values["same_rm_override"]=${same_rm_override}
+  fi
+
+  if [ -n "${no_tx_seperate_pool}" ]; then
+    ds_tmp_key_values["no-tx-separate-pool"]=${no_tx_seperate_pool}
+  fi
+
   ds_tmp_key_values["user-name"]="${username}"
   ds_tmp_key_values["password"]="${password}"
 
@@ -891,6 +911,12 @@ function inject_datasource() {
   # max pool size environment variable name format: [NAME]_[DATABASE_TYPE]_MAX_POOL_SIZE
   max_pool_size=$(find_env "${prefix}_MAX_POOL_SIZE")
 
+  # is same rm override environment variable name format: [PREFIX]_SAME_RM_OVERRIDE
+  same_rm_override=$(find_env "${prefix}_SAME_RM_OVERRIDE")
+
+  # no_tx_separate_pool environment variable name format: [PREFIX]_NO_TX_SEPARATE_POOL
+  no_tx_separate_pool=$(find_env "${prefix}_NO_TX_SEPARATE_POOL")
+
   # jta environment variable name format: [NAME]_[DATABASE_TYPE]_JTA
   jta=$(find_env "${prefix}_JTA" true)
 

jboss/container/wildfly/launch/datasources/module.yaml

@@ -54,9 +54,13 @@ envs:
     - name: "{PREFIX}_NONXA"
       description: "Defines the datasource as a non-XA datasource. Defaults to false."
       example: "true"
+    - name: "{PREFIX}_NO_TX_SEPARATE_POOL"
+      description: "Whether to create separate sub-pools for each context. This is required for Oracle datasources, which do not allow XA connections to be used both inside and outside of a JTA transaction."
     - name: "{PREFIX}_PASSWORD"
       description: "Defines the password for the datasource."
       example: "password"
+    - name: "{PREFIX}_SAME_RM_OVERRIDE"
+      description: "Whether the javax.transaction.xa.XAResource.isSameRM(XAResource) class returns true or false."
     - name: "{PREFIX}_TX_ISOLATION"
       description: "Defines the java.sql.Connection transaction isolation level for the datasource."
       example: "TRANSACTION_READ_UNCOMMITTED"

jboss/container/wildfly/launch/datasources/test/datasource/configure.bats

@@ -267,6 +267,8 @@ load common
     TEST_CONNECTION_CHECKER="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"
     TEST_EXCEPTION_SORTER="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"
     TEST_BACKGROUND_VALIDATION="false"
+    TEST_SAME_RM_OVERRIDE=false
+    TEST_NO_TX_SEPARATE_POOL=true
 
     run inject_datasources
 
@@ -302,6 +304,9 @@ load common
     TEST_XA_CONNECTION_PROPERTY_PortNumber="50000"
     TEST_XA_CONNECTION_PROPERTY_DatabaseName="ibmdb2db"
 
+    TEST_SAME_RM_OVERRIDE=false
+    TEST_NO_TX_SEPARATE_POOL=true
+
     run inject_datasources
 
     [ "$status" -eq 0 ]

jboss/container/wildfly/launch/datasources/test/datasource/expectations/prefix_ibmdb2_xa.xml

@@ -5,6 +5,10 @@
         <xa-datasource-property name="PortNumber">50000</xa-datasource-property>
         <xa-datasource-property name="ServerName">localhost</xa-datasource-property>
         <driver>ibmdb2</driver>
+        <xa-pool>
+            <is-same-rm-override>false</is-same-rm-override>
+            <no-tx-separate-pools/>
+        </xa-pool>
         <security>
             <user-name>kermit</user-name>
             <password>thefrog</password>

jboss/container/wildfly/launch/datasources/test/datasource/expectations/prefix_oracle_xa.xml

@@ -3,6 +3,10 @@
     <xa-datasource jndi-name="java:/jboss/datasources/testds" pool-name="test_oracle-TEST" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
         <xa-datasource-property name="URL">jdbc:oracle:thin:@oracleHostName:1521:orcl</xa-datasource-property>
         <driver>oracle</driver>
+        <xa-pool>
+            <is-same-rm-override>false</is-same-rm-override>
+            <no-tx-separate-pools/>
+        </xa-pool>
         <security>
             <user-name>kermit</user-name>
             <password>thefrog</password>

test-common/xml_utils.bash

@@ -3,7 +3,7 @@ function assert_xml() {
   local xpath=$2
   local expected=$3
   local xml=$(xmllint --xpath "$xpath" $file)
-  diff <(echo $xml | xmllint --format -) <(xmllint --format $expected)
+  diff -ur <(echo $xml | xmllint --format -) <(xmllint --format $expected)
 }
 
 function assert_xml_value() {