[jboss-cvs] JBossAS SVN: r111813 - 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
Fri Jul 22 04:08:16 EDT 2011
Author: istudens at redhat.com
Date: 2011-07-22 04:08:16 -0400 (Fri, 22 Jul 2011)
New Revision: 111813
Added:
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mssql2008-r2-xa-ds.xml
Modified:
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
updating db defs for crash rec tests according to eap5.1.1 requirements, JBQA-2176
Added: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mssql2008-r2-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mssql2008-r2-xa-ds.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mssql2008-r2-xa-ds.xml 2011-07-22 08:08:16 UTC (rev 111813)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- JBoss Server Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: mssql-xa-ds.xml 77479 2008-08-26 10:33:09Z alex.loubyansky at jboss.com $ -->
+ <!-- ==================================================================== -->
+ <!-- ConnectionManager setup for xa Microsoft SQL Server 2005, using -->
+ <!-- Microsoft's JDBC driver. -->
+ <!-- Thanks to Benjamin Geer <benjamin.geer at misys.com> -->
+ <!-- Be sure to set the JndiName property to the name you want to look up -->
+ <!-- the datasource under and set the location of your database in -->
+ <!-- the xa-datasource-property section. -->
+ <!-- Further information about the Microsoft JDBC Driver version 1.1 -->
+ <!-- can be found here: -->
+ <!-- http://msdn2.microsoft.com/en-us/library/aa496082.aspx -->
+ <!-- ==================================================================== -->
+
+
+<datasources>
+ <xa-datasource>
+ <jndi-name>CrashRecoveryDS</jndi-name>
+ <!-- uncomment to enable interleaving <interleaving/> -->
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <xa-datasource-class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</xa-datasource-class>
+ <xa-datasource-property name="ServerName">mssql01.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">1433</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
+ @CREDENTIALS@
+ <xa-datasource-property name="SelectMethod">cursor</xa-datasource-property>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>MS SQLSERVER2000</type-mapping>
+ </metadata>
+ </xa-datasource>
+
+</datasources>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml 2011-07-21 13:28:29 UTC (rev 111812)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml 2011-07-22 08:08:16 UTC (rev 111813)
@@ -19,6 +19,7 @@
<new-connection-sql>some arbitrary sql</new-connection-sql>
-->
<valid-connection-checker-class-name>com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker</valid-connection-checker-class-name>
+ <transaction-isolation>TRANSACTION_SERIALIZABLE</transaction-isolation>
<!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
<metadata>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2011-07-21 13:28:29 UTC (rev 111812)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2011-07-22 08:08:16 UTC (rev 111813)
@@ -19,6 +19,7 @@
<new-connection-sql>some arbitrary sql</new-connection-sql>
-->
<valid-connection-checker-class-name>com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker</valid-connection-checker-class-name>
+ <transaction-isolation>TRANSACTION_SERIALIZABLE</transaction-isolation>
<!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
<metadata>
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 2011-07-21 13:28:29 UTC (rev 111812)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2011-07-22 08:08:16 UTC (rev 111813)
@@ -96,6 +96,9 @@
<condition property="want.mssql_2008">
<equals arg1="${jbossts.db}" arg2="mssql_2008"/>
</condition>
+ <condition property="want.mssql_2008_r2">
+ <equals arg1="${jbossts.db}" arg2="mssql_2008_r2"/>
+ </condition>
<condition property="want.oracle_rac">
<equals arg1="${jbossts.db}" arg2="oracle_rac"/>
</condition>
@@ -125,6 +128,7 @@
<property name="want.mysql_5.1" value="true" />
<property name="want.mssql_2005" value="true" />
<property name="want.mssql_2008" value="true" />
+ <property name="want.mssql_2008_r2" value="true" />
<property name="want.oracle_rac" value="true" />
<property name="want.oracle_rac_lb" value="true" />
<property name="want.oracle_rac_r2" value="true" />
@@ -205,6 +209,7 @@
<antcall target="call-tests-for-oracle_11_r2"/>
<antcall target="call-tests-for-mssql_2005"/>
<antcall target="call-tests-for-mssql_2008"/>
+ <antcall target="call-tests-for-mssql_2008_r2"/>
<antcall target="call-tests-for-mysql_5.0"/>
<antcall target="call-tests-for-mysql_5.1"/>
<antcall target="call-tests-for-db2_9.7"/>
@@ -322,6 +327,14 @@
</antcall>
</target>
+ <target name="call-tests-for-mssql_2008_r2" if="want.mssql_2008_r2">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="${driver.name.mssql_2008_r2}"/>
+ <param name="datasource" value="mssql2008-r2-xa-ds.xml" />
+ <param name="dbname" value="mssql2008-r2" />
+ </antcall>
+ </target>
+
<target name="call-tests-for-mysql_5.0" if="want.mysql_5.0">
<antcall target="${call.target}">
<param name="dbdriver" value="${driver.name.mysql_5.0}"/>
@@ -715,6 +728,7 @@
<property name="driver.name.mysql_5.1" value="mysql-connector-java-5.1.jar"/>
<property name="driver.name.mssql_2005" value="sqljdbc4_2005.jar"/>
<property name="driver.name.mssql_2008" value="sqljdbc4_2008.jar"/>
+ <property name="driver.name.mssql_2008_r2" value="sqljdbc4_2008_r2.jar"/>
<target name="prepare-drivers">
<available file="${driver.home}/${driver.name.psql_8.2}" property="have.dbdriver.psql_8.2" value="true"/>
@@ -730,6 +744,7 @@
<available file="${driver.home}/${driver.name.mysql_5.1}" property="have.dbdriver.mysql_5.1" value="true"/>
<available file="${driver.home}/${driver.name.mssql_2005}" property="have.dbdriver.mssql_2005" value="true"/>
<available file="${driver.home}/${driver.name.mssql_2008}" property="have.dbdriver.mssql_2008" value="true"/>
+ <available file="${driver.home}/${driver.name.mssql_2008_r2}" property="have.dbdriver.mssql_2008_r2" value="true"/>
<condition property="want.dbdriver.sybase_15">
<or>
<istrue value="${want.sybase_15}"/>
@@ -761,6 +776,7 @@
get.driver.oracle_11_rac,
get.driver.mssql_2005,
get.driver.mssql_2008,
+ get.driver.mssql_2008_r2,
get.driver.psql_9.0,
get.driver.psql_8.4,
get.driver.psql_8.3,
@@ -787,9 +803,13 @@
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}/mssql2008/jdbc4/sqljdbc4.jar"
+ <get src="${driver.url}/mssql2008R1/jdbc4/sqljdbc4.jar"
dest="${driver.home}/${driver.name.mssql_2008}"/>
</target>
+ <target name="get.driver.mssql_2008_r2" unless="have.dbdriver.mssql_2008_r2" if="want.mssql_2008_r2">
+ <get src="${driver.url}/mssql2008R2/jdbc4/sqljdbc4.jar"
+ dest="${driver.home}/${driver.name.mssql_2008_r2}"/>
+ </target>
<target name="get.driver.psql_8.4" unless="have.dbdriver.psql_8.4" if="want.psql_8.4">
<get src="${driver.url}/postgresql84/jdbc4/postgresql-8.4-702.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_8.4}"/>
More information about the jboss-cvs-commits
mailing list