[jboss-cvs] JBossAS SVN: r108447 - in branches/JBPAPP_5_1/testsuite: src/resources/jbossts/resources and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 5 09:52:52 EDT 2010
Author: istudens at redhat.com
Date: 2010-10-05 09:52:51 -0400 (Tue, 05 Oct 2010)
New Revision: 108447
Added:
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml
Modified:
branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
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:
support for sybase 15.5 added to JBQA-2176
Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2010-10-05 12:01:36 UTC (rev 108446)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2010-10-05 13:52:51 UTC (rev 108447)
@@ -50,7 +50,12 @@
|
| Note 1: The 'jbossts.credentials' prop is useless in connection with -Djbossts.db=[oracle_rac|oracle_rac_r2].
| Note 2: If you want to force the wiping out any txs in doubt from DB before the test you can use the property -DwipeOutTxsInDoubtBeforeTest=true.
- | Note 3: For EWP, use '-Djbossts.jtaonly=true' to prepare only jta profile in the AS server. Otherwise both JTA/JTS profiles are always created/checked.
+ | Note 3: For EWP, use '-Djbossts.jtaonly=true' to prepare only jta profile in the AS server. Otherwise both JTA/JTS profiles are always created/checked.
+ |
+ | Possible values for the jbossts.db parameter are:
+ | psql_8.2 psql_8.3 psql_8.4 psql_9.0 sybase_15 sybase_15.5 oracle_10 oracle_11 oracle_11_r2 db2_9.7
+ | mysql_5.0 mysql_5.1 mssql_2005 mssql_2008 oracle_rac oracle_rac_lb oracle_rac_r2 oracle_rac_r2_lb
+ | Data-sources related to these DBs can be found in src/resources/jbossts/resources/.
-->
<target name="tests-ts-crash-recovery" depends="tests-ts-crash-recovery-jpa"
description="Runs JBossTS crash recovery tests" />
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-10-05 12:01:36 UTC (rev 108446)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2010-10-05 13:52:51 UTC (rev 108447)
@@ -19,9 +19,6 @@
<xa-datasource-property name="PortNumber">5000</xa-datasource-property>
<xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
@CREDENTIALS@
- <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_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml 2010-10-05 13:52:51 UTC (rev 108447)
@@ -0,0 +1,28 @@
+<?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.jdbc4.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>
+ @CREDENTIALS@
+ <!--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_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-10-05 12:01:36 UTC (rev 108446)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-10-05 13:52:51 UTC (rev 108447)
@@ -69,6 +69,9 @@
<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>
@@ -113,6 +116,7 @@
<property name="want.psql_8.4" value="true" />
<property name="want.psql_9.0" 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" />
@@ -195,7 +199,7 @@
<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-psql_9.0"/>
+ <!--antcall target="call-tests-for-psql_9.0"/-->
<antcall target="call-tests-for-oracle_10"/>
<antcall target="call-tests-for-oracle_11"/>
<antcall target="call-tests-for-oracle_11_r2"/>
@@ -205,6 +209,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"/>
@@ -349,6 +354,13 @@
</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}"/>
+ <param name="datasource" value="sybase15.5-xa-ds.xml" />
+ <param name="dbname" value="sybase15.5" />
+ </antcall>
+ </target>
<target name="crash-tests-for-tstype" depends="crash-tests-for-tstype-jta, crash-tests-for-tstype-jts" />
@@ -706,6 +718,12 @@
<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"/>
+ <condition property="want.dbdriver.sybase_15">
+ <or>
+ <istrue value="${want.sybase_15}"/>
+ <istrue value="${want.sybase_15.5}"/>
+ </or>
+ </condition>
<condition property="want.dbdriver.oracle_11">
<or>
<istrue value="${want.oracle_11}"/>
@@ -753,12 +771,10 @@
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="http://reports.qa.atl.jboss.com/jdbc-drivers/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="http://reports.qa.atl.jboss.com/jdbc-drivers/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>
@@ -790,7 +806,7 @@
<get src="${driver.url}/db2-97/jdbc4/db2jcc4.jar"
dest="${driver.home}/${driver.name.db2_9.7}"/>
</target>
- <target name="get.driver.sybase_15" unless="have.dbdriver.sybase_15" if="want.sybase_15">
+ <target name="get.driver.sybase_15" unless="have.dbdriver.sybase_15" if="want.dbdriver.sybase_15">
<get src="${driver.url}/sybase15/jdbc4/jconn4-26502.jar"
dest="${driver.home}/${driver.name.sybase_15}"/>
</target>
More information about the jboss-cvs-commits
mailing list