[jboss-cvs] JBossAS SVN: r105579 - in branches/JBPAPP_5_1/testsuite/src/resources/jbossts: scripts and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 2 08:17:07 EDT 2010
Author: istudens at redhat.com
Date: 2010-06-02 08:17:05 -0400 (Wed, 02 Jun 2010)
New Revision: 105579
Modified:
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
db drivers for jbossts recovery tests taken from www.qa.jboss.com, JBQA-2176
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2010-06-02 12:16:04 UTC (rev 105578)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2010-06-02 12:17:05 UTC (rev 105579)
@@ -13,7 +13,7 @@
<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-class>com.sybase.jdbc4.jdbc.SybXADataSource</xa-datasource-class>
<xa-datasource-property name="NetworkProtocol">Tds</xa-datasource-property>
<xa-datasource-property name="ServerName">vmg07.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">5000</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-06-02 12:16:04 UTC (rev 105578)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-06-02 12:17:05 UTC (rev 105579)
@@ -269,7 +269,7 @@
<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="dbdriver" value="${driver.name.oracle_11_rac}"/>
<param name="datasource" value="oracle-rac1-xa-ds.xml" />
<param name="dbname" value="oracle_rac" />
</antcall>
@@ -277,7 +277,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" />
</antcall>
@@ -285,7 +285,7 @@
<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="dbdriver" value="${driver.name.oracle_11_rac}"/>
<param name="datasource" value="oracle-rac-r2-1-xa-ds.xml" />
<param name="dbname" value="oracle_rac_r2" />
</antcall>
@@ -293,7 +293,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" />
</antcall>
@@ -595,8 +595,6 @@
<target name="hack-after-astest-run" depends="hack-after-astest-run-for-db2_9.7, hack-after-astest-run-for-oracle_rac, hack-after-astest-run-for-oracle_rac_r2" />
<target name="hack-before-astest-run-for-db2_9.7" if="want.db2_9.7">
- <!-- deploy license .jar file
- <copy file="${product.dir}/dbdrivers/db2jcc_license_cu.jar" todir="${jboss.home}/server/crashrecovery-${tstype}/lib" /-->
<!-- prepare hacked astest jar -->
<property name="astest.alternative.jar.name" value="db2-${astest.jar.name}" />
@@ -625,8 +623,6 @@
</target>
<target name="hack-after-astest-run-for-db2_9.7" if="want.db2_9.7">
- <!-- undeploy license .jar file
- <delete file="${jboss.home}/server/crashrecovery-${tstype}/lib/db2jcc_license_cu.jar" /-->
</target>
@@ -702,19 +698,20 @@
<!-- ===== get db drivers ==== -->
<!-- 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/5.0.1"/>
<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.psql_9.0" value="postgresql-9.0.jar"/>
- <property name="driver.name.sybase_15" value="jconn3.jar"/>
+ <property name="driver.name.sybase_15" value="jconn4.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"/>
- <property name="driver.name.mssql_2005" value="sqljdbc4.jar"/>
- <property name="driver.name.mssql_2008" value="sqljdbc4.jar"/>
+ <property name="driver.name.mssql_2005" value="sqljdbc4_2005.jar"/>
+ <property name="driver.name.mssql_2008" value="sqljdbc4_2008.jar"/>
<target name="prepare-drivers">
<available file="${driver.home}/${driver.name.psql_8.2}" property="have.dbdriver.psql_8.2" value="true"/>
@@ -724,6 +721,7 @@
<available file="${driver.home}/${driver.name.sybase_15}" property="have.dbdriver.sybase_15" 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"/>
@@ -733,12 +731,16 @@
<or>
<istrue value="${want.oracle_11}"/>
<istrue value="${want.oracle_11_r2}"/>
- <istrue value="${want.oracle_rac}"/>
- <istrue value="${want.oracle_rac_lb}"/>
- <istrue value="${want.oracle_rac_r2}"/>
- <istrue value="${want.oracle_rac_r2_lb}"/>
</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}"/>
+ <istrue value="${want.oracle_rac_r2_lb}"/>
+ </or>
+ </condition>
<mkdir dir="${driver.home}" />
<antcall target="get.drivers" />
@@ -746,66 +748,69 @@
<target name="get.drivers"
depends="get.driver.oracle_10,
- get.driver.oracle_11,
+ get.driver.oracle_11,
+ get.driver.oracle_11_rac,
get.driver.mssql_2005,
- get.driver.mssql_2008,
- get.driver.psql_9.0,
- get.driver.psql_8.4,
- get.driver.psql_8.3,
- get.driver.psql_8.2,
- get.driver.mysql_5.1,
+ get.driver.mssql_2008,
+ get.driver.psql_9.0,
+ 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.db2_9.7,
+ get.driver.sybase_15" />
<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}/oracle11g/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}/oracle11gRAC/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/jdbc3/sqljdbc.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}/postgresql-8.3-605.jdbc4.jar"
+ <get src="${driver.url}/postgresql83/jdbc4/postgresql-8.3-605.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_8.4}"/>
</target>
<target name="get.driver.psql_9.0" unless="have.dbdriver.psql_9.0" if="want.psql_9.0">
- <get src="${driver.url}/postgresql-8.3-605.jdbc4.jar"
+ <get src="${driver.url}/postgresql83/jdbc4/postgresql-8.3-605.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_9.0}"/>
</target>
<target name="get.driver.psql_8.3" unless="have.dbdriver.psql_8.3" if="want.psql_8.3">
- <get src="${driver.url}/postgresql-8.3-605.jdbc4.jar"
+ <get src="${driver.url}/postgresql83/jdbc4/postgresql-8.3-605.jdbc4.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}/postgresql-8.2-510.jdbc4.jar"
+ <get src="${driver.url}/postgresql82/jdbc4/postgresql-8.2-510.jdbc4.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/jdbc4/mysql-connector-java-5.1.12-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/jdbc4/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}/db2-97/jdbc4/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/jdbc4/jconn4.jar"
dest="${driver.home}/${driver.name.sybase_15}"/>
</target>
More information about the jboss-cvs-commits
mailing list