[jboss-cvs] JBossAS SVN: r103969 - in branches/JBPAPP_4_2_0_GA_CP/testsuite: imports/sections and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 14 09:27:17 EDT 2010
Author: istudens at redhat.com
Date: 2010-04-14 09:27:16 -0400 (Wed, 14 Apr 2010)
New Revision: 103969
Modified:
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/jbossts.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
fixed version of jdbc drivers, fixed hibernate dialect explicit settings, JBPAPP-4091
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml 2010-04-14 13:17:12 UTC (rev 103968)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/config/tests-crash-recovery.xml 2010-04-14 13:27:16 UTC (rev 103969)
@@ -55,7 +55,7 @@
<echo message="starting of ${build.resources}/${jbossts.crash.recovery.test.script.dir}/as-tests.xml"/>
<java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="true">
<classpath>
- <pathelement location="${build.lib}/crashrecovery-astest.jar"/>
+ <pathelement location="${build.lib}/jbossts-crashrecovery.jar"/>
<pathelement location="${ant.library.dir}/ant-launcher.jar"/>
<path refid="apache.ant.classpath"/>
<path refid="apache.ant.junit.classpath"/>
@@ -72,7 +72,7 @@
<sysproperty key="jboss.home" value="${jbosstest.dist}" />
<sysproperty key="jboss.dist" value="${jboss.dist}" />
<sysproperty key="astest.jar.dir" value="${build.lib}" />
- <sysproperty key="astest.jar.name" value="crashrecovery-astest.jar" />
+ <sysproperty key="astest.jar.name" value="jbossts-crashrecovery.jar" />
<sysproperty key="astest.jar.deploy.dir" value="../../lib" />
<sysproperty key="build.reports" value="${build.reports}" />
<sysproperty key="jbossas.startup.timeout" value="480" />
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/jbossts.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/jbossts.xml 2010-04-14 13:17:12 UTC (rev 103968)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/jbossts.xml 2010-04-14 13:27:16 UTC (rev 103969)
@@ -3,7 +3,7 @@
<!-- JBossTS crash recovery tests -->
<target name="jbqa2176">
- <jar destfile="${build.lib}/crashrecovery-astest.jar">
+ <jar destfile="${build.lib}/jbossts-crashrecovery.jar">
<fileset dir="${build.resources}/jbossts/crashrecovery">
<include name="META-INF/*.xml"/>
</fileset>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml 2010-04-14 13:17:12 UTC (rev 103968)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml 2010-04-14 13:27:16 UTC (rev 103969)
@@ -19,7 +19,7 @@
<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:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</xa-datasource-property>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@dev68.qa.atl2.redhat.com:1521:qadb01</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 -->
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-04-14 13:17:12 UTC (rev 103968)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-04-14 13:27:16 UTC (rev 103969)
@@ -226,7 +226,8 @@
<antcall target="${call.target}">
<param name="dbdriver" value="${driver.name.oracle_11}"/>
<param name="datasource" value="oracle11-xa-ds.xml" />
- <param name="dbname" value="oracle11" />
+ <param name="dbname" value="oracle11" />
+ <param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
</target>
@@ -235,6 +236,7 @@
<param name="dbdriver" value="${driver.name.oracle_11}"/>
<param name="datasource" value="oracle11-r2-xa-ds.xml" />
<param name="dbname" value="oracle11_r2" />
+ <param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
</target>
@@ -243,6 +245,7 @@
<param name="dbdriver" value="${driver.name.oracle_11}"/>
<param name="datasource" value="oracle-rac1-xa-ds.xml" />
<param name="dbname" value="oracle_rac" />
+ <param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
</target>
@@ -251,6 +254,7 @@
<param name="dbdriver" value="${driver.name.oracle_11}"/>
<param name="datasource" value="oracle-rac-lb-xa-ds.xml" />
<param name="dbname" value="oracle_rac_lb" />
+ <param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
</target>
@@ -259,6 +263,7 @@
<param name="dbdriver" value="${driver.name.oracle_11}"/>
<param name="datasource" value="oracle-rac-r2-1-xa-ds.xml" />
<param name="dbname" value="oracle_rac_r2" />
+ <param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
</target>
@@ -267,6 +272,7 @@
<param name="dbdriver" value="${driver.name.oracle_11}"/>
<param name="datasource" value="oracle-rac-r2-lb-xa-ds.xml" />
<param name="dbname" value="oracle_rac_r2_lb" />
+ <param name="hibernate.dialect" value="Oracle10gDialect" />
</antcall>
</target>
@@ -307,6 +313,7 @@
<param name="dbdriver" value="${driver.name.db2_9.7}" />
<param name="datasource" value="db2_97-xa-ds.xml" />
<param name="dbname" value="db2_9" />
+ <param name="hibernate.dialect" value="DB2Dialect" />
</antcall>
</target>
@@ -315,6 +322,7 @@
<param name="dbdriver" value="${driver.name.sybase_15}"/>
<param name="datasource" value="sybase15-xa-ds.xml" />
<param name="dbname" value="sybase15" />
+ <param name="hibernate.dialect" value="SybaseASE15Dialect" />
</antcall>
</target>
@@ -467,15 +475,15 @@
</sequential>
</target>
- <target name="hack-before-astest-run" depends="hack-before-astest-run-for-db2_9.7, hack-before-astest-run-for-oracle_rac, hack-before-astest-run-for-oracle_rac_r2" />
+ <target name="hack-before-astest-run" depends="hack-before-astest-run-for-db2_9.7, hack-before-astest-run-for-oracle_rac, hack-before-astest-run-for-oracle_rac_r2, set-hibernate-dialect" />
<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" />
+ <!--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}" />
+ <property name="astest.alternative.jar.name" value="jbossts-db2-${astest.jar.name}" />
<available file="${astest.jar.dir}/${astest.alternative.jar.name}"
property="have.db2.astest.alternative.jar" />
@@ -501,9 +509,35 @@
</replace>
</target>
+ <target name="set-hibernate-dialect" if="hibernate.dialect">
+ <condition property="astest.app.to.unjar" value="${astest.alternative.jar.name}">
+ <isset property="astest.alternative.jar.name"/>
+ </condition>
+ <property name="astest.app.to.unjar" value="${astest.jar.name}" />
+
+ <property name="astest.alternative.jar.name" value="jbossts-${hibernate.dialect}-${astest.jar.name}" />
+
+ <mkdir dir="${astest.jar.dir}/${astest.alternative.jar.name}_content"/>
+ <unjar src="${astest.jar.dir}/${astest.app.to.unjar}" 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" />
+ <antcall target="modify-persistence-xml-hibernate-dialect" />
+ <delete file="${astest.jar.dir}/${astest.alternative.jar.name}" quiet="true" />
+ <jar destfile="${astest.jar.dir}/${astest.alternative.jar.name}">
+ <fileset dir="${astest.jar.dir}/${astest.alternative.jar.name}_content"/>
+ </jar>
+ <delete dir="${astest.jar.dir}/${astest.alternative.jar.name}_content" />
+ </target>
+
+ <target name="modify-persistence-xml-hibernate-dialect" if="have.persistence.xml">
+ <replace file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml" summary="true"
+ token="</properties>"
+ value="<property name="hibernate.dialect">org.hibernate.dialect.${hibernate.dialect}</property></properties>" />
+ </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" />
+ <!--delete file="${jboss.home}/server/crashrecovery-${tstype}/lib/db2jcc_license_cu.jar" /-->
</target>
<target name="hack-before-astest-run-for-oracle_rac" if="want.oracle_rac">
@@ -657,11 +691,11 @@
dest="${driver.home}/${driver.name.mssql_2008}"/>
</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}/maven2/postgresql/postgresql/8.3-605/postgresql-8.3-605.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}/maven2/postgresql/postgresql/8.2-510/postgresql-8.2-510.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">
@@ -673,10 +707,11 @@
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}/maven2/com/ibm/db2jcc/3.57.86/db2jcc-3.57.86.jar"-->
+ <get src="${driver.url}/maven2/com/ibm/db2jcc/3.58.82/db2jcc-3.58.82.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"/>
+ <!--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"
More information about the jboss-cvs-commits
mailing list