[jboss-svn-commits] JBL Code SVN: r37384 - in labs/jbosstm/trunk/qa: ext and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 11 07:36:17 EDT 2011
Author: tomjenkinson
Date: 2011-08-11 07:36:16 -0400 (Thu, 11 Aug 2011)
New Revision: 37384
Added:
labs/jbosstm/trunk/qa/ext/ant.jar
labs/jbosstm/trunk/qa/ext/junit.jar
Removed:
labs/jbosstm/trunk/qa/pom.xml
labs/jbosstm/trunk/qa/tests/pom.xml
Modified:
labs/jbosstm/trunk/qa/TaskImpl.properties
labs/jbosstm/trunk/qa/build.xml
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/qa/tests/build-core.xml
labs/jbosstm/trunk/qa/tests/build-jta.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
labs/jbosstm/trunk/qa/tests/product/build.xml
Log:
updated to compile and run against the new look narayana distribution
Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties 2011-08-11 11:36:16 UTC (rev 37384)
@@ -15,7 +15,7 @@
# Location of the JVM to use. Should usually be jdk6. Tweak according to your machine.
# Note: the version in svn should have the right value for the hudson server - don't check in you own!
#
-COMMAND_LINE_0=/qa/tools/opt/jdk1.6.0_11/bin/java
+COMMAND_LINE_0=/usr/lib/jvm/jre-1.6.0-openjdk.x86_64/bin/java
# use this form to inherit the java version used by ant:
#COMMAND_LINE_0=${java.home}${file.separator}bin${file.separator}java
#COMMAND_LINE_0=/usr/local/jdk1.6.0_24/bin/java
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/build.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
JBoss, Home of Professional Open Source
Copyright 2007, Red Hat Middleware LLC, and individual contributors
@@ -19,141 +20,93 @@
@author JBoss Inc.
-->
<project name="JBossTS QA Suite Distribution" default="dist">
-
- <property environment="env"/>
- <property name="driver.home" value="dbdrivers"/>
-
- <!-- set this property to the location of a JBossTS JTA/JTS build or installation -->
- <property name="org.jboss.jbossts.qa.ts.home" location="dist"/>
- <property name="jbossts.install.lib" location="${org.jboss.jbossts.qa.ts.home}/lib"/>
-
- <!-- TODO cd ArjunaJTS/orbportability; ant -f build-anttasks.xml -->
- <property name="org.jboss.jbossts.qa.idlcompiler.lib"
- location="../ArjunaJTS/orbportability/lib/ext"/>
-
- <!-- you should not need to configure anything below here -->
-
- <!--
+ <property environment="env"/>
+ <property name="driver.home" value="dbdrivers"/>
+ <!-- set this property to the location of a JBossTS JTA/JTS build or installation -->
+ <property name="org.jboss.jbossts.qa.ts.home" location="dist"/>
+ <property name="narayana.version" value="5.0.0.M1-SNAPSHOT"/>
+ <!-- TODO cd ArjunaJTS/orbportability; ant -f build-anttasks.xml -->
+ <property name="org.jboss.jbossts.qa.idlcompiler.lib" location="../ArjunaJTS/orbportability/lib/ext"/>
+ <!-- you should not need to configure anything below here -->
+ <!--
This is a redhat vpn server. for non-vpn use, mirror it locally or copy the drivers by hand.
wget \-\-no-parent -m http://www.qa.jboss.com/jdbc-drivers/
wget \-\-no-parent -m http://www.qa.jboss.com/jdbc-drivers/jConnect-6_0/classes
ant -Ddriver.url=file:///path/to/www.qa.jboss.com/jdbc-drivers get.drivers
-->
- <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers/"/>
-
- <property name="org.jboss.jbossts.qa.server_manager_location" location="ext/jboss-server-manager-0.1.1.GA.jar"/>
- <property name="org.jboss.jbossts.qa.dist.buildroot" location="build"/>
-
- <target name="get.drivers">
-
- <!--
+ <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers/"/>
+ <property name="org.jboss.jbossts.qa.server_manager_location" location="ext/jboss-server-manager-0.1.1.GA.jar"/>
+ <property name="org.jboss.jbossts.qa.dist.buildroot" location="build"/>
+ <target name="get.drivers">
+ <!--
https://docspace.corp.redhat.com/clearspace/docs/DOC-16080
http://www.jboss.com/products/platforms/application/supportedconfigurations/
Files names below should be matched to those in run-tests.xml
https://docspace.corp.redhat.com/clearspace/community/bu/middleware/jboss-qe/lab
server connection params in config/jdbc_profiles/
-->
-
- <mkdir dir="${driver.home}/oracle_10_2_0_4"/>
- <get src="${driver.url}/ojdbc14.jar"
- dest="${driver.home}/oracle_10_2_0_4/ojdbc14.jar"/>
-
- <mkdir dir="${driver.home}/mssql2005_sqljdbc_2.0/enu"/>
- <get src="${driver.url}/sqljdbc_2.0/enu/sqljdbc.jar"
- dest="${driver.home}/mssql2005_sqljdbc_2.0/enu/sqljdbc.jar"/>
- <get src="${driver.url}/sqljdbc_2.0/enu/sqljdbc4.jar"
- dest="${driver.home}/mssql2005_sqljdbc_2.0/enu/sqljdbc4.jar"/>
-
- <!-- pgsql 8.1.408 is broken, use something more recent. -->
- <get src="${driver.url}/postgresql-8.3-605.jdbc4.jar"
- dest="${driver.home}/postgresql-8.3-605.jdbc4.jar"/>
-
- <!-- mysql server version 5 is the first with XA support, do use anything less.
+ <mkdir dir="${driver.home}/oracle_10_2_0_4"/>
+ <get src="${driver.url}/ojdbc14.jar" dest="${driver.home}/oracle_10_2_0_4/ojdbc14.jar"/>
+ <mkdir dir="${driver.home}/mssql2005_sqljdbc_2.0/enu"/>
+ <get src="${driver.url}/sqljdbc_2.0/enu/sqljdbc.jar" dest="${driver.home}/mssql2005_sqljdbc_2.0/enu/sqljdbc.jar"/>
+ <get src="${driver.url}/sqljdbc_2.0/enu/sqljdbc4.jar" dest="${driver.home}/mssql2005_sqljdbc_2.0/enu/sqljdbc4.jar"/>
+ <!-- pgsql 8.1.408 is broken, use something more recent. -->
+ <get src="${driver.url}/postgresql-8.3-605.jdbc4.jar" dest="${driver.home}/postgresql-8.3-605.jdbc4.jar"/>
+ <!-- mysql server version 5 is the first with XA support, do use anything less.
driver versions before 5.0.5 are broken, don't use them either. -->
- <get src="${driver.url}/mysql-connector-java-5.1.8-bin.jar"
- dest="${driver.home}/mysql-connector-java-5.1.8-bin.jar"/>
-
- <mkdir dir="${driver.home}/DB2_v9.7"/>
- <get src="${driver.url}/DB2_v9.7/db2jcc.jar"
- dest="${driver.home}/DB2_v9.7/db2jcc.jar"/>
- <get src="${driver.url}/DB2_v9.7/db2jcc_license_cu.jar"
- dest="${driver.home}/DB2_v9.7/db2jcc_license_cu.jar"/>
-
- <mkdir dir="${driver.home}/jConnect-6_0/classes"/>
- <get src="${driver.url}/jConnect-6_0/classes/jconn3.jar"
- dest="${driver.home}/jConnect-6_0/classes/jconn3.jar"/>
-
- </target>
-
-
- <target name="buildtype">
- <available file="${jbossts.install.lib}/narayana-jts.jar" property="buildtype" value="jts"/>
-<!-- <available file="${jbossts.install.lib}/jts.jar" property="buildtype" value="jts"/> -->
-
- <available file="${jbossts.install.lib}/narayana-jta.jar" property="buildtype" value="jta"/>
-<!-- <available file="${jbossts.install.lib}/jta.jar" property="buildtype" value="jta"/> -->
-
-<!-- <available file="${jbossts.install.lib}/arjunacore.jar" property="buildtype" value="core"/> -->
-
- <available file="${jbossts.install.lib}/narayana-jta-integration.jar" property="integration.build"/>
- <available file="${jbossts.install.lib}/narayana-jts-integration.jar" property="integration.build"/>
-
- <condition property="dist.as">
- <and>
- <isset property="integration.build"/>
- <isset property="as"/>
- </and>
- </condition>
-
- <available file="${driver.home}" property="have.dbdrivers" value="true"/>
- </target>
-
- <target name="clean" depends="buildtype">
- <delete dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
-
- <!-- always use jts regardless of build type, as we may not be able to
+ <get src="${driver.url}/mysql-connector-java-5.1.8-bin.jar" dest="${driver.home}/mysql-connector-java-5.1.8-bin.jar"/>
+ <mkdir dir="${driver.home}/DB2_v9.7"/>
+ <get src="${driver.url}/DB2_v9.7/db2jcc.jar" dest="${driver.home}/DB2_v9.7/db2jcc.jar"/>
+ <get src="${driver.url}/DB2_v9.7/db2jcc_license_cu.jar" dest="${driver.home}/DB2_v9.7/db2jcc_license_cu.jar"/>
+ <mkdir dir="${driver.home}/jConnect-6_0/classes"/>
+ <get src="${driver.url}/jConnect-6_0/classes/jconn3.jar" dest="${driver.home}/jConnect-6_0/classes/jconn3.jar"/>
+ </target>
+ <target name="buildtype">
+ <available file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts.jar" property="buildtype" value="jts"/>
+ <available file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta.jar" property="buildtype" value="jta"/>
+ <available file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta-integration.jar" property="integration.build"/>
+ <available file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts-integration.jar" property="integration.build"/>
+ <condition property="dist.as">
+ <and>
+ <isset property="integration.build"/>
+ <isset property="as"/>
+ </and>
+ </condition>
+ <available file="${driver.home}" property="have.dbdrivers" value="true"/>
+ </target>
+ <target name="clean">
+ <delete dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
+ <delete dir="${org.jboss.jbossts.qa.ts.home}"/>
+ <!-- always use jts regardless of build type, as we may not be able to
determine the build type at clean time and jts should have the superset -->
- <ant dir="tests" antfile="build-jts.xml" target="clean"/>
-
- <delete dir="org.jboss.jbossts.qa.ts.home"/>
- </target>
-
- <target name="init">
- <mkdir dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
- <mkdir dir="${org.jboss.jbossts.qa.ts.home}"/>
- <unzip file="../narayana-full/target/narayana-full-*-bin.zip" todir="${org.jboss.jbossts.qa.ts.home}"/>
- <antcall target="init-jta"/>
- <antcall target="init-jts"/>
- <antcall target="buildtype"/>
- </target>
-
- <target name="init-jta" if="init-jta">
- <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta.jar"/>
- <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta-integration.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta-integration.jar"/>
- </target>
-
- <target name="init-jts" unless="init-jta">
- <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts.jar"/>
- <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts-integration.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts-integration.jar"/>
- </target>
-
- <target name="dist" depends="clean, init">
-
- <!-- build the test suite -->
- <ant dir="tests" antfile="build-${buildtype}.xml">
- <property name="org.jboss.jbossts.qa.server_manager_location"
- value="${org.jboss.jbossts.qa.server_manager_location}"/>
- </ant>
-
- </target>
-
- <target name="help">
-<echo>Supported targets:
+ <ant dir="tests" antfile="build-jts.xml" target="clean"/>
+ </target>
+ <target name="init" depends="clean">
+ <mkdir dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
+ <mkdir dir="${org.jboss.jbossts.qa.ts.home}"/>
+ <unzip src="../narayana-full/target/narayana-full-${narayana.version}-bin.zip" dest="${org.jboss.jbossts.qa.ts.home}"/>
+ <antcall target="init-jta"/>
+ <antcall target="init-jts"/>
+ </target>
+ <target name="init-jta" unless="init-jts">
+ <move file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta.jar"/>
+ </target>
+ <target name="init-jts" if="init-jts">
+ <move file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts.jar"/>
+ </target>
+ <target name="dist" depends="clean, init, buildtype">
+ <!-- build the test suite -->
+ <ant dir="tests" antfile="build-${buildtype}.xml">
+ <property name="org.jboss.jbossts.qa.server_manager_location" value="${org.jboss.jbossts.qa.server_manager_location}"/>
+ </ant>
+ </target>
+ <target name="help">
+ <echo>Supported targets:
jta - build tests for the standalone jta transaction engine
jts - build tests for the standalone jts transaction engine
narayana-jta - build tests for the integrated jta transaction engine
narayana-jts - build tests for the integrated jts transaction engine
dist - build tests for the last build of the transaction engine
</echo>
- </target>
+ </target>
</project>
Added: labs/jbosstm/trunk/qa/ext/ant.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosstm/trunk/qa/ext/ant.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: labs/jbosstm/trunk/qa/ext/junit.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosstm/trunk/qa/ext/junit.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: labs/jbosstm/trunk/qa/pom.xml
===================================================================
--- labs/jbosstm/trunk/qa/pom.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/pom.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware
- LLC, and individual contributors as indicated by the @author tags. See the
- copyright.txt in the distribution for a full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use, modify,
- copy, or redistribute it subject to the terms and conditions of the GNU Lesser
- General Public License, v. 2.1. This program is distributed in the hope that
- it will be useful, but WITHOUT A WARRANTY; without even the implied warranty
- of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- General Public License for more details. You should have received a copy
- of the GNU Lesser General Public License, v.2.1 along with this distribution;
- if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- Fifth Floor, Boston, MA 02110-1301, USA. (C) 2009, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>narayana-qa</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>QA module</name>
- <description>qa</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>unpack-dist</id>
- <phase>initialize</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>jbossts-full</artifactId>
- <version>${project.version}</version>
- <classifier>bin</classifier>
- <type>zip</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-junit</id>
- <phase>initialize</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <type>jar</type>
- <outputDirectory>${basedir}/../build/extlib</outputDirectory>
- <destFileName>junit.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>compile-qa-tests</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <ant>
- <property name="org.jboss.jbossts.qa.ts.home" value="${project.build.directory}/jbossts-full-${project.version}"/>
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>run-qa-tests</id>
- <phase>test</phase>
- <configuration>
- <target>
- <ant antfile="run-tests.xml">
- <property name="org.jboss.jbossts.qa.ts.home" value="${project.build.directory}/jbossts-full-${project.version}"/>
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
JBoss, Home of Professional Open Source
Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -18,7 +19,6 @@
(C) 2008,
@author JBoss Inc.
-->
-
<!--
Ant build script for running QA tests using junit.
@@ -36,339 +36,490 @@
-->
<project name="QA Tests for JBossTS" default="junit" basedir=".">
- <!-- set this property to the location of a JBossTS core build -->
- <property name="org.jboss.jbossts.qa.ts.home" location="../install/"/>
-
- <property name="working.dir" location="build"/>
-
- <!-- handy utility space where you can copy one or more test groups if you want to run something ad-hoc -->
- <target name="scratch">
-
- <antcall target="junit-tests">
- <param name="tests" value="defaulttimeout"/>
- <!--<param name="additional.elements" value="org.jboss.jbossts.qa.junit.ExecutionWrapper"/>-->
- </antcall>
-
- </target>
-
- <!-- a faster subset of the tests for smoke testing. aim to keep to under one hour total. -->
- <target name="express">
-
- <!-- currenttests01 : 36 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="currenttests01"/></antcall>
- <!-- jtatests01 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="jtatests01"/></antcall>
- <!-- otsserver : 20 tests, 7 minutes -->
- <antcall target="junit-tests"><param name="tests" value="otsserver"/></antcall>
-
- <!-- rawresources01_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawresources01_1"/></antcall>
- <!-- rawresources02_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawresources02_1"/></antcall>
- <!-- rawsubtransactionawareresources01_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources01_1"/></antcall>
- <!-- rawsubtransactionawareresources02_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources02_1"/></antcall>
-
- <!-- crashrecovery01 : 24 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery01"/></antcall>
- <!-- crashrecovery02_1 : 5 tests, 6 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery02_1"/></antcall>
- <!-- crashrecovery03 : 1 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery03"/></antcall>
- <!-- crashrecovery06 : 2 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery06"/></antcall>
- <!-- crashrecovery12 : 7 tests, 5 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery12"/></antcall>
-
- </target>
-
- <!-- General tests.
+ <!-- set this property to the location of a JBossTS core build -->
+ <property name="org.jboss.jbossts.qa.ts.home" location="dist"/>
+ <property name="narayana.version" value="5.0.0.M1-SNAPSHOT"/>
+ <property name="working.dir" location="build"/>
+ <!-- handy utility space where you can copy one or more test groups if you want to run something ad-hoc -->
+ <target name="scratch">
+ <antcall target="junit-tests">
+ <param name="tests" value="defaulttimeout"/>
+ <!--<param name="additional.elements" value="org.jboss.jbossts.qa.junit.ExecutionWrapper"/>-->
+ </antcall>
+ </target>
+ <!-- a faster subset of the tests for smoke testing. aim to keep to under one hour total. -->
+ <target name="express">
+ <!-- currenttests01 : 36 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="currenttests01"/>
+ </antcall>
+ <!-- jtatests01 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="jtatests01"/>
+ </antcall>
+ <!-- otsserver : 20 tests, 7 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="otsserver"/>
+ </antcall>
+ <!-- rawresources01_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources01_1"/>
+ </antcall>
+ <!-- rawresources02_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources02_1"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources01_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources01_1"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources02_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources02_1"/>
+ </antcall>
+ <!-- crashrecovery01 : 24 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery01"/>
+ </antcall>
+ <!-- crashrecovery02_1 : 5 tests, 6 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery02_1"/>
+ </antcall>
+ <!-- crashrecovery03 : 1 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery03"/>
+ </antcall>
+ <!-- crashrecovery06 : 2 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery06"/>
+ </antcall>
+ <!-- crashrecovery12 : 7 tests, 5 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery12"/>
+ </antcall>
+ </target>
+ <!-- General tests.
These tests should take a combined time of around 2h20m or so.
-->
- <target name="junit">
-
- <!-- txcore : 28 tests, 2 minutes -->
- <antcall target="junit-tests">
- <param name="tests" value="txcore"/>
- <param name="additional.elements" value="-DCoordinatorEnvironmentBean.enableStatistics=true"/>
- </antcall>
- <!-- txcore_lockrecord : 112 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="txcore_lockrecord"/></antcall>
- <!-- txcore_abstractrecord : 32 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="txcore_abstractrecord"/></antcall>
- <!-- txcore_statemanager : 64 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="txcore_statemanager"/></antcall>
- <!-- txcore_utility : 40 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="txcore_utility"/></antcall>
- <!-- txcore_recovery : 36 tests, 4 minutes -->
- <antcall target="junit-tests"><param name="tests" value="txcore_recovery"/></antcall>
-
- <!-- currenttests01 : 36 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="currenttests01"/></antcall>
- <!-- jtatests01 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="jtatests01"/></antcall>
- <!-- otsserver : 20 tests, 4 minutes -->
- <antcall target="junit-tests"><param name="tests" value="otsserver"/></antcall>
- <!-- jtsremote : 9 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="jtsremote"/></antcall>
- <!-- defaulttimeout : 2 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="defaulttimeout"/></antcall>
-
-
- <!-- rawresources01_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawresources01_1"/></antcall>
- <!-- rawresources01_2 : 147 tests, 7 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawresources01_2"/></antcall>
- <!-- rawresources01_2b : 147 tests, 6 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawresources01_2b"/></antcall>
- <!-- rawresources01_3 : 150 tests, 8 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawresources01_3"/></antcall>
-
- <!-- rawresources02_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawresources02_1"/></antcall>
- <!-- rawresources02_2 : 147 tests, 7 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawresources02_2"/></antcall>
- <!-- rawresources02_2 : 147 tests, 6 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawresources02_2b"/></antcall>
- <!-- rawresources02_3 : 150 tests, 8 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawresources02_3"/></antcall>
-
- <!-- rawsubtransactionawareresources01_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources01_1"/></antcall>
- <!-- rawsubtransactionawareresources01_2 : 10 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources01_2"/></antcall>
- <!-- rawsubtransactionawareresources01_3 : 25 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources01_3"/></antcall>
- <!-- rawsubtransactionawareresources02_1 : 6 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources02_1"/></antcall>
- <!-- rawsubtransactionawareresources02_2 : 10 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources02_2"/></antcall>
- <!-- rawsubtransactionawareresources02_3 : 25 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="rawsubtransactionawareresources02_3"/></antcall>
-
- <!-- crashrecovery01 : 24 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery01"/></antcall>
- <!-- crashrecovery02_1 : 5 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery02_1"/></antcall>
- <!-- crashrecovery02_2 : 50 tests, 12 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery02_2"/></antcall>
- <!-- crashrecovery03 : 1 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery03"/></antcall>
- <!-- crashrecovery04 : 48 tests, 6 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery04"/></antcall>
- <!-- crashrecovery05_1 : 10 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery05_1"/></antcall>
- <!-- crashrecovery05_2 : 100 tests, 25 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery05_2"/></antcall>
- <!-- crashrecovery06 : 2 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery06"/></antcall>
- <!-- crashrecovery07 : 16 tests, 4 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery07"/></antcall>
- <!-- crashrecovery08 : 32 tests, 15 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery08"/></antcall>
- <!-- crashrecovery09 : 6 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery09"/></antcall>
- <!-- crashrecovery10 : 6 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery10"/></antcall>
- <!-- crashrecovery12 : 7 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="crashrecovery12"/></antcall>
-
- </target>
-
- <!-- copy the selected db driver out of the available set into the classpath.
+ <target name="junit">
+ <!-- txcore : 28 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore"/>
+ <param name="additional.elements" value="-DCoordinatorEnvironmentBean.enableStatistics=true"/>
+ </antcall>
+ <!-- txcore_lockrecord : 112 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_lockrecord"/>
+ </antcall>
+ <!-- txcore_abstractrecord : 32 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_abstractrecord"/>
+ </antcall>
+ <!-- txcore_statemanager : 64 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_statemanager"/>
+ </antcall>
+ <!-- txcore_utility : 40 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_utility"/>
+ </antcall>
+ <!-- txcore_recovery : 36 tests, 4 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_recovery"/>
+ </antcall>
+ <!-- currenttests01 : 36 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="currenttests01"/>
+ </antcall>
+ <!-- jtatests01 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="jtatests01"/>
+ </antcall>
+ <!-- otsserver : 20 tests, 4 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="otsserver"/>
+ </antcall>
+ <!-- jtsremote : 9 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="jtsremote"/>
+ </antcall>
+ <!-- defaulttimeout : 2 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="defaulttimeout"/>
+ </antcall>
+ <!-- rawresources01_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources01_1"/>
+ </antcall>
+ <!-- rawresources01_2 : 147 tests, 7 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources01_2"/>
+ </antcall>
+ <!-- rawresources01_2b : 147 tests, 6 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources01_2b"/>
+ </antcall>
+ <!-- rawresources01_3 : 150 tests, 8 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources01_3"/>
+ </antcall>
+ <!-- rawresources02_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources02_1"/>
+ </antcall>
+ <!-- rawresources02_2 : 147 tests, 7 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources02_2"/>
+ </antcall>
+ <!-- rawresources02_2 : 147 tests, 6 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources02_2b"/>
+ </antcall>
+ <!-- rawresources02_3 : 150 tests, 8 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawresources02_3"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources01_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources01_1"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources01_2 : 10 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources01_2"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources01_3 : 25 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources01_3"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources02_1 : 6 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources02_1"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources02_2 : 10 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources02_2"/>
+ </antcall>
+ <!-- rawsubtransactionawareresources02_3 : 25 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="rawsubtransactionawareresources02_3"/>
+ </antcall>
+ <!-- crashrecovery01 : 24 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery01"/>
+ </antcall>
+ <!-- crashrecovery02_1 : 5 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery02_1"/>
+ </antcall>
+ <!-- crashrecovery02_2 : 50 tests, 12 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery02_2"/>
+ </antcall>
+ <!-- crashrecovery03 : 1 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery03"/>
+ </antcall>
+ <!-- crashrecovery04 : 48 tests, 6 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery04"/>
+ </antcall>
+ <!-- crashrecovery05_1 : 10 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery05_1"/>
+ </antcall>
+ <!-- crashrecovery05_2 : 100 tests, 25 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery05_2"/>
+ </antcall>
+ <!-- crashrecovery06 : 2 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery06"/>
+ </antcall>
+ <!-- crashrecovery07 : 16 tests, 4 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery07"/>
+ </antcall>
+ <!-- crashrecovery08 : 32 tests, 15 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery08"/>
+ </antcall>
+ <!-- crashrecovery09 : 6 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery09"/>
+ </antcall>
+ <!-- crashrecovery10 : 6 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery10"/>
+ </antcall>
+ <!-- crashrecovery12 : 7 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery12"/>
+ </antcall>
+ </target>
+ <!-- copy the selected db driver out of the available set into the classpath.
See also build.xml get.drivers and TaskImpl.properties for classpath
-->
- <target name="install-dbdriver">
- <delete dir="dbdrivers/selected_dbdriver"/>
- <mkdir dir="dbdrivers/selected_dbdriver"/>
- <copy todir="dbdrivers/selected_dbdriver" flatten="true">
- <fileset dir="dbdrivers/" includes="**/${files}"/>
- </copy>
- </target>
-
- <!-- JDBC tests.
+ <target name="install-dbdriver">
+ <delete dir="dbdrivers/selected_dbdriver"/>
+ <mkdir dir="dbdrivers/selected_dbdriver"/>
+ <copy todir="dbdrivers/selected_dbdriver" flatten="true">
+ <fileset dir="dbdrivers/" includes="**/${files}"/>
+ </copy>
+ </target>
+ <!-- JDBC tests.
You'll need a qa/config/jdbc_profiles/<hostname>/JDBCProfiles file for your machine to run these ones,
although using the 'default' one is also an option.
Plus copies of the db drivers of course (try 'ant get.drivers' if inside the redhat network).
And a set of servers to run against. Did I mention it was complicated :-)
-->
- <target name="junit-jdbc">
-
- <antcall target="install-dbdriver"><param name="files" value="ojdbc14.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_oracle_thin_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_oracle_thin_jndi"/></antcall>
-
- <!-- mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="mssql.driver" value="sqljdbc4.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="mssql.driver" value="sqljdbc.jar"/>
- <antcall target="install-dbdriver"><param name="files" value="${mssql.driver}"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_mssqlserver_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_mssqlserver_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-605.jdbc4.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_pgsql_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_pgsql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.8-bin.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_mysql_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_mysql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="jconn3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_sybase_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_sybase_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_ibmdb2_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_ibmdb2_jndi"/></antcall>
-
- </target>
-
- <!-- the ncl office build server is not on vpn and only a subset of the dbs are available locally -->
- <target name="junit-jdbc-ncl">
-
- <antcall target="install-dbdriver"><param name="files" value="ojdbc14.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_oracle_thin_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_oracle_thin_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.8-bin.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_mysql_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_mysql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-605.jdbc4.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources01_pgsql_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02_pgsql_jndi"/></antcall>
-
- </target>
-
- <target name="junit-jdbc-crachrec">
- <!-- crashrecovery11 : jdbc resource crash recovery tests. 4 tests, 4 minutes per db -->
-
- <antcall target="install-dbdriver"><param name="files" value="ojdbc14.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="crashrecovery11-oracle_jndi"/></antcall>
-
- <!--mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="mssql.driver" value="sqljdbc4.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="mssql.driver" value="sqljdbc.jar"/>
- <antcall target="install-dbdriver"><param name="files" value="${mssql.driver}"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="crashrecovery11-mssqlserver_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="crashrecovery11-ibmdb2_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-603.jdbc3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="crashrecovery11-pgsql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.7-bin.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="crashrecovery11-mysql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="jconn3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="crashrecovery11-sybase_jndi"/></antcall>
-
- </target>
-
- <target name="jta">
-
- <!-- override the config file, so that we can run jta mode tests even with jts binaries -->
- <property name="additional.elements"
- value="-Dcom.arjuna.ats.arjuna.common.propertiesFile=../ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml"/>
-
- <!-- txcore : 28 tests, 2 minutes -->
- <antcall target="junit-tests">
- <param name="tests" value="txcore"/>
- <param name="additional.elements" value="-DCoordinatorEnvironmentBean.enableStatistics=true"/>
- </antcall>
- <!-- txcore_lockrecord : 112 tests, 3 minutes -->
- <antcall target="junit-tests"><param name="tests" value="txcore_lockrecord"/></antcall>
- <!-- txcore_abstractrecord : 32 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="txcore_abstractrecord"/></antcall>
- <!-- txcore_statemanager : 64 tests, 2 minutes -->
- <antcall target="junit-tests"><param name="tests" value="txcore_statemanager"/></antcall>
- <!-- txcore_utility : 40 tests, 1 minute -->
- <antcall target="junit-tests"><param name="tests" value="txcore_utility"/></antcall>
-
- <!-- jtatest01 : 6 tests, minute-->
- <antcall target="junit-tests"><param name="tests" value="jtatests01"/></antcall>
-
- <!-- jdbclocals01 : 6 tests, 2 minutes for each db -->
-
- <antcall target="install-dbdriver"><param name="files" value="ojdbc14.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01_oracle_jndi"/></antcall>
-
- <!-- mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
- <condition property="mssql.driver" value="sqljdbc4.jar">
- <equals arg1="${java.specification.version}" arg2="1.6"/>
- </condition>
- <property name="mssql.driver" value="sqljdbc.jar"/>
- <antcall target="install-dbdriver"><param name="files" value="${mssql.driver}"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01_mssqlserver_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-603.jdbc3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01_pgsql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.7-bin.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01_mysql_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="jconn3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01_sybase_jndi"/></antcall>
-
- <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01_ibmdb2_jndi"/></antcall>
-
- </target>
-
- <target name="performance">
- <!-- caution: perf tests are essentially regression tests and are only meaningful
+ <target name="junit-jdbc">
+ <antcall target="install-dbdriver">
+ <param name="files" value="ojdbc14.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_oracle_thin_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_oracle_thin_jndi"/>
+ </antcall>
+ <!-- mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
+ <condition property="mssql.driver" value="sqljdbc4.jar">
+ <equals arg1="${java.specification.version}" arg2="1.6"/>
+ </condition>
+ <property name="mssql.driver" value="sqljdbc.jar"/>
+ <antcall target="install-dbdriver">
+ <param name="files" value="${mssql.driver}"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_mssqlserver_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_mssqlserver_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="postgresql-8.3-605.jdbc4.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_pgsql_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_pgsql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="mysql-connector-java-5.1.8-bin.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_mysql_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_mysql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="jconn3.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_sybase_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_sybase_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="db2*"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_ibmdb2_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_ibmdb2_jndi"/>
+ </antcall>
+ </target>
+ <!-- the ncl office build server is not on vpn and only a subset of the dbs are available locally -->
+ <target name="junit-jdbc-ncl">
+ <antcall target="install-dbdriver">
+ <param name="files" value="ojdbc14.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_oracle_thin_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_oracle_thin_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="mysql-connector-java-5.1.8-bin.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_mysql_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_mysql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="postgresql-8.3-605.jdbc4.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources01_pgsql_jndi"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbcresources02_pgsql_jndi"/>
+ </antcall>
+ </target>
+ <target name="junit-jdbc-crachrec">
+ <!-- crashrecovery11 : jdbc resource crash recovery tests. 4 tests, 4 minutes per db -->
+ <antcall target="install-dbdriver">
+ <param name="files" value="ojdbc14.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery11-oracle_jndi"/>
+ </antcall>
+ <!--mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
+ <condition property="mssql.driver" value="sqljdbc4.jar">
+ <equals arg1="${java.specification.version}" arg2="1.6"/>
+ </condition>
+ <property name="mssql.driver" value="sqljdbc.jar"/>
+ <antcall target="install-dbdriver">
+ <param name="files" value="${mssql.driver}"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery11-mssqlserver_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="db2*"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery11-ibmdb2_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="postgresql-8.3-603.jdbc3.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery11-pgsql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="mysql-connector-java-5.1.7-bin.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery11-mysql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="jconn3.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="crashrecovery11-sybase_jndi"/>
+ </antcall>
+ </target>
+ <target name="jta">
+ <!-- override the config file, so that we can run jta mode tests even with jts binaries -->
+ <property name="additional.elements" value="-Dcom.arjuna.ats.arjuna.common.propertiesFile=../ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml"/>
+ <!-- txcore : 28 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore"/>
+ <param name="additional.elements" value="-DCoordinatorEnvironmentBean.enableStatistics=true"/>
+ </antcall>
+ <!-- txcore_lockrecord : 112 tests, 3 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_lockrecord"/>
+ </antcall>
+ <!-- txcore_abstractrecord : 32 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_abstractrecord"/>
+ </antcall>
+ <!-- txcore_statemanager : 64 tests, 2 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_statemanager"/>
+ </antcall>
+ <!-- txcore_utility : 40 tests, 1 minute -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_utility"/>
+ </antcall>
+ <!-- jtatest01 : 6 tests, minute-->
+ <antcall target="junit-tests">
+ <param name="tests" value="jtatests01"/>
+ </antcall>
+ <!-- jdbclocals01 : 6 tests, 2 minutes for each db -->
+ <antcall target="install-dbdriver">
+ <param name="files" value="ojdbc14.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbclocals01_oracle_jndi"/>
+ </antcall>
+ <!-- mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
+ <condition property="mssql.driver" value="sqljdbc4.jar">
+ <equals arg1="${java.specification.version}" arg2="1.6"/>
+ </condition>
+ <property name="mssql.driver" value="sqljdbc.jar"/>
+ <antcall target="install-dbdriver">
+ <param name="files" value="${mssql.driver}"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbclocals01_mssqlserver_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="postgresql-8.3-603.jdbc3.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbclocals01_pgsql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="mysql-connector-java-5.1.7-bin.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbclocals01_mysql_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="jconn3.jar"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbclocals01_sybase_jndi"/>
+ </antcall>
+ <antcall target="install-dbdriver">
+ <param name="files" value="db2*"/>
+ </antcall>
+ <antcall target="junit-tests">
+ <param name="tests" value="jdbclocals01_ibmdb2_jndi"/>
+ </antcall>
+ </target>
+ <target name="performance">
+ <!-- caution: perf tests are essentially regression tests and are only meaningful
if used with the same hardware (profile) and config between runs. -->
-
- <!-- perfprofileio : 18 tests, 9 minutes -->
- <antcall target="junit-tests"><param name="tests" value="perfprofileio"/></antcall>
- <!-- perfprofile01_i (JTS implicit) : 25 tests, 31 minutes -->
- <antcall target="junit-tests"><param name="tests" value="perfprofile01_i"/></antcall>
- <!-- perfprofile01_e (JTS explicit) : 25 tests, 35 minutes -->
- <antcall target="junit-tests"><param name="tests" value="perfprofile01_e"/></antcall>
- </target>
-
- <target name="core-memory">
-
- <!-- txcore_memory : 40 tests -->
- <antcall target="junit-tests">
- <param name="tests" value="txcore_memory"/>
- <!-- you need the right .so for the platform the test runs on. Note the the jvm
+ <!-- perfprofileio : 18 tests, 9 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="perfprofileio"/>
+ </antcall>
+ <!-- perfprofile01_i (JTS implicit) : 25 tests, 31 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="perfprofile01_i"/>
+ </antcall>
+ <!-- perfprofile01_e (JTS explicit) : 25 tests, 35 minutes -->
+ <antcall target="junit-tests">
+ <param name="tests" value="perfprofile01_e"/>
+ </antcall>
+ </target>
+ <target name="core-memory">
+ <!-- txcore_memory : 40 tests -->
+ <antcall target="junit-tests">
+ <param name="tests" value="txcore_memory"/>
+ <!-- you need the right .so for the platform the test runs on. Note the the jvm
may print 'can't find agent lib' when it can find one but it's the wrong one.
ext/libjbossAgent_linux64.so : Fedora 12, x86_64 -->
- <param name="additional.elements" value="-agentpath:ext/libjbossAgent_linux64.so"/>
- </antcall>
-
- </target>
-
- <!-- ##################################### -->
-
- <!-- This is where all the hard work happens - use junit to coordinate multi-process tests: -->
- <target name="junit-tests">
-
- <!-- pass in a param to override this. by default run everything. -->
- <property name="names" value=".*"/>
-
- <!-- pass in param to override this. By default, the TaskImpl.properties are not modified -->
- <!--<property name="additional.elements" value="org.jboss.jbossts.qa.junit.ExecutionWrapper"/>-->
- <property name="additional.elements" value=""/>
-
- <!-- TODO support JTA mode testing of JTS .jar files? -
+ <param name="additional.elements" value="-agentpath:ext/libjbossAgent_linux64.so"/>
+ </antcall>
+ </target>
+ <!-- ##################################### -->
+ <!-- This is where all the hard work happens - use junit to coordinate multi-process tests: -->
+ <target name="junit-tests">
+ <!-- pass in a param to override this. by default run everything. -->
+ <property name="names" value=".*"/>
+ <!-- pass in param to override this. By default, the TaskImpl.properties are not modified -->
+ <!--<property name="additional.elements" value="org.jboss.jbossts.qa.junit.ExecutionWrapper"/>-->
+ <property name="additional.elements" value=""/>
+ <!-- TODO support JTA mode testing of JTS .jar files? -
would need classpath munging for props file in TaskImpl.properties -->
-
- <echo message="Running junit test group ${tests} from basedir=${basedir}"/>
-
- <!-- this runs forked because the product config file it uses has relative paths in it, so we need to guarantee
+ <echo message="Running junit test group ${tests} from basedir=${basedir}"/>
+ <!-- this runs forked because the product config file it uses has relative paths in it, so we need to guarantee
the working dir is the same as the location of this script. -->
- <junit printsummary="yes" haltonfailure="no" fork="true" dir="${basedir}" showoutput="false">
- <classpath>
-
- <!--
+ <junit printsummary="yes" haltonfailure="no" fork="true" dir="${basedir}" showoutput="false">
+ <classpath>
+ <!--
This is the classpath for the test framework, not the test components e.g. clients/servers.
Those are configured via TaskImpl.properties instead.
@@ -377,80 +528,63 @@
Hence we need JBossTS in the classpath for the framework, even though it does not get run there.
On the up side, you get better diagnostic messages and code management/navigation in IDEs.
-->
- <pathelement location="../build/extlib/junit.jar"/>
+ <pathelement location="ext/junit.jar"/>
+ <fileset dir="tests/build">
+ <include name="jbossts-*-qa.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/ext">
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ </fileset>
+ <!-- Commented out as this is just running the same tests again?
+ <fileset dir="../ArjunaJTS/jts/build/lib">
+ <include name="jts_tests.jar"/>
+ </fileset>
+ -->
+ <pathelement location="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/etc"/>
+ </classpath>
+ <formatter type="plain"/>
+ <test name="org.jboss.jbossts.qa.junit.testgroup.TestGroup_${tests}"/>
+ <sysproperty key="names" value="${names}"/>
+ <sysproperty key="additional.elements" value="${additional.elements}"/>
+ <!--<jvmarg value="-Xdebug"/>-->
+ <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5007"/>-->
+ </junit>
+ </target>
+ <!-- directory that contains emma.jar and emma_ant.jar: -->
+ <property name="emma.dir" value="../build/extlib"/>
+ <path id="emma.lib">
+ <pathelement location="${emma.dir}/emma.jar"/>
+ <pathelement location="${emma.dir}/emma_ant.jar"/>
+ </path>
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
+ <target name="emmareport">
+ <emma enabled="true">
+ <report>
+ <fileset dir="..">
+ <include name="**/build/metadata.emma"/>
+ </fileset>
+ <fileset dir="testoutput">
+ <include name="**/*-coverage.ec"/>
+ </fileset>
+ <fileset dir="..">
+ <include name="**/build/coverage.ec"/>
+ </fileset>
+ <sourcepath>
+ <dirset dir="..">
+ <include name="**/classes"/>
+ </dirset>
+ </sourcepath>
+ <txt outfile="testoutput/emma/coverage.txt"/>
+ <html outfile="testoutput/emma/coverage.html"/>
+ </report>
+ </emma>
+ </target>
+ <!--
- <fileset dir="tests/build">
- <include name="jbossts-*-qa.jar"/>
- </fileset>
-
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
- <include name="*.jar"/>
- <include name="*.zip"/>
- </fileset>
- <fileset dir="../ArjunaJTS/jts/build/lib">
- <include name="jts_tests.jar"/>
- </fileset>
- <pathelement location="${org.jboss.jbossts.qa.ts.home}/etc"/>
-
- </classpath>
-
- <formatter type="plain"/>
-
- <test name="org.jboss.jbossts.qa.junit.testgroup.TestGroup_${tests}"/>
-
- <sysproperty key="names" value="${names}"/>
- <sysproperty key="additional.elements" value="${additional.elements}"/>
-
- <!--<jvmarg value="-Xdebug"/>-->
- <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5007"/>-->
-
- </junit>
-
- </target>
-
- <!-- directory that contains emma.jar and emma_ant.jar: -->
- <property name="emma.dir" value="../build/extlib" />
-
- <path id="emma.lib" >
- <pathelement location="${emma.dir}/emma.jar" />
- <pathelement location="${emma.dir}/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
- <target name="emmareport">
- <emma enabled="true">
- <report>
-
- <fileset dir=".." >
- <include name="**/build/metadata.emma"/>
- </fileset>
-
- <fileset dir="testoutput">
- <include name="**/*-coverage.ec"/>
- </fileset>
-
- <fileset dir="..">
- <include name="**/build/coverage.ec"/>
- </fileset>
-
-
- <sourcepath>
- <dirset dir="..">
- <include name="**/classes"/>
- </dirset>
- </sourcepath>
- <txt outfile="testoutput/emma/coverage.txt" />
- <html outfile="testoutput/emma/coverage.html" />
- </report>
- </emma>
- </target>
-
- <!--
-
unused groups, pending cleanup and wiring:
ait01_ots_transactionmanager.java
@@ -463,5 +597,4 @@
txoj.java - thse should be unit tests.
-->
-
</project>
Modified: labs/jbosstm/trunk/qa/tests/build-core.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-core.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/tests/build-core.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -21,7 +21,8 @@
<project name="JBossTS 'Core' QA Suite" default="build">
<!-- set this property to the location of a JBossTS core build -->
- <property name="org.jboss.jbossts.qa.ts.home" location="../../install/"/>
+ <property name="org.jboss.jbossts.qa.ts.home" location="../dist"/>
+ <property name="narayana.version" value="5.0.0.M1-SNAPSHOT"/>
<property name="org.jboss.jbossts.qa.buildroot" location="build"/>
<property name="org.jboss.jbossts.qa.build.classes" value="${org.jboss.jbossts.qa.buildroot}/classes/"/>
@@ -29,10 +30,10 @@
<property name="org.jboss.jbossts.qa.core.lib" location="lib"/>
<path id="core.classpath">
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/">
<include name="arjunacore.jar"/>
</fileset>
- <pathelement location="../../build/extlib/junit.jar"/>
+ <pathelement location="../ext/junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
</path>
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -21,7 +21,8 @@
<project name="JBossTS JTA QA Suite" default="build">
<!-- set this property to the location of a JBossTS JTA build -->
- <property name="org.jboss.jbossts.qa.ts.home" location="../../install/"/>
+ <property name="org.jboss.jbossts.qa.ts.home" location="../dist/"/>
+ <property name="narayana.version" value="5.0.0.M1-SNAPSHOT"/>
<!-- set properties for AS testing -->
<property environment="env"/>
@@ -35,13 +36,13 @@
<property name="org.jboss.jbossts.qa.lib" location="lib"/>
<path id="jta.classpath">
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/">
<include name="narayana-jta.jar"/>
</fileset>
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/ext">
<include name="jboss-transaction-api_1.1_spec.jar"/>
</fileset>
- <fileset dir="../../build/extlib" includes="junit.jar"/>
+ <pathelement location="../ext/junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
</path>
@@ -98,7 +99,7 @@
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
<!-- additional dependency, which is why we don't just do this in compile task above: -->
<!-- include classes for AS tests -->
- <fileset dir="../../build/extlib">
+ <fileset dir="../../ext">
<include name="jboss-transaction-api_1.1_spec.jar"/>
<include name="jboss-ejb-api.jar"/>
<include name="jboss-server-manager.jar"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -21,7 +21,8 @@
<project name="JBossTS JTS QA Suite" default="build">
<!-- set this property to the location of a JBossTS JTS build -->
- <property name="org.jboss.jbossts.qa.ts.home" location="../../install"/>
+ <property name="org.jboss.jbossts.qa.ts.home" location="../dist"/>
+ <property name="narayana.version" value="5.0.0.M1-SNAPSHOT"/>
<!-- set properties for AS testing -->
<property environment="env"/>
@@ -40,21 +41,21 @@
<property name="org.jboss.jbossts.qa.orb.name.short" value="jacorb"/>
<property name="org.jboss.jbossts.qa.orb.name.long" value="JacORB"/>
- <property name="org.jboss.jbossts.qa.orb.home" value="${org.jboss.jbossts.qa.ts.home}/jacorb"/>
+ <property name="org.jboss.jbossts.qa.orb.home" value="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/jacorb"/>
<property name="org.jboss.jbossts.qa.orb.classpath" value="${org.jboss.jbossts.qa.orb.home}/lib/jacorb.jar;${org.jboss.jbossts.qa.orb.home}/lib/idl.jar;${org.jboss.jbossts.qa.orb.home}/lib/logkit-1.2.jar"/>
<path id="jts.classpath">
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/">
<include name="narayana-jts.jar"/>
<include name="narayana-jts-${org.jboss.jbossts.qa.orb.name.short}.jar"/>
</fileset>
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/ext">
<include name="jboss-transaction-api_1.1_spec.jar"/>
</fileset>
<pathelement location="../../ArjunaJTS/orbportability/config"/>
<!--<fileset file="${org.jboss.jbossts.qa.server_manager_location}" />-->
<pathelement path="${org.jboss.jbossts.qa.orb.classpath}"/>
- <fileset dir="../../build/extlib" includes="junit.jar"/>
+ <pathelement location="../ext/junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
<pathelement location="../../ArjunaJTS/jts/build/lib/jts_tests.jar"/>
</path>
@@ -181,7 +182,7 @@
<idl-compiler orb="${org.jboss.jbossts.qa.orb.name.long}"
buildlist="${org.jboss.jbossts.qa.jts.idl.buildlist}"
destdir="${org.jboss.jbossts.qa.build.idl}"
- parameters="include='${org.jboss.jbossts.qa.ts.home}/idl/;${org.jboss.jbossts.qa.orb.home}/idl/omg',classpath='${org.jboss.jbossts.qa.orb.classpath}'"/>
+ parameters="include='${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/idl/;${org.jboss.jbossts.qa.orb.home}/idl/omg',classpath='${org.jboss.jbossts.qa.orb.classpath}'"/>
<javac srcdir="${org.jboss.jbossts.qa.build.idl}"
destdir="${org.jboss.jbossts.qa.build.classes}"
@@ -214,15 +215,15 @@
</target>
<path id="as.classpath">
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/">
<include name="narayana-jts.jar"/>
</fileset>
- <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
+ <fileset dir="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/ext">
<include name="jbossts-common.jar"/>
<include name="jta-1_1-classes.zip"/>
</fileset>
<!-- include classes for AS tests -->
- <fileset dir="../../build/extlib">
+ <fileset dir="../../ext">
<include name="jboss-server-manager.jar"/>
<include name="jboss-transaction-api_1.1_spec.jar"/>
<include name="jboss-ejb-api_3.1_spec.jar"/>
Deleted: labs/jbosstm/trunk/qa/tests/pom.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/pom.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/tests/pom.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and others contributors as indicated by the @authors
- tag. All rights reserved. See the copyright.txt in the distribution
- for a full listing of individual contributors. This copyrighted
- material is made available to anyone wishing to use, modify, copy, or
- redistribute it subject to the terms and conditions of the GNU Lesser
- General Public License, v. 2.1. This program is distributed in the
- hope that it will be useful, but WITHOUT A WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License, v.2.1 along with this distribution; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>qa-tests</artifactId>
- <name>QA tests</name>
- <description>qa</description>
- <version>5.0.0.M1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <developers>
- <developer>
- <id>tomjenkinson</id>
- <name>Thomas Jenkinson</name>
- <email>tom.jenkinson at redhat.com</email>
- <organization>JBoss</organization>
- <organizationUrl>http://www.jboss.org/</organizationUrl>
- <roles>
- <role>Project Lead</role>
- </roles>
- <timezone>0</timezone>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- </license>
- </licenses>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>idlj-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb-idl-compiler</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <compiler>jacorb</compiler>
- <sourceDirectory>idl/</sourceDirectory>
- <sources>
- <source>
- <includes>
- <include>AITResources01.idl</include>
- <include>AITResources02.idl</include>
- <include>CrashRecovery01.idl</include>
- <include>CrashRecovery02.idl</include>
- <include>CrashRecovery03.idl</include>
- <include>CrashRecovery04.idl</include>
- <include>CrashRecovery05.idl</include>
- <include>CrashRecovery06.idl</include>
- <include>CrashRecovery07.idl</include>
- <include>CrashRecovery08.idl</include>
- <include>CrashRecovery09.idl</include>
- <include>CrashRecovery10.idl</include>
- <include>CrashRecovery11.idl</include>
- <include>EnlistDelistEnlist01.idl</include>
- <include>Hammer01.idl</include>
- <include>Hammer02.idl</include>
- <include>Issues0001.idl</include>
- <include>JDBCResources01.idl</include>
- <include>JDBCResources02.idl</include>
- <include>JDBCResources03.idl</include>
- <include>JDBCResources04.idl</include>
- <include>performance.idl</include>
- <include>PerfProfile01.idl</include>
- <include>RawResources01.idl</include>
- <include>RawResources02.idl</include>
- <include>RawSubtransactionAwareResources01.idl</include>
- <include>RawSubtransactionAwareResources02.idl</include>
- <include>SupportTests01.idl</include>
- </includes>
- <additionalArguments>
- <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
- <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>AITResources01:org.jboss.jbossts.qa.AITResources01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>AITResources02:org.jboss.jbossts.qa.AITResources02</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery01:org.jboss.jbossts.qa.CrashRecovery01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery02:org.jboss.jbossts.qa.CrashRecovery02</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery03:org.jboss.jbossts.qa.CrashRecovery03</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery04:org.jboss.jbossts.qa.CrashRecovery04</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery05:org.jboss.jbossts.qa.CrashRecovery05</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery06:org.jboss.jbossts.qa.CrashRecovery06</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery07:org.jboss.jbossts.qa.CrashRecovery07</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery08:org.jboss.jbossts.qa.CrashRecovery08</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery09:org.jboss.jbossts.qa.CrashRecovery09</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery10:org.jboss.jbossts.qa.CrashRecovery10</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CrashRecovery11:org.jboss.jbossts.qa.CrashRecovery11</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>EnlistDelistEnlist01:org.jboss.jbossts.qa.EnlistDelistEnlist01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>Hammer01:org.jboss.jbossts.qa.Hammer01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>Hammer02:org.jboss.jbossts.qa.Hammer02</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>Issues0001:org.jboss.jbossts.qa.Issues0001</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>JDBCResources01:org.jboss.jbossts.qa.JDBCResources01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>JDBCResources02:org.jboss.jbossts.qa.JDBCResources02</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>JDBCResources03:org.jboss.jbossts.qa.JDBCResources03</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>JDBCResources04:org.jboss.jbossts.qa.JDBCResources04</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>performance:org.jboss.jbossts.qa.performance</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>PerfProfile01:org.jboss.jbossts.qa.PerfProfile01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>RawResources01:org.jboss.jbossts.qa.RawResources01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>RawResources02:org.jboss.jbossts.qa.RawResources02</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>RawSubtransactionAwareResources01:org.jboss.jbossts.qa.RawSubtransactionAwareResources01</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>RawSubtransactionAwareResources02:org.jboss.jbossts.qa.RawSubtransactionAwareResources02</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>SupportTests01:org.jboss.jbossts.qa.SupportTests01</additionalArgument>
- </additionalArguments>
- </source>
- </sources>
- <includeDirs>
- <includeDir>../../ArjunaJTS/jts/idl/omg</includeDir>
- <includeDir>../../ArjunaJTS/jts/idl/arjuna</includeDir>
- <includeDir>../../ArjunaJTS/jts/../jacorb/idl/omg</includeDir>
- </includeDirs>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>jts</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
Modified: labs/jbosstm/trunk/qa/tests/product/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/product/build.xml 2011-08-11 10:54:56 UTC (rev 37383)
+++ labs/jbosstm/trunk/qa/tests/product/build.xml 2011-08-11 11:36:16 UTC (rev 37384)
@@ -76,7 +76,7 @@
<!-- JBossTS: http://www.jboss.org/download/ the current build -->
<path id="classpath.jbossts">
<pathelement location="${jbossts.install}/lib/narayana-jta.jar" />
- <pathelement location="${jbossts.install}/../build/extlib/netty.jar" />
+ <pathelement location="${jbossts.install}/../ext/netty.jar" />
<pathelement location="${jbossts.install}/lib/ext/hornetq-core.jar" />
<pathelement location="${jbossts.install}/lib/ext/jboss-logging.jar" />
</path>
More information about the jboss-svn-commits
mailing list