[jboss-cvs] JBossAS SVN: r94452 - in branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery: scripts and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 7 04:41:50 EDT 2009
Author: istudens at redhat.com
Date: 2009-10-07 04:41:49 -0400 (Wed, 07 Oct 2009)
New Revision: 94452
Added:
branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-rac-lb-xa-ds.xml
Modified:
branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml
Log:
added tests for load-balanced XA conn to OracleRAC cluster, JBPAPP-2843
Added: branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-rac-lb-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-rac-lb-xa-ds.xml (rev 0)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/resources/oracle-rac-lb-xa-ds.xml 2009-10-07 08:41:49 UTC (rev 94452)
@@ -0,0 +1,38 @@
+<?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_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(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_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml 2009-10-07 06:42:08 UTC (rev 94451)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml 2009-10-07 08:41:49 UTC (rev 94452)
@@ -92,6 +92,9 @@
<condition property="want.oracle_rac">
<equals arg1="${crash.db}" arg2="oracle_rac"/>
</condition>
+ <condition property="want.oracle_rac_lb">
+ <equals arg1="${crash.db}" arg2="oracle_rac_lb"/>
+ </condition>
</target>
<target name="want-all-dbs">
@@ -193,6 +196,7 @@
<antcall target="call-tests-for-db2_9.7"/>
<antcall target="call-tests-for-sybase_15"/>
<antcall target="call-tests-for-oracle_rac"/>
+ <antcall target="call-tests-for-oracle_rac_lb"/>
</target>
<target name="call-tests-for-psql_8.2" if="want.psql_8.2">
@@ -220,39 +224,40 @@
</target>
<target name="call-tests-for-oracle_11" if="want.oracle_11">
- <!-- Oracle has qot different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="oracle.driver" value="ojdbc6.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="oracle.driver" value="ojdbc5.jar"/>
<antcall target="${call.target}">
- <param name="dbdriver" value="${oracle.driver}"/>
+ <param name="dbdriver" value="ojdbc6.jar"/>
<param name="datasource" value="oracle11-xa-ds.xml" />
<param name="dbname" value="oracle11" />
</antcall>
</target>
+ <target name="call-tests-for-oracle_rac" if="want.oracle_rac">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="ojdbc6.jar"/>
+ <param name="datasource" value="oracle-rac1-xa-ds.xml" />
+ <param name="dbname" value="oracle_rac" />
+ </antcall>
+ </target>
+
+ <target name="call-tests-for-oracle_rac_lb" if="want.oracle_rac_lb">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="ojdbc6.jar"/>
+ <param name="datasource" value="oracle-rac-lb-xa-ds.xml" />
+ <param name="dbname" value="oracle_rac_lb" />
+ </antcall>
+ </target>
+
<target name="call-tests-for-mssql_2005" if="want.mssql_2005">
- <!-- MSSQL needs different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="mssql.driver" value="sqljdbc4.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="mssql.driver" value="sqljdbc.jar"/>
<antcall target="${call.target}">
- <param name="dbdriver" value="${mssql.driver}"/>
+ <param name="dbdriver" value="sqljdbc4.jar"/>
<param name="datasource" value="mssql2005-xa-ds.xml" />
<param name="dbname" value="mssql2005" />
</antcall>
</target>
<target name="call-tests-for-mssql_2008" if="want.mssql_2008">
- <!-- MSSQL needs different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="mssql.driver" value="sqljdbc4.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="mssql.driver" value="sqljdbc.jar"/>
<antcall target="${call.target}">
- <param name="dbdriver" value="${mssql.driver}"/>
+ <param name="dbdriver" value="sqljdbc4.jar"/>
<param name="datasource" value="mssql2008-xa-ds.xml" />
<param name="dbname" value="mssql2008" />
</antcall>
@@ -306,18 +311,6 @@
</antcall>
</target>
- <target name="call-tests-for-oracle_rac" if="want.oracle_rac">
- <!-- Oracle has qot different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="oracle.driver" value="ojdbc6.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="oracle.driver" value="ojdbc5.jar"/>
- <antcall target="${call.target}">
- <param name="dbdriver" value="${oracle.driver}"/>
- <param name="datasource" value="oracle-rac1-xa-ds.xml" />
- <param name="dbname" value="oracle_rac" />
- </antcall>
- </target>
<target name="crash-tests-for-database" depends="crash-tests-for-database-cmt, crash-tests-for-database-bmt" />
@@ -595,23 +588,17 @@
<get src="${driver.url}/maven2/com/oracle/ojdbc14/10.2.0.4/ojdbc14-10.2.0.4.jar"
dest="${driver.home}/ojdbc14.jar"/>
- <get src="${driver.url}/maven2/com/oracle/ojdbc5/11.1.0.7.0/ojdbc5-11.1.0.7.0.jar"
- dest="${driver.home}/ojdbc5.jar"/>
<get src="${driver.url}/maven2/com/oracle/ojdbc6/11.1.0.7.0/ojdbc6-11.1.0.7.0.jar"
dest="${driver.home}/ojdbc6.jar"/>
- <get src="${driver.url}/maven2/com/microsoft/sqlserver/msjdbc/2.0.1008.2/msjdbc-2.0.1008.2.jar"
- dest="${driver.home}/sqljdbc.jar"/>
<get src="${driver.url}/maven2/com/microsoft/sqlserver/msjdbc/2.0.1008.2/msjdbc-2.0.1008.2-4.jar"
dest="${driver.home}/sqljdbc4.jar"/>
- <!-- FIXME postgresql v.8.3-605 and v.8.2-510-jdbc4 needed by EAP5 DB matrix -->
<get src="${driver.url}/maven2/postgresql/postgresql/8.3-604/postgresql-8.3-604-jdbc4.jar"
dest="${driver.home}/postgresql-8.3.jar"/>
<get src="${driver.url}/maven2/postgresql/postgresql/8.2-504/postgresql-8.2-504-jdbc3.jar"
dest="${driver.home}/postgresql-8.2.jar"/>
- <!-- FIXME mysql v.5.1.8 needed by EAP5 DB matrix -->
<get src="${driver.url}/maven2/mysql/mysql-connector-java/5.1.7/mysql-connector-java-5.1.7.jar"
dest="${driver.home}/mysql-connector-java-5.1.7.jar"/>
<get src="${driver.url}/maven2/mysql/mysql-connector-java/5.0.8/mysql-connector-java-5.0.8.jar"
@@ -622,7 +609,6 @@
<get src="${driver.url}/maven2/com/ibm/db2jcc_license_cu/3.1.57/db2jcc_license_cu-3.1.57.jar"
dest="${driver.home}/db2jcc_license_cu.jar"/>
- <!-- FIXME this one is build 26023, but we need build 26564 by EAP5 DB matrix -->
<get src="${driver.url}/maven2/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar"
dest="${driver.home}/jconn3.jar"/>
More information about the jboss-cvs-commits
mailing list