[jboss-cvs] JBossAS SVN: r114797 - in branches/JBPAPP_5/testsuite: src/resources/jbossts/resources and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 9 04:21:53 EDT 2014
Author: ochaloup
Date: 2014-04-09 04:21:52 -0400 (Wed, 09 Apr 2014)
New Revision: 114797
Added:
branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml
branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml
Modified:
branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml
branches/JBPAPP_5/testsuite/imports/config/tests-jts-propagation.xml
branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml
branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
Adding oracle12c as supported database under crash recovery tests
Modified: branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml 2014-04-04 08:45:36 UTC (rev 114796)
+++ branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml 2014-04-09 08:21:52 UTC (rev 114797)
@@ -14,7 +14,7 @@
<property name="jbossts.base.jta.server.profile" value="default" />
<property name="jbossts.base.jts.server.profile" value="all" />
<!-- default for driver url passing to src/resources/jbossts/scripts/as-tests.xml -->
- <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.2.0" />
+ <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.3.0" />
<!--
| Targets
@@ -57,8 +57,8 @@
| 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
+ | psql_8.2 psql_8.3 psql_8.4 psql_9.0 sybase_15 sybase_15.5 oracle_10 oracle_11 oracle_11_r2 oracle_12c db2_9.7
+ | mysql_5.0 mysql_5.1 mysql_5.5 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"
Modified: branches/JBPAPP_5/testsuite/imports/config/tests-jts-propagation.xml
===================================================================
--- branches/JBPAPP_5/testsuite/imports/config/tests-jts-propagation.xml 2014-04-04 08:45:36 UTC (rev 114796)
+++ branches/JBPAPP_5/testsuite/imports/config/tests-jts-propagation.xml 2014-04-09 08:21:52 UTC (rev 114797)
@@ -45,7 +45,7 @@
<property name="jbossts.target" value="jts-propagation-tests" />
<property name="jbossts.max.time" value="300000" />
<property name="jbossts.db" value="psql_9.1" />
- <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.2.0/" />
+ <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.3.0/" />
<antcall target="prepare-jts-propogation-profiles" />
Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Modified: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
===================================================================
--- branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2014-04-04 08:45:36 UTC (rev 114796)
+++ branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2014-04-09 08:21:52 UTC (rev 114797)
@@ -9,7 +9,7 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
- <xa-datasource-property name="ServerName">db01.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="ServerName">vmg02.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">3306</xa-datasource-property>
<xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
@CREDENTIALS@
Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml
===================================================================
--- branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml (rev 0)
+++ branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml 2014-04-09 08:21:52 UTC (rev 114797)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: mysql-ds.xml 88948 2009-05-15 14:09:08Z jesper.pedersen $ -->
+<!-- Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
+
+<datasources>
+ <xa-datasource>
+ <jndi-name>CrashRecoveryDS</jndi-name>
+ <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
+ <xa-datasource-property name="ServerName">db01.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">3306</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
+ @CREDENTIALS@
+ <exception-sorter-class-name>com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter</exception-sorter-class-name>
+ <!-- sql to call when connection is created
+ <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>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+ </xa-datasource>
+</datasources>
+
Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml
===================================================================
--- branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml (rev 0)
+++ branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml 2014-04-09 08:21:52 UTC (rev 114797)
@@ -0,0 +1,36 @@
+<?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>
+ <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:@dev151.mw.lab.eng.bos.redhat.com:1521:qaora12</xa-datasource-property>
+ @CREDENTIALS@
+ <!-- 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>
Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Modified: branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml 2014-04-04 08:45:36 UTC (rev 114796)
+++ branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml 2014-04-09 08:21:52 UTC (rev 114797)
@@ -96,6 +96,21 @@
<condition property="want.oracle_11_r2">
<equals arg1="${jbossts.db}" arg2="oracle_11_r2"/>
</condition>
+ <condition property="want.oracle_12c">
+ <equals arg1="${jbossts.db}" arg2="oracle_12c"/>
+ </condition>
+ <condition property="want.oracle_rac">
+ <equals arg1="${jbossts.db}" arg2="oracle_rac"/>
+ </condition>
+ <condition property="want.oracle_rac_lb">
+ <equals arg1="${jbossts.db}" arg2="oracle_rac_lb"/>
+ </condition>
+ <condition property="want.oracle_rac_r2">
+ <equals arg1="${jbossts.db}" arg2="oracle_rac_r2"/>
+ </condition>
+ <condition property="want.oracle_rac_r2_lb">
+ <equals arg1="${jbossts.db}" arg2="oracle_rac_r2_lb"/>
+ </condition>
<condition property="want.db2_9.7">
<equals arg1="${jbossts.db}" arg2="db2_9.7"/>
</condition>
@@ -105,6 +120,9 @@
<condition property="want.mysql_5.1">
<equals arg1="${jbossts.db}" arg2="mysql_5.1"/>
</condition>
+ <condition property="want.mysql_5.5">
+ <equals arg1="${jbossts.db}" arg2="mysql_5.5"/>
+ </condition>
<condition property="want.mssql_2005">
<equals arg1="${jbossts.db}" arg2="mssql_2005"/>
</condition>
@@ -117,18 +135,6 @@
<condition property="want.mssql_2012">
<equals arg1="${jbossts.db}" arg2="mssql_2012"/>
</condition>
- <condition property="want.oracle_rac">
- <equals arg1="${jbossts.db}" arg2="oracle_rac"/>
- </condition>
- <condition property="want.oracle_rac_lb">
- <equals arg1="${jbossts.db}" arg2="oracle_rac_lb"/>
- </condition>
- <condition property="want.oracle_rac_r2">
- <equals arg1="${jbossts.db}" arg2="oracle_rac_r2"/>
- </condition>
- <condition property="want.oracle_rac_r2_lb">
- <equals arg1="${jbossts.db}" arg2="oracle_rac_r2_lb"/>
- </condition>
</target>
<target name="want-all-dbs">
@@ -144,17 +150,19 @@
<property name="want.oracle_10" value="true" />
<property name="want.oracle_11" value="true" />
<property name="want.oracle_11_r2" value="true" />
+ <property name="want.oracle_12c" 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" />
+ <property name="want.oracle_rac_r2_lb" value="true" />
<property name="want.db2_9.7" value="true" />
<property name="want.mysql_5.0" value="true" />
<property name="want.mysql_5.1" value="true" />
+ <property name="want.mysql_5.5" 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.mssql_2012" 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" />
- <property name="want.oracle_rac_r2_lb" value="true" />
</target>
<target name="set-tstype">
@@ -232,19 +240,21 @@
<antcall target="call-tests-for-oracle_10"/>
<antcall target="call-tests-for-oracle_11"/>
<antcall target="call-tests-for-oracle_11_r2"/>
+ <antcall target="call-tests-for-oracle_12c"/>
+ <antcall target="call-tests-for-oracle_rac"/>
+ <antcall target="call-tests-for-oracle_rac_lb"/>
+ <antcall target="call-tests-for-oracle_rac_r2"/>
+ <antcall target="call-tests-for-oracle_rac_r2_lb"/>
<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-mssql_2012"/>
<antcall target="call-tests-for-mysql_5.0"/>
<antcall target="call-tests-for-mysql_5.1"/>
+ <antcall target="call-tests-for-mysql_5.5"/>
<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"/>
- <antcall target="call-tests-for-oracle_rac_r2_lb"/>
</target>
<target name="call-tests-for-psql_8.2" if="want.psql_8.2">
@@ -327,6 +337,14 @@
</antcall>
</target>
+ <target name="call-tests-for-oracle_12c" if="want.oracle_12c">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="${driver.name.oracle_12c}"/>
+ <param name="datasource" value="oracle12c-xa-ds.xml" />
+ <param name="dbname" value="oracle12c" />
+ </antcall>
+ </target>
+
<target name="call-tests-for-oracle_rac" if="want.oracle_rac">
<antcall target="${call.target}">
<param name="dbdriver" value="${driver.name.oracle_11_rac}"/>
@@ -395,7 +413,7 @@
<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}"/>
+ <param name="dbdriver" value="${driver.name.mysql_5}"/>
<param name="datasource" value="mysql50-xa-ds.xml" />
<param name="dbname" value="mysql50" />
</antcall>
@@ -403,12 +421,20 @@
<target name="call-tests-for-mysql_5.1" if="want.mysql_5.1">
<antcall target="${call.target}">
- <param name="dbdriver" value="${driver.name.mysql_5.1}"/>
+ <param name="dbdriver" value="${driver.name.mysql_5}"/>
<param name="datasource" value="mysql51-xa-ds.xml" />
<param name="dbname" value="mysql51" />
</antcall>
</target>
+ <target name="call-tests-for-mysql_5.5" if="want.mysql_5.5">
+ <antcall target="${call.target}">
+ <param name="dbdriver" value="${driver.name.mysql_5}"/>
+ <param name="datasource" value="mysql55-xa-ds.xml" />
+ <param name="dbname" value="mysql55" />
+ </antcall>
+ </target>
+
<target name="call-tests-for-db2_9.7" if="want.db2_9.7">
<antcall target="${call.target}">
<param name="dbdriver" value="${driver.name.db2_9.7}" />
@@ -459,7 +485,7 @@
<target name="crash-tests-all-testcases"
depends="testcase-none,
testcase-none-rev,
- testcase-prepare_ex,
+ testcase-prepare_ex,
testcase-prepare_ex-rev,
testcase-prepare_halt,
testcase-prepare_halt-rev,
@@ -684,18 +710,33 @@
</sequential>
</macrodef>
- <target name="hack-before-astest-run" depends="hack-before-astest-run-for-db2_9.7" />
+ <target name="hack-before-astest-run" depends="hack-before-astest-run-for-db2_9.7, hack-before-astest-run-for-oracle_12c, hack-before-astest-run-for-postgresplus92" />
<target name="hack-after-astest-run" depends="hack-after-astest-run-for-db2_9.7" />
<target name="hack-before-astest-run-for-db2_9.7" if="want.db2_9.7">
<!-- prepare hacked astest jar -->
<property name="astest.alternative.jar.name" value="db2-${astest.jar.name}" />
-
<available file="${astest.jar.dir}/${astest.alternative.jar.name}"
property="have.db2.astest.alternative.jar" />
<antcall target="prepare-db2-alternative-jar" />
</target>
+
+ <target name="hack-before-astest-run-for-oracle_12c" if="want.oracle_12c">
+ <property name="astest.alternative.jar.name" value="oracle12c-${astest.jar.name}" />
+ <available file="${astest.jar.dir}/${astest.alternative.jar.name}" property="have.oracle12c.astest.alternative.jar" />
+ <antcall target="prepare-alternative-persistence-xml" />
+ <antcall target="change-hibernate-dialect-to-oracle" />
+ <antcall target="pack-alternative-jar" />
+ </target>
+
+ <target name="hack-before-astest-run-for-postgresplus92" if="want.psqlplus_9.2">
+ <property name="astest.alternative.jar.name" value="psqlplus92-${astest.jar.name}" />
+ <available file="${astest.jar.dir}/${astest.alternative.jar.name}" property="have.psqlplus92.astest.alternative.jar" />
+ <antcall target="prepare-alternative-persistence-xml" />
+ <antcall target="change-hibernate-dialect-to-postgresplus" />
+ <antcall target="pack-alternative-jar" />
+ </target>
<target name="prepare-db2-alternative-jar" unless="have.db2.astest.alternative.jar">
<mkdir dir="${astest.jar.dir}/${astest.alternative.jar.name}_content"/>
@@ -703,6 +744,21 @@
<available file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml"
property="have.persistence.xml" />
<antcall target="change-hbm2ddl-update-to-none" />
+ <antcall target="pack-alternative-jar" />
+ </target>
+
+ <target name="change-hbm2ddl-update-to-none" if="have.persistence.xml">
+ <replace file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml" summary="true">
+ <replacetoken><![CDATA[name="hibernate.hbm2ddl.auto" value="update"]]></replacetoken>
+ <replacevalue><![CDATA[name="hibernate.hbm2ddl.auto" value="none" ]]></replacevalue>
+ </replace>
+ </target>
+
+ <target name="hack-after-astest-run-for-db2_9.7" if="want.db2_9.7">
+ <!-- nothing to do here -->
+ </target>
+
+ <target name="pack-alternative-jar">
<!-- delete possible jar signature -->
<delete>
<fileset dir="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF">
@@ -720,18 +776,30 @@
<param name="file" value="${astest.jar.dir}/${astest.alternative.jar.name}"/>
</antcall>
</target>
+
+ <target name="prepare-alternative-persistence-xml">
+ <mkdir dir="${astest.jar.dir}/${astest.alternative.jar.name}_content"/>
+ <unjar src="${astest.jar.dir}/${astest.jar.name}" dest="${astest.jar.dir}/${astest.alternative.jar.name}_content" />
+ <available file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml" property="have.persistence.xml" />
+ </target>
- <target name="change-hbm2ddl-update-to-none" if="have.persistence.xml">
+ <target name="change-hibernate-dialect-to-oracle">
<replace file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml" summary="true">
- <replacetoken><![CDATA[name="hibernate.hbm2ddl.auto" value="update"]]></replacetoken>
- <replacevalue><![CDATA[name="hibernate.hbm2ddl.auto" value="none" ]]></replacevalue>
+ <replacetoken><![CDATA[<properties>]]></replacetoken>
+ <replacevalue><![CDATA[<properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.Oracle10gDialect" />
+ ]]></replacevalue>
</replace>
</target>
-
- <target name="hack-after-astest-run-for-db2_9.7" if="want.db2_9.7">
- <!-- nothing to do here -->
+
+ <target name="change-hibernate-dialect-to-postgresplus">
+ <replace file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml" summary="true">
+ <replacetoken><![CDATA[<properties>]]></replacetoken>
+ <replacevalue><![CDATA[<properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.PostgresPlusDialect" />
+ ]]></replacevalue>
+ </replace>
</target>
-
<!--
Do use this target if you want to wipe out txs in doubt in all databases.
@@ -777,25 +845,25 @@
<!-- ===== get db drivers ==== -->
<!-- set these to the location(s) of the database drivers -->
- <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.2.0"/>
+ <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.3.0"/>
<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.psql_9.1" value="postgresql-9.1.jar"/>
- <property name="driver.name.psql_9.2" value="postgresql-9.2.jar"/> <!-- driver.url is http://www.qa.jboss.com/jdbc-drivers-products/EAP/6.2.0 -->
- <property name="driver.name.psqlplus_9.2" value="postgresqlplus-9.2.jar"/> <!-- driver.url is http://www.qa.jboss.com/jdbc-drivers-products/EAP/6.2.0 -->
+ <property name="driver.name.psql_9.2" value="postgresql-9.2.jar"/>
+ <property name="driver.name.psqlplus_9.2" value="postgresqlplus-9.2.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_12c" 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.mysql_5" value="mysql-connector-java-5.0.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"/>
- <property name="driver.name.mssql_2012" value="sqljdbc4_20012.jar"/> <!-- driver.url is http://www.qa.jboss.com/jdbc-drivers-products/EAP/6.2.0 -->
+ <property name="driver.name.mssql_2012" value="sqljdbc4_20012.jar"/>
<target name="prepare-drivers">
<available file="${driver.home}/${driver.name.psql_8.2}" property="have.dbdriver.psql_8.2" value="true"/>
@@ -809,9 +877,9 @@
<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.oracle_12c}" property="have.dbdriver.oracle_12c" 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"/>
+ <available file="${driver.home}/${driver.name.mysql_5}" property="have.dbdriver.mysql_5" 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"/>
@@ -836,7 +904,14 @@
<istrue value="${want.oracle_rac_r2_lb}"/>
</or>
</condition>
-
+ <condition property="want.dbdriver.mysql_5">
+ <or>
+ <istrue value="${want.mysql_5.0}"/>
+ <istrue value="${want.mysql_5.1}"/>
+ <istrue value="${want.mysql_5.5}"/>
+ </or>
+ </condition>
+
<mkdir dir="${driver.home}" />
<antcall target="get.drivers" />
</target>
@@ -845,6 +920,7 @@
depends="get.driver.oracle_10,
get.driver.oracle_11,
get.driver.oracle_11_rac,
+ get.driver.oracle_12c,
get.driver.mssql_2005,
get.driver.mssql_2008,
get.driver.mssql_2008_r2,
@@ -857,8 +933,7 @@
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.mysql_5,
get.driver.db2_9.7,
get.driver.sybase_15" />
@@ -870,6 +945,10 @@
<get src="${driver.url}/oracle11gR1/jdbc4/ojdbc6.jar"
dest="${driver.home}/${driver.name.oracle_11}"/>
</target>
+ <target name="get.driver.oracle_12c" unless="have.dbdriver.oracle_12c" if="want.oracle_12c">
+ <get src="${driver.url}/oracle12c/jdbc4/ojdbc6.jar"
+ dest="${driver.home}/${driver.name.oracle_12c}"/>
+ </target>
<target name="get.driver.oracle_11_rac" unless="have.dbdriver.oracle_11_rac" if="want.dbdriver.oracle_11_rac">
<get src="${driver.url}/oracle11gR1RAC/jdbc4/ojdbc6.jar"
dest="${driver.home}/${driver.name.oracle_11_rac}"/>
@@ -890,42 +969,38 @@
<get src="${driver.url}/mssql2012/jdbc4/sqljdbc4.jar"
dest="${driver.home}/${driver.name.mssql_2012}"/>
</target>
+ <target name="get.driver.psql_8.2" unless="have.dbdriver.psql_8.2" if="want.psql_8.2">
+ <get src="${driver.url}/postgresql82/jdbc4/postgresql-9.3-1100.jdbc4.jar"
+ dest="${driver.home}/${driver.name.psql_8.2}"/>
+ </target>
+ <target name="get.driver.psql_8.3" unless="have.dbdriver.psql_8.3" if="want.psql_8.3">
+ <get src="${driver.url}/postgresql83/jdbc4/postgresql-9.3-1100.jdbc4.jar"
+ dest="${driver.home}/${driver.name.psql_8.3}"/>
+ </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-703.jdbc4.jar"
+ <get src="${driver.url}/postgresql84/jdbc4/postgresql-9.3-1100.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}/postgresql91/jdbc4/postgresql-9.1-902.jdbc4.jar"
+ <get src="${driver.url}/postgresql91/jdbc4/postgresql-9.3-1100.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}/postgresql83/jdbc4/postgresql-8.3-607.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}/postgresql82/jdbc4/postgresql-8.2-511.jdbc4.jar"
- dest="${driver.home}/${driver.name.psql_8.2}"/>
- </target>
<target name="get.driver.psql_9.1" unless="have.dbdriver.psql_9.1" if="want.psql_9.1">
- <get src="${driver.url}/postgresql91/jdbc4/postgresql-9.1-902.jdbc4.jar"
+ <get src="${driver.url}/postgresql91/jdbc4/postgresql-9.3-1100.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_9.1}"/>
</target>
<target name="get.driver.psql_9.2" unless="have.dbdriver.psql_9.2" if="want.psql_9.2">
- <get src="${driver.url}/postgresql92/jdbc4/postgresql-9.2-1002.jdbc4.jar"
+ <get src="${driver.url}/postgresql92/jdbc4/postgresql-9.3-1100.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_9.2}"/>
</target>
<target name="get.driver.psqlplus_9.2" unless="have.dbdriver.psqlplus_9.2" if="want.psqlplus_9.2">
<get src="${driver.url}/postgresplus92/jdbc4/edb-jdbc14.jar"
dest="${driver.home}/${driver.name.psqlplus_9.2}"/>
</target>
- <target name="get.driver.mysql_5.1" unless="have.dbdriver.mysql_5.1" if="want.mysql_5.1">
- <get src="${driver.url}/mysql55/jdbc4/mysql-connector-java-5.1.21-bin.jar"
- dest="${driver.home}/${driver.name.mysql_5.1}"/>
+ <target name="get.driver.mysql_5" unless="have.dbdriver.mysql_5" if="want.dbdriver.mysql_5">
+ <get src="${driver.url}/mysql55/jdbc4/mysql-connector-java-5.1.28-bin.jar"
+ dest="${driver.home}/${driver.name.mysql_5}"/>
</target>
- <target name="get.driver.mysql_5.0" unless="have.dbdriver.mysql_5.0" if="want.mysql_5.0">
- <get src="${driver.url}/mysql51/jdbc4/mysql-connector-java-5.1.21-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}/db2-97/jdbc4/db2jcc4.jar"
dest="${driver.home}/${driver.name.db2_9.7}"/>
More information about the jboss-cvs-commits
mailing list