[jboss-cvs] JBossAS SVN: r111067 - in branches/JBPAPP_4_2_0_GA_CP/testsuite: src/main/org/jboss/test/jbossts/ASCrashRecovery01 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 30 03:57:31 EDT 2011
Author: istudens at redhat.com
Date: 2011-03-30 03:57:29 -0400 (Wed, 30 Mar 2011)
New Revision: 111067
Added:
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml
Removed:
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-1-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-2-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac1-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac2-xa-ds.xml
Modified:
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
fixing crash rec tests for CP09 version, JBPAPP-4091
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -26,7 +26,7 @@
| ./build.sh tests-ts-crash-recovery -Djbossts.db=psql_8.3 -Djbossts.target=crash-tests-single-db
|
| or for a test scenario:
- | ./build.sh tests-ts-crash-recovery -Djbossts.db=psql_8.3 -Djbossts.tstype=jts -Djbossts.tsdemarc=bmt -Djbossts.testcase=none.rev -Djbossts.target=crash-tests-single
+ | ./build.sh tests-ts-crash-recovery -Djbossts.db=psql_8.3 -Djbossts.tsdemarc=bmt -Djbossts.testcase=none.rev -Djbossts.target=crash-tests-single
|
| Note: If you want to force the wiping out any txs in doubt from DB before the test you can use the property -DwipeOutTxsInDoubtBeforeTest=true.
-->
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.java 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.java 2011-03-30 07:57:29 UTC (rev 111067)
@@ -434,15 +434,22 @@
}
catch (Exception e)
{
+ e.printStackTrace();
return false;
}
pendingXidsInDoubt = xidsInDoubtAfterTest.size();
if (pendingUids == -1)
+ {
+ print("recoverUids failed, object store error, pendingUids == -1");
return false; // object store error
+ }
if (pendingUids <= existingUids && pendingXidsInDoubt <= totalExistingXidsInDoubt)
+ {
+ print("recoverUids success");
return true; // all uids in AS and txs in doubt in DB recovered
+ }
pendingUids -= existingUids;
pendingXidsInDoubt -= totalExistingXidsInDoubt;
@@ -455,6 +462,8 @@
} while (maxWait > 0);
+ print("recoverUids failed, took too long to recover");
+
// the test failed to recover some uids - clear them out ready for the next test
if (pendingUids > 0)
{
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -14,7 +14,7 @@
<jndi-name>CrashRecoveryDS</jndi-name>
<xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
- <xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">jbossqa</xa-datasource-property>
<xa-datasource-property name="User">crashrec</xa-datasource-property>
<xa-datasource-property name="Password">crashrec</xa-datasource-property>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -23,7 +23,7 @@
<xa-datasource-property name="User">crashrec</xa-datasource-property>
<xa-datasource-property name="Password">crashrec</xa-datasource-property>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
<!-- Checks the Oracle error codes and messages for fatal errors -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
<!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
Deleted: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-1-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-1-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-1-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
-
-<!-- ===================================================================== -->
-<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
-<!-- ===================================================================== -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
- <xa-datasource-property name="User">crashrec</xa-datasource-property>
- <xa-datasource-property name="Password">crashrec</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
-
-</datasources>
Deleted: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-2-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-2-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-2-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
-
-<!-- ===================================================================== -->
-<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
-<!-- ===================================================================== -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>RecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
- <xa-datasource-property name="User">crashrec</xa-datasource-property>
- <xa-datasource-property name="Password">crashrec</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
-
-</datasources>
Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- JBoss Server Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
+
+<!-- ===================================================================== -->
+<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
+<!-- ===================================================================== -->
+
+<datasources>
+
+ <xa-datasource>
+ <jndi-name>CrashRecoveryDS</jndi-name>
+ <track-connection-by-tx>true</track-connection-by-tx>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
+ <xa-datasource-property name="User">crash0</xa-datasource-property>
+ <xa-datasource-property name="Password">crash0</xa-datasource-property>
+ <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
+ <!-- Checks the Oracle error codes and messages for fatal errors -->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
+ <no-tx-separate-pools/>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </xa-datasource>
+
+ <xa-datasource>
+ <jndi-name>RecoveryDS</jndi-name>
+ <track-connection-by-tx>true</track-connection-by-tx>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
+ <xa-datasource-property name="User">crashrec</xa-datasource-property>
+ <xa-datasource-property name="Password">crashrec</xa-datasource-property>
+ <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
+ <!-- Checks the Oracle error codes and messages for fatal errors -->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
+ <no-tx-separate-pools/>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </xa-datasource>
+
+</datasources>
Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- JBoss Server Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
+
+<!-- ===================================================================== -->
+<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
+<!-- ===================================================================== -->
+
+<datasources>
+
+ <xa-datasource>
+ <jndi-name>CrashRecoveryDS</jndi-name>
+ <track-connection-by-tx>true</track-connection-by-tx>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
+ <xa-datasource-property name="User">crash0</xa-datasource-property>
+ <xa-datasource-property name="Password">crash0</xa-datasource-property>
+ <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
+ <!-- Checks the Oracle error codes and messages for fatal errors -->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
+ <no-tx-separate-pools/>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </xa-datasource>
+
+ <xa-datasource>
+ <jndi-name>RecoveryDS</jndi-name>
+ <track-connection-by-tx>true</track-connection-by-tx>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
+ <xa-datasource-property name="User">crashrec</xa-datasource-property>
+ <xa-datasource-property name="Password">crashrec</xa-datasource-property>
+ <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
+ <!-- Checks the Oracle error codes and messages for fatal errors -->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
+ <no-tx-separate-pools/>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </xa-datasource>
+
+</datasources>
Deleted: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac1-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac1-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac1-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
-
-<!-- ===================================================================== -->
-<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
-<!-- ===================================================================== -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
- <xa-datasource-property name="User">crashrec</xa-datasource-property>
- <xa-datasource-property name="Password">crashrec</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
-
-</datasources>
Deleted: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac2-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac2-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle-rac2-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: oracle-xa-ds.xml 71535 2008-04-01 07:05:03Z adrian at jboss.org $ -->
-
-<!-- ===================================================================== -->
-<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml -->
-<!-- ===================================================================== -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>RecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
- <xa-datasource-property name="User">crashrec</xa-datasource-property>
- <xa-datasource-property name="Password">crashrec</xa-datasource-property>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <no-tx-separate-pools/>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Oracle9i</type-mapping>
- </metadata>
- </xa-datasource>
-
-</datasources>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -19,11 +19,11 @@
<track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@dev68.qa.atl2.redhat.com:1521:qadb01</xa-datasource-property>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</xa-datasource-property>
<xa-datasource-property name="User">crashrec</xa-datasource-property>
<xa-datasource-property name="Password">crashrec</xa-datasource-property>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
<!-- Checks the Oracle error codes and messages for fatal errors -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
<!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -19,11 +19,11 @@
<track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@vmg27.mw.lab.eng.bos.redhat.com:1521:qaora11</xa-datasource-property>
<xa-datasource-property name="User">crashrec</xa-datasource-property>
<xa-datasource-property name="Password">crashrec</xa-datasource-property>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
<!-- Checks the Oracle error codes and messages for fatal errors -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
<!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -23,7 +23,7 @@
<xa-datasource-property name="User">crashrec</xa-datasource-property>
<xa-datasource-property name="Password">crashrec</xa-datasource-property>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
<!-- Checks the Oracle error codes and messages for fatal errors -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
<!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <xa-datasource>
+ <jndi-name>CrashRecoveryDS</jndi-name>
+ <track-connection-by-tx>true</track-connection-by-tx>
+ <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
+ <xa-datasource-property name="ServerName">postgresql02.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
+ <xa-datasource-property name="User">crashrec</xa-datasource-property>
+ <xa-datasource-property name="Password">crashrec</xa-datasource-property>
+ </xa-datasource>
+</datasources>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -20,9 +20,6 @@
<xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
<xa-datasource-property name="User">crashrec</xa-datasource-property>
<xa-datasource-property name="Password">crashrec</xa-datasource-property>
- <min-pool-size>1</min-pool-size>
- <max-pool-size>20</max-pool-size>
- <idle-timeout-minutes>15</idle-timeout-minutes>
<!--check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql-->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
<type-mapping>Sybase</type-mapping>
Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- JBoss Server Configuration -->
+<!-- Thanks to kosulin in the forumns -->
+<!-- ===================================================================== -->
+
+<!-- $Id: sybase-xa-ds.xml 85945 2009-03-16 19:45:12Z dimitris at jboss.org $ -->
+
+<datasources>
+
+ <xa-datasource>
+ <jndi-name>CrashRecoveryDS</jndi-name>
+ <!-- uncomment to enable interleaving <interleaving/> -->
+ <xa-datasource-class>com.sybase.jdbc3.jdbc.SybXADataSource</xa-datasource-class>
+ <xa-datasource-property name="NetworkProtocol">Tds</xa-datasource-property>
+ <xa-datasource-property name="ServerName">vmg09.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">5000</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
+ <xa-datasource-property name="User">crashrec</xa-datasource-property>
+ <xa-datasource-property name="Password">crashrec</xa-datasource-property>
+
+ <!--check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql-->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
+ <type-mapping>Sybase</type-mapping>
+ <track-connection-by-tx/>
+ </xa-datasource>
+
+</datasources>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml 2011-03-29 20:40:48 UTC (rev 111066)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml 2011-03-30 07:57:29 UTC (rev 111067)
@@ -49,9 +49,15 @@
<condition property="want.psql_8.3">
<equals arg1="${jbossts.db}" arg2="psql_8.3"/>
</condition>
+ <condition property="want.psql_8.4">
+ <equals arg1="${jbossts.db}" arg2="psql_8.4"/>
+ </condition>
<condition property="want.sybase_15">
<equals arg1="${jbossts.db}" arg2="sybase_15"/>
</condition>
+ <condition property="want.sybase_15.5">
+ <equals arg1="${jbossts.db}" arg2="sybase_15.5"/>
+ </condition>
<condition property="want.oracle_10">
<equals arg1="${jbossts.db}" arg2="oracle_10"/>
</condition>
@@ -93,7 +99,9 @@
<target name="want-all-dbs">
<property name="want.psql_8.2" value="true" />
<property name="want.psql_8.3" value="true" />
+ <property name="want.psql_8.4" value="true" />
<property name="want.sybase_15" value="true" />
+ <property name="want.sybase_15.5" value="true" />
<property name="want.oracle_10" value="true" />
<property name="want.oracle_11" value="true" />
<property name="want.oracle_11_r2" value="true" />
@@ -183,6 +191,7 @@
<target name="call-tests-for-all-dbs">
<antcall target="call-tests-for-psql_8.2"/>
<antcall target="call-tests-for-psql_8.3"/>
+ <antcall target="call-tests-for-psql_8.4"/>
<antcall target="call-tests-for-oracle_10"/>
<antcall target="call-tests-for-oracle_11"/>
<antcall target="call-tests-for-oracle_11_r2"/>
@@ -192,6 +201,7 @@
<antcall target="call-tests-for-mysql_5.1"/>
<antcall target="call-tests-for-db2_9.7"/>
<antcall target="call-tests-for-sybase_15"/>
+ <antcall target="call-tests-for-sybase_15.5"/>
<antcall target="call-tests-for-oracle_rac"/>
<antcall target="call-tests-for-oracle_rac_lb"/>
<antcall target="call-tests-for-oracle_rac_r2"/>
@@ -214,6 +224,14 @@
</antcall>
</target>
+ <target name="call-tests-for-psql_8.4" if="want.psql_8.4">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="${driver.name.psql_8.4}"/>
+ <param name="datasource" value="postgres84-xa-ds.xml" />
+ <param name="dbname" value="psql84" />
+ </antcall>
+ </target>
+
<target name="call-tests-for-oracle_10" if="want.oracle_10">
<antcall target="${call.target}">
<param name="dbdriver" value="${driver.name.oracle_10}"/>
@@ -242,8 +260,8 @@
<target name="call-tests-for-oracle_rac" if="want.oracle_rac">
<antcall target="${call.target}">
- <param name="dbdriver" value="${driver.name.oracle_11}"/>
- <param name="datasource" value="oracle-rac1-xa-ds.xml" />
+ <param name="dbdriver" value="${driver.name.oracle_11_rac}"/>
+ <param name="datasource" value="oracle-rac-xa-ds.xml" />
<param name="dbname" value="oracle_rac" />
<param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
@@ -251,7 +269,7 @@
<target name="call-tests-for-oracle_rac_lb" if="want.oracle_rac_lb">
<antcall target="${call.target}">
- <param name="dbdriver" value="${driver.name.oracle_11}"/>
+ <param name="dbdriver" value="${driver.name.oracle_11_rac}"/>
<param name="datasource" value="oracle-rac-lb-xa-ds.xml" />
<param name="dbname" value="oracle_rac_lb" />
<param name="hibernate.dialect" value="Oracle10gDialect" />
@@ -260,8 +278,8 @@
<target name="call-tests-for-oracle_rac_r2" if="want.oracle_rac_r2">
<antcall target="${call.target}">
- <param name="dbdriver" value="${driver.name.oracle_11}"/>
- <param name="datasource" value="oracle-rac-r2-1-xa-ds.xml" />
+ <param name="dbdriver" value="${driver.name.oracle_11_rac}"/>
+ <param name="datasource" value="oracle-rac-r2-xa-ds.xml" />
<param name="dbname" value="oracle_rac_r2" />
<param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
@@ -269,7 +287,7 @@
<target name="call-tests-for-oracle_rac_r2_lb" if="want.oracle_rac_r2_lb">
<antcall target="${call.target}">
- <param name="dbdriver" value="${driver.name.oracle_11}"/>
+ <param name="dbdriver" value="${driver.name.oracle_11_rac}"/>
<param name="datasource" value="oracle-rac-r2-lb-xa-ds.xml" />
<param name="dbname" value="oracle_rac_r2_lb" />
<param name="hibernate.dialect" value="Oracle10gDialect" />
@@ -323,6 +341,15 @@
<param name="datasource" value="sybase15-xa-ds.xml" />
<param name="dbname" value="sybase15" />
<param name="hibernate.dialect" value="SybaseASE15Dialect" />
+ </antcall>
+ </target>
+
+ <target name="call-tests-for-sybase_15.5" if="want.sybase_15.5">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="${driver.name.sybase_15.5}"/>
+ <param name="datasource" value="sybase15.5-xa-ds.xml" />
+ <param name="dbname" value="sybase15.5" />
+ <param name="hibernate.dialect" value="SybaseASE15Dialect" />
</antcall>
</target>
@@ -539,40 +566,34 @@
<!-- undeploy license .jar file -->
<!--delete file="${jboss.home}/server/crashrecovery-${tstype}/lib/db2jcc_license_cu.jar" /-->
</target>
-
+
<target name="hack-before-astest-run-for-oracle_rac" if="want.oracle_rac">
- <antcall target="hack-before-astest-run-for-oracle_racs"><param name="oracle_rac_second_ds" value="oracle-rac2-xa-ds.xml"/></antcall>
+ <antcall target="hack-before-astest-run-for-oracle_racs"/>
</target>
<target name="hack-after-astest-run-for-oracle_rac" if="want.oracle_rac">
- <antcall target="hack-after-astest-run-for-oracle_racs"><param name="oracle_rac_second_ds" value="oracle-rac2-xa-ds.xml"/></antcall>
+ <antcall target="hack-after-astest-run-for-oracle_racs"/>
</target>
<target name="hack-before-astest-run-for-oracle_rac_r2" if="want.oracle_rac_r2">
- <antcall target="hack-before-astest-run-for-oracle_racs"><param name="oracle_rac_second_ds" value="oracle-rac-r2-2-xa-ds.xml"/></antcall>
+ <antcall target="hack-before-astest-run-for-oracle_racs"/>
</target>
<target name="hack-after-astest-run-for-oracle_rac_r2" if="want.oracle_rac_r2">
- <antcall target="hack-after-astest-run-for-oracle_racs"><param name="oracle_rac_second_ds" value="oracle-rac-r2-2-xa-ds.xml"/></antcall>
+ <antcall target="hack-after-astest-run-for-oracle_racs"/>
</target>
<target name="hack-before-astest-run-for-oracle_racs">
- <!-- deploy the second DS configuration -->
- <copy file="${product.dir}/resources/${oracle_rac_second_ds}" todir="${jboss.home}/server/crashrecovery-${tstype}/deploy" />
-
<!-- hack the configuration of JBossTS in order to use the second datasource for crash recovery -->
- <replace file="${jboss.home}/server/crashrecovery-${tstype}/deploy/transaction-jboss-beans.xml">
+ <replace file="${jboss.home}/server/crashrecovery-${tstype}/conf/jbossjta-properties.xml">
<replacetoken><![CDATA[com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=CrashRecoveryDS]]></replacetoken>
<replacevalue><![CDATA[com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=RecoveryDS]]></replacevalue>
</replace>
</target>
<target name="hack-after-astest-run-for-oracle_racs">
- <!-- undeploy the second DS configuration -->
- <delete file="${jboss.home}/server/crashrecovery-${tstype}/deploy/${oracle_rac_second_ds}" />
-
<!-- unhack the configuration of JBossTS -->
- <replace file="${jboss.home}/server/crashrecovery-${tstype}/deploy/transaction-jboss-beans.xml">
+ <replace file="${jboss.home}/server/crashrecovery-${tstype}/conf/jbossjta-properties.xml">
<replacetoken><![CDATA[com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=RecoveryDS]]></replacetoken>
<replacevalue><![CDATA[com.arjuna.ats.internal.jbossatx.jta.AppServerJDBCXARecovery;jndiname=CrashRecoveryDS]]></replacevalue>
</replace>
@@ -624,12 +645,15 @@
<!-- ===== get db drivers - borrowed from https://svn.jboss.org/repos/labs/labs/jbosstm/trunk/qa/build.xml ==== -->
<!-- set these to the location(s) of the database drivers -->
- <property name="driver.url" value="http://reports.qa.atl.jboss.com/jdbc-drivers/"/>
+ <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/4.3.9"/>
<property name="driver.name.psql_8.2" value="postgresql-8.2.jar"/>
<property name="driver.name.psql_8.3" value="postgresql-8.3.jar"/>
+ <property name="driver.name.psql_8.4" value="postgresql-8.4.jar"/>
<property name="driver.name.sybase_15" value="jconn3.jar"/>
+ <property name="driver.name.sybase_15.5" value="jconn3-15.5.jar"/>
<property name="driver.name.oracle_10" value="ojdbc14.jar"/>
<property name="driver.name.oracle_11" value="ojdbc6.jar"/>
+ <property name="driver.name.oracle_11_rac" value="ojdbc6_rac.jar"/>
<property name="driver.name.db2_9.7" value="db2jcc.jar"/>
<property name="driver.name.mysql_5.0" value="mysql-connector-java-5.0.jar"/>
<property name="driver.name.mysql_5.1" value="mysql-connector-java-5.1.jar"/>
@@ -639,9 +663,12 @@
<target name="prepare-drivers">
<available file="${driver.home}/${driver.name.psql_8.2}" property="have.dbdriver.psql_8.2" value="true"/>
<available file="${driver.home}/${driver.name.psql_8.3}" property="have.dbdriver.psql_8.3" value="true"/>
+ <available file="${driver.home}/${driver.name.psql_8.4}" property="have.dbdriver.psql_8.4" value="true"/>
<available file="${driver.home}/${driver.name.sybase_15}" property="have.dbdriver.sybase_15" value="true"/>
+ <available file="${driver.home}/${driver.name.sybase_15.5}" property="have.dbdriver.sybase_15.5" value="true"/>
<available file="${driver.home}/${driver.name.oracle_10}" property="have.dbdriver.oracle_10" value="true"/>
<available file="${driver.home}/${driver.name.oracle_11}" property="have.dbdriver.oracle_11" value="true"/>
+ <available file="${driver.home}/${driver.name.oracle_11_rac}" property="have.dbdriver.oracle_11_rac" value="true"/>
<available file="${driver.home}/${driver.name.db2_9.7}" property="have.dbdriver.db2_9.7" value="true"/>
<available file="${driver.home}/${driver.name.mysql_5.0}" property="have.dbdriver.mysql_5.0" value="true"/>
<available file="${driver.home}/${driver.name.mysql_5.1}" property="have.dbdriver.mysql_5.1" value="true"/>
@@ -651,6 +678,10 @@
<or>
<istrue value="${want.oracle_11}"/>
<istrue value="${want.oracle_11_r2}"/>
+ </or>
+ </condition>
+ <condition property="want.dbdriver.oracle_11_rac">
+ <or>
<istrue value="${want.oracle_rac}"/>
<istrue value="${want.oracle_rac_lb}"/>
<istrue value="${want.oracle_rac_r2}"/>
@@ -665,57 +696,71 @@
<target name="get.drivers"
depends="get.driver.oracle_10,
get.driver.oracle_11,
+ get.driver.oracle_11_rac,
get.driver.mssql_2005,
get.driver.mssql_2008,
+ get.driver.psql_8.4,
get.driver.psql_8.3,
get.driver.psql_8.2,
get.driver.mysql_5.1,
get.driver.mysql_5.0,
get.driver.db2_9.7,
- get.driver.sybase_15" />
+ get.driver.sybase_15,
+ get.driver.sybase_15.5" />
<target name="get.driver.oracle_10" unless="have.dbdriver.oracle_10" if="want.oracle_10">
- <get src="${driver.url}/maven2/com/oracle/ojdbc14/10.2.0.4/ojdbc14-10.2.0.4.jar"
+ <get src="${driver.url}/oracle10g/jdbc4/ojdbc14.jar"
dest="${driver.home}/${driver.name.oracle_10}"/>
</target>
<target name="get.driver.oracle_11" unless="have.dbdriver.oracle_11" if="want.dbdriver.oracle_11">
- <get src="${driver.url}/maven2/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0.jar"
+ <get src="${driver.url}/oracle11gR1/jdbc4/ojdbc6.jar"
dest="${driver.home}/${driver.name.oracle_11}"/>
</target>
+ <target name="get.driver.oracle_11_rac" unless="have.dbdriver.oracle_11_rac" if="want.dbdriver.oracle_11_rac">
+ <get src="${driver.url}/oracle11gR2RAC/jdbc4/ojdbc6.jar"
+ dest="${driver.home}/${driver.name.oracle_11_rac}"/>
+ </target>
<target name="get.driver.mssql_2005" unless="have.dbdriver.mssql_2005" if="want.mssql_2005">
- <get src="${driver.url}/maven2/com/microsoft/sqlserver/msjdbc/2.0.1008.2/msjdbc-2.0.1008.2-4.jar"
+ <get src="${driver.url}/mssql2005/jdbc4/sqljdbc4.jar"
dest="${driver.home}/${driver.name.mssql_2005}"/>
</target>
<target name="get.driver.mssql_2008" unless="have.dbdriver.mssql_2008" if="want.mssql_2008">
- <get src="${driver.url}/maven2/com/microsoft/sqlserver/msjdbc/2.0.1008.2/msjdbc-2.0.1008.2-4.jar"
+ <get src="${driver.url}/mssql2008/jdbc4/sqljdbc4.jar"
dest="${driver.home}/${driver.name.mssql_2008}"/>
</target>
+ <target name="get.driver.psql_8.4" unless="have.dbdriver.psql_8.4" if="want.psql_8.4">
+ <get src="${driver.url}/postgresql84/jdbc3/postgresql-8.4-702.jdbc3.jar"
+ dest="${driver.home}/${driver.name.psql_8.4}"/>
+ </target>
<target name="get.driver.psql_8.3" unless="have.dbdriver.psql_8.3" if="want.psql_8.3">
- <get src="${driver.url}/maven2/postgresql/postgresql/8.3-605/postgresql-8.3-605.jar"
+ <get src="${driver.url}/postgresql83/jdbc3/postgresql-8.3-606.jdbc3.jar"
dest="${driver.home}/${driver.name.psql_8.3}"/>
</target>
<target name="get.driver.psql_8.2" unless="have.dbdriver.psql_8.2" if="want.psql_8.2">
- <get src="${driver.url}/maven2/postgresql/postgresql/8.2-510/postgresql-8.2-510.jar"
+ <get src="${driver.url}/postgresql82/jdbc3/postgresql-8.2-511.jdbc3.jar"
dest="${driver.home}/${driver.name.psql_8.2}"/>
</target>
<target name="get.driver.mysql_5.1" unless="have.dbdriver.mysql_5.1" if="want.mysql_5.1">
- <get src="${driver.url}/maven2/mysql/mysql-connector-java/5.1.12/mysql-connector-java-5.1.12.jar"
+ <get src="${driver.url}/mysql51/jdbc3/mysql-connector-java-5.1.13-bin.jar"
dest="${driver.home}/${driver.name.mysql_5.1}"/>
</target>
<target name="get.driver.mysql_5.0" unless="have.dbdriver.mysql_5.0" if="want.mysql_5.0">
- <get src="${driver.url}/maven2/mysql/mysql-connector-java/5.0.8/mysql-connector-java-5.0.8.jar"
+ <get src="${driver.url}/mysql50/jdbc3/mysql-connector-java-5.0.8-bin.jar"
dest="${driver.home}/${driver.name.mysql_5.0}"/>
</target>
<target name="get.driver.db2_9.7" unless="have.dbdriver.db2_9.7" if="want.db2_9.7">
- <!--get src="${driver.url}/maven2/com/ibm/db2jcc/3.57.86/db2jcc-3.57.86.jar"-->
- <get src="${driver.url}/maven2/com/ibm/db2jcc/3.58.82/db2jcc-3.58.82.jar"
+ <get src="${driver.url}/db2-97/jdbc3/db2jcc.jar"
dest="${driver.home}/${driver.name.db2_9.7}"/>
<!--get src="${driver.url}/maven2/com/ibm/db2jcc_license_cu/3.57.86/db2jcc_license_cu-3.57.86.jar"
dest="${driver.home}/db2jcc_license_cu.jar"/-->
</target>
<target name="get.driver.sybase_15" unless="have.dbdriver.sybase_15" if="want.sybase_15">
- <get src="${driver.url}/maven2/com/sybase/jconnect/6.0.5_26564/jconnect-6.0.5_26564.jar"
+ <get src="${driver.url}/sybase15/jdbc3/jconn3.jar"
dest="${driver.home}/${driver.name.sybase_15}"/>
</target>
+ <target name="get.driver.sybase_15.5" unless="have.dbdriver.sybase_15.5" if="want.sybase_15.5">
+ <get src="${driver.url}/sybase155/jdbc3/jconn3.jar"
+ dest="${driver.home}/${driver.name.sybase_15.5}"/>
+ </target>
</project>
More information about the jboss-cvs-commits
mailing list