[jboss-svn-commits] JBL Code SVN: r28048 - in labs/jbosstm/trunk/qa: testdefs and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 15 08:37:21 EDT 2009
Author: jhalliday
Date: 2009-07-15 08:37:20 -0400 (Wed, 15 Jul 2009)
New Revision: 28048
Added:
labs/jbosstm/trunk/qa/testdefs/jbossts-qa-crashrecovery13-testdefs.xml
Removed:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/DistributedIORStorePlugin.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/RegisterOTSServer.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer.java
Modified:
labs/jbosstm/trunk/qa/TaskImpl.properties
labs/jbosstm/trunk/qa/build-dtfjunit.xml
labs/jbosstm/trunk/qa/build.xml
labs/jbosstm/trunk/qa/run-dtf-local.xml
labs/jbosstm/trunk/qa/testdefs/jbossts-qa-ait01_otstransactionmanager-testdefs.xml
labs/jbosstm/trunk/qa/testdefs/jbossts-qa-aitresources01-testdefs.xml
labs/jbosstm/trunk/qa/testdefs/performance-testdefs.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/idl/performance.idl
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer2.java
Log:
Remove qa dependency on DTF, convert to junit4 instead. JBTM-390
Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties 2009-07-15 12:37:20 UTC (rev 28048)
@@ -1,19 +1,32 @@
# command line elements for executing spawned java tasks
#COMMAND_LINE_0=/usr/local/jdk1.5.0_15/bin/java
-COMMAND_LINE_0=/usr/local/jdk1.6.0_12/bin/java
+#COMMAND_LINE_0=/usr/local/jdk1.6.0_14/bin/java
+COMMAND_LINE_0=/usr/local/jdk1.6.0_11/bin/java
COMMAND_LINE_1=-classpath
-#COMMAND_LINE_2=build/lib/jbossjts.jar:build/lib/jbossjts-jacorb.jar:build/etc/:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jmxri.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/log4j-1.2.14.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jndi.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jbossts-common.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/connector-api.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/junit.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/commons-logging-1.1.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/wrapper.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jta-1_1-classes.zip:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/db2jcc_license_cu.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/postgresql-8.3-603.jdbc3.jar:/home/jhalli/IdeaProjects/j!
boss/jbossts_trunk/qa/build/qa/lib/TestingFramework.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/db2jcc.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/mysql-connector-java-5.1.6-bin.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/sqljdbc.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/ojdbc14.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/jconn2.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/jboss-server-manager-0.1.1.GA.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/jbossts-jts-qa.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/idl.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/backport-util-concurrent.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/jacorb.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/antlr-2.7.2.jar:/home/jhalli/IdeaProjects/jboss/jbos!
sts_trunk/qa/build/jacorb/lib/picocontainer-1.2.jar:/home/jhal!
li/IdeaP
rojects/jboss/jbossts_trunk/qa/build/jacorb/lib/logkit-1.2.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/wrapper-3.1.0.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/avalon-framework-4.1.5.jar:build/jacorb/etc/:build/qa/lib/ext/fscontext.jar:build/qa/lib/ext/providerutil.jar:
-COMMAND_LINE_2=/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/jbossjts.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/jbossjts-jacorb.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/etc/:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jmxri.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/log4j-1.2.14.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jndi.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jbossts-common.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/connector-api.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/junit.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/commons-logging-1.1.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/wrapper.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/lib/ext/jta-1_1-classes.zip:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/q!
a/lib/db2jcc_license_cu.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/postgresql-8.3-603.jdbc3.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/TestingFramework.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/db2jcc.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/mysql-connector-java-5.1.6-bin.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/sqljdbc.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/ojdbc14.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/jconn2.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/jboss-server-manager-0.1.1.GA.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/qa/lib/jbossts-jts-qa.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/idl.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/backport-util-concurrent.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/!
build/jacorb/lib/jacorb.jar:/home/jhalli/IdeaProjects/jboss/jb!
ossts_tr
unk/qa/build/jacorb/lib/antlr-2.7.2.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/picocontainer-1.2.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/logkit-1.2.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/wrapper-3.1.0.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/lib/avalon-framework-4.1.5.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/build/jacorb/etc/:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/lib/ext/fscontext.jar:/home/jhalli/IdeaProjects/jboss/jbossts_trunk/qa/lib/ext/providerutil.jar
+
+##########
+## yeah I know it won't work on windows.
+COMMAND_LINE_2=../install/lib/jbossjts.jar:../install/lib/ext/jta-1_1-classes.zip:../install/lib/ext/connector-api.jar:../install/lib/ext/commons-logging-1.1.jar:../install/lib/ext/log4j-1.2.8.jar:../install/etc/:../install/jacorb/lib/idl.jar:../install/jacorb/lib/backport-util-concurrent.jar:../install/jacorb/lib/jacorb.jar:../install/jacorb/lib/antlr-2.7.2.jar:../install/jacorb/lib/picocontainer-1.2.jar:../install/jacorb/lib/logkit-1.2.jar:../install/jacorb/lib/wrapper-3.1.0.jar:../install/jacorb/lib/avalon-framework-4.1.5.jar:../install/jacorb/etc/:ext/fscontext.jar:ext/providerutil.jar:tests/build/jbossts-jts-qa.jar:dbdrivers/selected_dbdriver/*
+##########
+
COMMAND_LINE_3=-Dqa.debug=true
COMMAND_LINE_4=-DContext.PROVIDER_URL=file:///tmp
COMMAND_LINE_5=-DContext.INITIAL_CONTEXT_FACTORY=com.sun.jndi.fscontext.RefFSContextFactory
-COMMAND_LINE_6=-Dperformanceprofilestore.dir=build/qa/perf_profiles/
-COMMAND_LINE_7=-Djdbcprofilestore.dir=build/qa/jdbc_profiles
-COMMAND_LINE_8=-Dmemorytestprofilestore.dir=build/qa/memory_profiles/
+COMMAND_LINE_6=-Dperformanceprofilestore.dir=config/perf_profiles/
+COMMAND_LINE_7=-Djdbcprofilestore.dir=config/jdbc_profiles
+COMMAND_LINE_8=-Dmemorytestprofilestore.dir=config/memory_profiles/
COMMAND_LINE_9=-Dots.server.bindname=value_1
+
+###########
+COMMAND_LINE_10=-Dcom.arjuna.ats.arjuna.coordinator.maintainHeuristics=NO
+COMMAND_LINE_11=-Dcom.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod=10
+COMMAND_LINE_12=-Dcom.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod=5
+
+#COMMAND_LINE_13=-Xdebug
+#COMMAND_LINE_14=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006
+
#
-#
-# taqsk arg properties substitutions
+# task arg properties substitutions
ORBFLAGS_1=
ORBFLAGS_2=
1=value_1
Modified: labs/jbosstm/trunk/qa/build-dtfjunit.xml
===================================================================
--- labs/jbosstm/trunk/qa/build-dtfjunit.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/build-dtfjunit.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -37,7 +37,7 @@
-->
- <property name="jbossts.home" value="build"/>
+ <property name="jbossts.home" value="../install"/>
<property name="src" location="tests/src"/>
<property name="build" location="tests/build/classes"/>
@@ -56,13 +56,16 @@
</fileset>
<pathelement location="${jbossts.home}/etc"/>
- <pathelement location="${jbossts.home}/qa/lib/TestingFramework.jar"/>
+ <pathelement location="../ext/TestingFramework.jar"/>
</path>
<target name="compile" description="compile the source ">
<javac srcdir="${src}" destdir="${build}" classpathref="build" debug="true" fork="true">
<include name="**/junit/*.java"/>
+ <include name="**/junit/testgroup/*.java"/>
+
+ <!--<exclude name="**/junit/XML2JUnit.java"/>-->
</javac>
</target>
@@ -74,8 +77,8 @@
<target name="runtests" depends="compile-generated">
+ <!--
<antcall target="run-onegroup"><param name="tests" value="currenttests01"/></antcall>
- <!--
<antcall target="run-onegroup"><param name="tests" value="jtatests01"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="otsserver"/></antcall>
@@ -95,18 +98,23 @@
<antcall target="run-onegroup"><param name="tests" value="crashrecovery01"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery02_1"/></antcall>
-
- <antcall target="run-onegroup"><param name="tests" value="crashrecovery02_2"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery03"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery04"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery05_1"/></antcall>
- <antcall target="run-onegroup"><param name="tests" value="crashrecovery05_2"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery06"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery07"/></antcall>
+ -->
+
+ <!-- cr12: failing 02, 03, 04 - remove terminate -->
+ <!--<antcall target="run-onegroup"><param name="tests" value="crashrecovery12"/></antcall>-->
+
+<!--
+ <antcall target="run-onegroup"><param name="tests" value="crashrecovery02_2"/></antcall>
+ <antcall target="run-onegroup"><param name="tests" value="crashrecovery05_2"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="crashrecovery08"/></antcall>
- <antcall target="run-onegroup"><param name="tests" value="crashrecovery12"/></antcall>
-
+-->
<antcall target="run-onegroup"><param name="tests" value="jdbcresources01_oracle_thin_jndi"/></antcall>
+ <!--
<antcall target="run-onegroup"><param name="tests" value="jdbcresources02_oracle_thin_jndi"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="jdbcresources01_mssqlserver_jndi"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="jdbcresources02_mssqlserver_jndi"/></antcall>
@@ -118,18 +126,23 @@
<antcall target="run-onegroup"><param name="tests" value="jdbcresources02_mysql_jndi"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="jdbcresources01_sybase_jndi"/></antcall>
<antcall target="run-onegroup"><param name="tests" value="jdbcresources02_sybase_jndi"/></antcall>
- -->
+-->
</target>
<target name="run-onegroup" depends="compile">
+ <echo message="Running group ${tests}"/>
<java classname="org.junit.runner.JUnitCore" fork="true">
<classpath>
<path refid="build"/>
<pathelement location="${build}"/>
<pathelement location="."/>
</classpath>
- <arg value="org.jboss.jbossts.qa.junit.generated.TestGroup_${tests}"/>
+ <!--<arg value="org.jboss.jbossts.qa.junit.generated.TestGroup_${tests}"/>-->
+ <arg value="org.jboss.jbossts.qa.junit.testgroup.TestGroup_${tests}"/>
+
+ <!--<jvmarg value="-Xdebug"/>-->
+ <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/>-->
</java>
</target>
@@ -137,7 +150,7 @@
<delete dir="${src}/org/jboss/jbossts/qa/junit/generated"/>
<mkdir dir="${src}/org/jboss/jbossts/qa/junit/generated"/>
-
+<!--
<antcall target="run-generator"><param name="tests" value="currenttests01"/></antcall>
<antcall target="run-generator"><param name="tests" value="jtatests01"/></antcall>
<antcall target="run-generator"><param name="tests" value="otsserver"/></antcall>
@@ -191,6 +204,27 @@
<antcall target="run-generator"><param name="tests" value="jdbclocals01-mysql_jndi"/></antcall>
<antcall target="run-generator"><param name="tests" value="jdbclocals01-sybase_jndi"/></antcall>
+
+ <antcall target="run-generator"><param name="tests" value="txoj"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="txcore"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="ait01_otstransactionmanager"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="aitresources01"/></antcall>
+
+ <antcall target="run-generator"><param name="tests" value="jdbcresources03-oracle_thin_jndi"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="jdbcresources04-oracle_thin_jndi"/></antcall>
+
+ <antcall target="run-generator"><param name="tests" value="otsserver-timeout"/></antcall>
+
+ <antcall target="run-generator"><param name="tests" value="perfprofile01_e"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="perfprofile01_i"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="perfprofileio"/></antcall>
+ <antcall target="run-generator"><param name="tests" value="crashrecovery13"/></antcall>
+
+-->
+
+ <!--<antcall target="run-generator"><param name="tests" value="performance"/></antcall> -->
+ <!--<antcall target="run-generator"><param name="tests" value="as-crashrecovery01"/></antcall>-->
+
</target>
@@ -205,6 +239,10 @@
</classpath>
<arg value="testdefs/jbossts-qa-${tests}-testdefs.xml"/>
<arg value="${src}/org/jboss/jbossts/qa/junit/generated"/>
+
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/>
+
</java>
<echo message="Done test group ${tests}"/>
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/build.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -27,9 +27,6 @@
<property name="org.jboss.jbossts.qa.ts.home" location="../install"/>
<property name="jbossts.install.lib" location="${org.jboss.jbossts.qa.ts.home}/lib"/>
- <!-- set this property to the location of a DTF TestingFramework.jar build -->
- <property name="org.jboss.jbossts.qa.testingframework_location" location="../ext/TestingFramework.jar"/>
-
<!-- TODO cd ArjunaJTS/orbportability; ant -f build-anttasks.xml -->
<property name="org.jboss.jbossts.qa.idlcompiler.lib"
location="../ArjunaJTS/orbportability/lib/ext"/>
@@ -118,6 +115,8 @@
<available file="${jbossts.install.lib}/jbossjta.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}/jbossjta-integration.jar" property="integration.build"/>
<available file="${jbossts.install.lib}/jbossjts-integration.jar" property="integration.build"/>
@@ -161,62 +160,7 @@
<property name="org.jboss.jbossts.qa.server_manager_location"
value="${org.jboss.jbossts.qa.server_manager_location}"/>
</ant>
-
- <!-- prepare the content of the qa distribution, which is the product build
- plus the qa stuff overlayed on it -->
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}">
- <fileset dir="${org.jboss.jbossts.qa.ts.home}"/>
- </copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/jdbc_profiles">
- <fileset dir="config/jdbc_profiles"/>
- </copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/perf_profiles">
- <fileset dir="config/perf_profiles"/>
- </copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/memory_profiles">
- <fileset dir="config/memory_profiles"/>
- </copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/lib">
- <fileset file="${org.jboss.jbossts.qa.testingframework_location}"/>
- <fileset file="tests/build/jbossts-${buildtype}-qa.jar"/>
- <fileset file="tests/build/astest.jar"/>
- <fileset file="tests/build/java.policy"/>
- <fileset file="${org.jboss.jbossts.qa.server_manager_location}"/>
- </copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/lib/all_dbdrivers/" failonerror="${have.dbdrivers}">
- <fileset refid="oracle.drivers"/>
- <fileset refid="mssql.drivers"/>
- <fileset refid="pgsql.drivers"/>
- <fileset refid="mysql.drivers"/>
- <fileset refid="ibmdb2.drivers"/>
- <fileset refid="sybase.drivers"/>
- </copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa" failonerror="false">
- <fileset dir="tests/build/qa">
- <include name="resources/**/*"/>
- </fileset>
- <fileset dir="tests">
- <include name="scripts/**/*"/>
- </fileset>
- </copy>
- <!-- testing is done with some non-default properties: -->
- <copy file="config/jbossts-${buildtype}-properties.xml"
- tofile="${org.jboss.jbossts.qa.dist.buildroot}/etc/jbossts-properties.xml" overwrite="true">
- </copy>
-
- <!-- for 'loca'l tests, we need some libs we would otherwise have got from DTF -->
- <mkdir dir="${org.jboss.jbossts.qa.dist.buildroot}/qa/lib/ext"/>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/lib/ext" failonerror="false">
- <fileset dir="ext">
- <include name="fscontext.jar"/>
- <include name="providerutil.jar"/>
- </fileset>
- </copy>
-
- <!-- build the qa distribution installer package -->
- <zip destfile="${org.jboss.jbossts.qa.dist.buildroot}/jbossts-${buildtype}-qa-distribution.zip"
- basedir="${org.jboss.jbossts.qa.dist.buildroot}" excludes="jbossts-${buildtype}-qa-distribution.zip"/>
-
+
</target>
<target name="help">
Modified: labs/jbosstm/trunk/qa/run-dtf-local.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-dtf-local.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/run-dtf-local.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -158,10 +158,10 @@
Drivers are placed into the pool by build.xml and into the classpath by config/<product>.xml
-->
<target name="install-dbdriver">
- <delete dir="build/qa/lib/selected_dbdriver"/>
- <mkdir dir="build/qa/lib/selected_dbdriver"/>
- <copy todir="build/qa/lib/selected_dbdriver">
- <fileset dir="build/qa/lib/all_dbdrivers/" includes="${files}"/>
+ <delete dir="dbdrivers/selected_dbdriver"/>
+ <mkdir dir="dbdrivers/selected_dbdriver"/>
+ <copy todir="dbdrivers/selected_dbdriver" flatten="true">
+ <fileset dir="dbdrivers/" includes="**/${files}"/>
</copy>
</target>
@@ -174,8 +174,8 @@
<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>
+ <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">
@@ -187,20 +187,20 @@
<antcall target="junit-tests"><param name="tests" value="jdbcresources02_mssqlserver_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>
+ <antcall target="junit-tests"><param name="tests" value="jdbcresources01_ibmdb2_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbcresources02_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="jdbcresources01-pgsql_jndi"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbcresources02-pgsql_jndi"/></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.7-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="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="junit-tests"><param name="tests" value="jdbcresources01_sybase_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbcresources02_sybase_jndi"/></antcall>
</target>
@@ -269,8 +269,44 @@
</target>
- <target name="junit-tests">
+ <!-- ##################################### -->
+ <target name="junit-tests">
+
+ <echo message="Running junit test group ${tests} from basedir=${basedir}"/>
+
+ <java classname="org.junit.runner.JUnitCore" fork="true">
+ <classpath>
+
+ <pathelement location="../ext/junit-4.6.jar"/>
+
+ <fileset dir="tests/build">
+ <include name="jbossts-*-qa.jar"/>
+ </fileset>
+
+ <fileset dir="../install/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../install/lib/ext">
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ </fileset>
+ <pathelement location="../install/etc"/>
+
+
+ </classpath>
+
+ <arg value="org.jboss.jbossts.qa.junit.testgroup.TestGroup_${tests}"/>
+
+ <!--<jvmarg value="-Xdebug"/>-->
+ <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/>-->
+ </java>
+ </target>
+
+ <!-- ##################################### -->
+
+ <target name="junit-tests-old">
+
<echo message="Running test group ${tests} from basedir=${basedir}"/>
<!-- by default we run in JTS config. Override by setting this property
@@ -325,16 +361,9 @@
<target name="scratch">
- <antcall target="junit-tests"><param name="tests" value="otsserver"/></antcall>
+ <antcall target="install-dbdriver"><param name="files" value="ojdbc14.jar"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbcresources01_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="crashrecovery11-mssqlserver_jndi"/></antcall>-->
-
</target>
<!--
Modified: labs/jbosstm/trunk/qa/testdefs/jbossts-qa-ait01_otstransactionmanager-testdefs.xml
===================================================================
--- labs/jbosstm/trunk/qa/testdefs/jbossts-qa-ait01_otstransactionmanager-testdefs.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/testdefs/jbossts-qa-ait01_otstransactionmanager-testdefs.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -97,12 +97,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -122,7 +122,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -146,12 +146,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -184,7 +184,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -209,12 +209,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -259,7 +259,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -285,12 +285,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -349,7 +349,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -376,12 +376,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -425,7 +425,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -452,12 +452,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -477,7 +477,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -501,12 +501,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -539,7 +539,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -564,12 +564,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -615,7 +615,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -641,12 +641,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -705,7 +705,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -732,12 +732,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -781,7 +781,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -808,12 +808,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -841,7 +841,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -866,12 +866,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -915,7 +915,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -942,12 +942,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -967,7 +967,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -991,12 +991,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1029,7 +1029,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1054,12 +1054,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1105,7 +1105,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1131,12 +1131,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1195,7 +1195,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1222,12 +1222,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1271,7 +1271,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1298,12 +1298,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1323,7 +1323,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1347,12 +1347,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1385,7 +1385,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1410,12 +1410,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1461,7 +1461,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1487,12 +1487,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1551,7 +1551,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1578,12 +1578,12 @@
<param>$(ORBFLAGS_2)</param>
<param>-test</param>
</start_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" location="server1">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RegisterOTSServer" runtime_id="setup0" location="server1">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
</perform_task>
- <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.SetupOTSServer" runtime_id="setup1" location="all">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<jvm_param>-Dots.server.bindname=$(1)</jvm_param>
@@ -1627,7 +1627,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
Modified: labs/jbosstm/trunk/qa/testdefs/jbossts-qa-aitresources01-testdefs.xml
===================================================================
--- labs/jbosstm/trunk/qa/testdefs/jbossts-qa-aitresources01-testdefs.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/testdefs/jbossts-qa-aitresources01-testdefs.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -185,7 +185,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -227,7 +227,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -282,7 +282,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -350,7 +350,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -404,7 +404,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -437,7 +437,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -479,7 +479,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -534,7 +534,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -602,7 +602,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -656,7 +656,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -696,7 +696,7 @@
<wait_for_task runtime_id="client1"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -748,7 +748,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -781,7 +781,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -823,7 +823,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -878,7 +878,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -946,7 +946,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1000,7 +1000,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1033,7 +1033,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1075,7 +1075,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1130,7 +1130,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1198,7 +1198,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1252,7 +1252,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1292,7 +1292,7 @@
<wait_for_task runtime_id="client1"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1344,7 +1344,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -1380,7 +1380,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1413,7 +1413,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1443,7 +1443,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1480,7 +1480,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1513,7 +1513,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1547,7 +1547,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1587,7 +1587,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1623,7 +1623,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1658,7 +1658,7 @@
</start_task>
<wait_for_task runtime_id="client0"/>
<wait_for_task runtime_id="client1"/>
- <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome01">
+ <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome01" runtime_id="outcome0">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<param>2000</param>
@@ -1666,7 +1666,7 @@
</perform_task>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1712,7 +1712,7 @@
<wait_for_task runtime_id="client1"/>
<wait_for_task runtime_id="client2"/>
<wait_for_task runtime_id="client3"/>
- <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome01">
+ <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome01" runtime_id="outcome0">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<param>4000</param>
@@ -1720,7 +1720,7 @@
</perform_task>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1771,7 +1771,7 @@
<wait_for_task runtime_id="client1"/>
<wait_for_task runtime_id="client2"/>
<wait_for_task runtime_id="client3"/>
- <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome02">
+ <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome02" runtime_id="outcome0">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<param>2000</param>
@@ -1781,7 +1781,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1829,7 +1829,7 @@
<wait_for_task runtime_id="client1"/>
<wait_for_task runtime_id="client2"/>
<wait_for_task runtime_id="client3"/>
- <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome02">
+ <perform_task id="org.jboss.jbossts.qa.AITResources01Outcomes.Outcome02" runtime_id="outcome0">
<param>$(ORBFLAGS_1)</param>
<param>$(ORBFLAGS_2)</param>
<param>2000</param>
@@ -1838,7 +1838,7 @@
</perform_task>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1869,7 +1869,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -1906,7 +1906,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1939,7 +1939,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -1973,7 +1973,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2013,7 +2013,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -2049,7 +2049,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -2080,7 +2080,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2122,7 +2122,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
</perform_task>
@@ -2177,7 +2177,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -2245,7 +2245,7 @@
<terminate_task runtime_id="server2"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -2299,7 +2299,7 @@
<wait_for_task runtime_id="client3"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
<param>$(2)</param>
<param>$(3)</param>
@@ -2335,7 +2335,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2367,7 +2367,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2401,7 +2401,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2433,7 +2433,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2467,7 +2467,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2499,7 +2499,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2533,7 +2533,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2565,7 +2565,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2599,7 +2599,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2631,7 +2631,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2665,7 +2665,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2695,7 +2695,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
@@ -2725,7 +2725,7 @@
<wait_for_task runtime_id="client0"/>
<terminate_task runtime_id="server1"/>
<terminate_task runtime_id="server0"/>
- <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" location="all">
+ <perform_task id="org.jboss.jbossts.qa.Utils.RemoveServerIORStore" runtime_id="cleanup0" location="all">
<param>$(1)</param>
</perform_task>
</action_list>
Added: labs/jbosstm/trunk/qa/testdefs/jbossts-qa-crashrecovery13-testdefs.xml
===================================================================
--- labs/jbosstm/trunk/qa/testdefs/jbossts-qa-crashrecovery13-testdefs.xml (rev 0)
+++ labs/jbosstm/trunk/qa/testdefs/jbossts-qa-crashrecovery13-testdefs.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -0,0 +1,57 @@
+<!-- $Id: atsqa-crashrecovery13-qa-testdefs.xml,v 1.2 2004/10/25 15:11:51 nmcl Exp $ -->
+<test_set>
+ <default_timeout value="240"/>
+ <description>Crash Recovery Tests 13</description>
+
+ <test_group name="CrashRecovery13">
+ <task_declaration>
+ <task id="org.jboss.jbossts.qa.Utils.EmptyObjectStore" classname="org.jboss.jbossts.qa.Utils.EmptyObjectStore" runner="JavaTaskRunner" type="expect_pass_fail"/>
+ <task id="org.jboss.jbossts.qa.CrashRecovery13Clients.Test01" classname="org.jboss.jbossts.qa.CrashRecovery13Clients.Test01" runner="JavaTaskRunner" type="expect_pass_fail"/>
+ <task id="org.jboss.jbossts.qa.CrashRecovery13Clients.Test02" classname="org.jboss.jbossts.qa.CrashRecovery13Clients.Test02" runner="JavaTaskRunner" type="expect_pass_fail"/>
+ <task id="org.jboss.jbossts.qa.CrashRecovery13Clients.Test03" classname="org.jboss.jbossts.qa.CrashRecovery13Clients.Test03" runner="JavaTaskRunner" type="expect_pass_fail"/>
+ </task_declaration>
+
+ <test_declaration id="CrashRecovery13_Test01" descriptive_name="CrashRecovery13 Test01" author="MCL">
+ <description>XAResourceRecovery interface test</description>
+ <configuration names_required="1"/>
+ <action_list>
+ <perform_task id="org.jboss.jbossts.qa.Utils.EmptyObjectStore" location="all">
+ </perform_task>
+ <start_task id="org.jboss.jbossts.qa.CrashRecovery13Clients.Test01" runtime_id="client0" location="setup0" >
+ <param>nocrash</param>
+ <param>CR13_01.log</param>
+ </start_task>
+ <wait_for_task runtime_id="client0"/>
+ </action_list>
+ </test_declaration>
+
+ <test_declaration id="CrashRecovery13_Test02" descriptive_name="CrashRecovery13 Test02" author="MCL">
+ <description>XA node name functionality test</description>
+ <configuration names_required="1"/>
+ <action_list>
+ <perform_task id="org.jboss.jbossts.qa.Utils.EmptyObjectStore" location="all">
+ </perform_task>
+ <start_task id="org.jboss.jbossts.qa.CrashRecovery13Clients.Test02" runtime_id="client0" location="setup0" >
+ <param>nocrash</param>
+ <param>CR13_02.log</param>
+ </start_task>
+ <wait_for_task runtime_id="client0"/>
+ </action_list>
+ </test_declaration>
+
+ <test_declaration id="CrashRecovery13_Test03" descriptive_name="CrashRecovery13 Test03" author="MCL">
+ <description>XAConnectionRecovery test</description>
+ <configuration names_required="1"/>
+ <action_list>
+ <perform_task id="org.jboss.jbossts.qa.Utils.EmptyObjectStore" location="all">
+ </perform_task>
+ <start_task id="org.jboss.jbossts.qa.CrashRecovery13Clients.Test03" runtime_id="client0" location="setup0" >
+ <param>nocrash</param>
+ <param>CR13_03.log</param>
+ </start_task>
+ <wait_for_task runtime_id="client0"/>
+ </action_list>
+ </test_declaration>
+
+ </test_group>
+</test_set>
Modified: labs/jbosstm/trunk/qa/testdefs/performance-testdefs.xml
===================================================================
--- labs/jbosstm/trunk/qa/testdefs/performance-testdefs.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/testdefs/performance-testdefs.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -11,28 +11,28 @@
<task_declaration>
<task id="PerformanceTestWrapper"
- classname="com.hp.mwtests.performance.PerformanceTestWrapper"
+ classname="org.jboss.jbossts.qa.performance.PerformanceTestWrapper"
runner="UnitTestRunner" type="expect_pass_fail"
parameter_setting="APPEND_PARAMETERS|OVERRIDE_JVM_PARAMETERS">
<param>-ORBname</param><param>arjuna.portable_interceptor.ots_interposition</param>
</task>
<task id="DummyImplServer"
- classname="com.hp.mwtests.performance.servers.DummyImplServer"
+ classname="org.jboss.jbossts.qa.performance.servers.DummyImplServer"
runner="UnitTestRunner" type="expect_ready"
parameter="APPEND_PARAMETERS|OVERRIDE_JVM_PARAMETERS">
<param>-ORBname</param><param>arjuna.portable_interceptor.ots_interposition</param>
</task>
<task id="NestedOnePhaseServer"
- classname="com.hp.mwtests.performance.servers.NestedOnePhaseServer"
+ classname="org.jboss.jbossts.qa.performance.servers.NestedOnePhaseServer"
runner="UnitTestRunner" type="expect_ready"
parameter="APPEND_PARAMETERS|OVERRIDE_JVM_PARAMETERS">
<param>-ORBname</param><param>arjuna.portable_interceptor.ots_interposition</param>
</task>
<task id="NestedTwoPhaseServer"
- classname="com.hp.mwtests.performance.servers.NestedTwoPhaseServer"
+ classname="org.jboss.jbossts.qa.performance.servers.NestedTwoPhaseServer"
runner="UnitTestRunner" type="expect_ready"
parameter="APPEND_PARAMETERS|OVERRIDE_JVM_PARAMETERS">
<param>-ORBname</param><param>arjuna.portable_interceptor.ots_interposition</param>
@@ -55,7 +55,7 @@
</start_task>
<perform_task id="PerformanceTestWrapper" name_list="1,2">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.remote.nested.NestedTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.remote.nested.NestedTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-service</param><param>$(1)</param>
@@ -74,7 +74,7 @@
<task_declaration>
<task id="PerformanceTestWrapper"
- classname="com.hp.mwtests.performance.PerformanceTestWrapper"
+ classname="org.jboss.jbossts.qa.performance.PerformanceTestWrapper"
runner="UnitTestRunner" type="expect_pass_fail"
parameter_setting="APPEND_PARAMETERS|OVERRIDE_JVM_PARAMETERS">
<param>-ORBname</param><param>arjuna.portable_interceptor.ots_interposition</param>
@@ -90,7 +90,7 @@
<action_list>
<perform_task id="PerformanceTestWrapper">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.local.NestedTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.local.NestedTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-commit</param>
@@ -107,7 +107,7 @@
<action_list>
<perform_task id="PerformanceTestWrapper">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.local.NestedOnePhaseTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.local.NestedOnePhaseTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-commit</param>
@@ -124,7 +124,7 @@
<action_list>
<perform_task id="PerformanceTestWrapper">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.local.NestedTwoPhaseTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.local.NestedTwoPhaseTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-commit</param>
@@ -141,7 +141,7 @@
<action_list>
<perform_task id="PerformanceTestWrapper">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.local.TopLevelTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.local.TopLevelTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-commit</param>
@@ -158,7 +158,7 @@
<action_list>
<perform_task id="PerformanceTestWrapper">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.local.OnePhaseTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.local.OnePhaseTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-commit</param>
@@ -175,7 +175,7 @@
<action_list>
<perform_task id="PerformanceTestWrapper">
- <param>-classname</param><param>com.hp.mwtests.performance.implementations.local.TwoPhaseTrx</param>
+ <param>-classname</param><param>org.jboss.jbossts.qa.performance.implementations.local.TwoPhaseTrx</param>
<param>-iterations</param><param>1000</param>
<param>-threads</param><param>10</param>
<param>-commit</param>
Modified: labs/jbosstm/trunk/qa/tests/build-core.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-core.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/build-core.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -23,9 +23,6 @@
<!-- set this property to the location of a JBossTS core build -->
<property name="org.jboss.jbossts.qa.ts.home" location="../../install/"/>
- <!-- set this property to the location of a DTF TestingFramework build -->
- <property name="org.jboss.jbossts.qa.testingframework_location" location="../../ext/TestingFramework.jar"/>
-
<property name="org.jboss.jbossts.qa.buildroot" location="build"/>
<property name="org.jboss.jbossts.qa.build.classes" value="${org.jboss.jbossts.qa.buildroot}/classes/"/>
<property name="org.jboss.jbossts.qa.core.src" location="src"/>
@@ -33,7 +30,7 @@
<path id="core.classpath">
<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
- <include name="jbosscore.jar"/>
+ <include name="arjunacore.jar"/>
</fileset>
<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
<include name="jbossts-common.jar"/>
@@ -64,7 +61,6 @@
<classpath>
<path refid="core.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
- <pathelement location="${org.jboss.jbossts.qa.testingframework_location}"/>
</classpath>
</javac>
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -29,10 +29,6 @@
<property name="jbossall-client.location" location="${env.JBOSS_HOME}/client/jbossall-client.jar"/>
<property name="astest.dir" value="org/jboss/jbossts/qa/astests"/>
- <!-- set this property to the location of a DTF TestingFramework build -->
- <property name="org.jboss.jbossts.qa.testingframework_location" location="../../ext/TestingFramework.jar"/>
-
-
<!-- set this to the location(s) of the database drivers -->
<path id="database.drivers.path">
<fileset dir="/oracle/product/10.2.0/db_1/jdbc/lib/">
@@ -92,12 +88,11 @@
<include name="**/org/jboss/jbossts/qa/astests/**/*.java"/>
<exclude name="**/astests/**"/>
- <exclude name="**/junit/**"/>
+ <exclude name="**/junit/XML2JUnit.java"/>
<classpath>
<path refid="jta.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
- <pathelement location="${org.jboss.jbossts.qa.testingframework_location}"/>
</classpath>
</javac>
</target>
@@ -110,7 +105,6 @@
<classpath>
<path refid="jta.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
- <pathelement location="${org.jboss.jbossts.qa.testingframework_location}"/>
<!-- additional dependency, which is why we don't just do this in compile task above: -->
<pathelement location="${jbossall-client.location}"/>
</classpath>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-07-15 12:37:20 UTC (rev 28048)
@@ -29,9 +29,6 @@
<property name="jbossall-client.location" location="${jboss.home}/client/jbossall-client.jar"/>
<property name="astest.dir" value="org/jboss/jbossts/qa/astests"/>
- <!-- set this property to the location of a DTF TestingFramework build -->
- <property name="org.jboss.jbossts.qa.testingframework_location" location="../../ext/TestingFramework.jar"/>
-
<!-- TODO cd ArjunaJTS/orbportability; ant -f build-anttasks.xml -->
<property name="org.jboss.jbossts.qa.idlcompiler.lib"
location="../../ArjunaJTS/orbportability/lib/ext"/>
@@ -76,6 +73,7 @@
<pathelement location="../../ArjunaJTS/orbportability/config"/>
<fileset file="${org.jboss.jbossts.qa.server_manager_location}" />
<pathelement path="${org.jboss.jbossts.qa.orb.classpath}"/>
+ <pathelement location="../../ext/junit-4.6.jar"/>
</path>
<target name="org.jboss.jbossts.qa.init">
@@ -106,7 +104,7 @@
<element src="${org.jboss.jbossts.qa.idl}/performance.idl"
package="com.hp.mwtests"
- mappings="CosTransactions=org.omg;performance=com.hp.mwtests;CORBA=org.omg"/>
+ mappings="CosTransactions=org.omg;performance=org.jboss.jbossts.qa;CORBA=org.omg"/>
<element src="${org.jboss.jbossts.qa.idl}/AITResources01.idl"
package="org.jboss.jbossts.qa.AITResources01"
mappings="AITResources01=org.jboss.jbossts.qa;CosTransactions=org.omg;CORBA=org.omg"/>
@@ -222,12 +220,11 @@
<exclude name="org/jboss/jbossts/qa/ArjunaCore/Common/ClassPathParserTest.java" />
<exclude name="**/${astest.dir}/**/*.java" />
- <exclude name="**/junit/**"/>
+ <exclude name="**/junit/XML2JUnit.java"/>
<classpath>
<path refid="jts.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
- <pathelement location="${org.jboss.jbossts.qa.testingframework_location}"/>
</classpath>
</javac>
</target>
Modified: labs/jbosstm/trunk/qa/tests/idl/performance.idl
===================================================================
--- labs/jbosstm/trunk/qa/tests/idl/performance.idl 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/idl/performance.idl 2009-07-15 12:37:20 UTC (rev 28048)
@@ -1,13 +1,8 @@
-#ifndef NO_PRAGMA_SUPPORT
-#pragma prefix "mwtests.hp.com"
-#endif
-#ifdef HAVE_JAVAPACKAGE
-#pragma javaPackage "com.hp.mwtests"
-#endif
-
#include <CosTransactions.idl>
+#pragma prefix "qa.jbossts.jboss.org"
+
module performance
{
exception PerfTestException { };
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/DistributedIORStorePlugin.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/DistributedIORStorePlugin.java 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/DistributedIORStorePlugin.java 2009-07-15 12:37:20 UTC (rev 28048)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.jbossts.qa.Utils;
-
-import org.jboss.dtf.testframework.nameservice.NameNotBound;
-import org.jboss.dtf.testframework.nameservice.NameServiceInterface;
-
-import java.rmi.Naming;
-
-/*
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- *
- * Arjuna Technology Ltd.
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: DistributedIORStorePlugin.java,v 1.3 2003/07/30 12:16:20 jcoleman Exp $
- */
-
-public class DistributedIORStorePlugin implements ServerIORStorePlugin
-{
- private final static String NAME_SERVICE_URI_PROPERTY = "org.jboss.jbossts.qa.Utils.nameserviceuri";
-
- private NameServiceInterface _nameService = null;
-
- public void initialise() throws Exception
- {
- String nameServiceURI = System.getProperty(NAME_SERVICE_URI_PROPERTY);
-
- if (nameServiceURI == null)
- {
- throw new Exception("Name service uri not specified '" + NAME_SERVICE_URI_PROPERTY + "'");
- }
-
- _nameService = (NameServiceInterface) Naming.lookup(nameServiceURI);
- }
-
- public void storeIOR(String serverName, String serverIOR) throws Exception
- {
- _nameService.rebindReference(serverName, serverIOR);
- }
-
- public void removeIOR(String serverName) throws Exception
- {
- _nameService.unbindReference(serverName);
- }
-
- public String loadIOR(String serverName) throws Exception
- {
- try
- {
- return (String) _nameService.lookup(serverName);
- }
- catch (NameNotBound e)
- {
- return (null);
- }
- }
-
- public void remove()
- {
- // Do nothing
- }
-}
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/RegisterOTSServer.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/RegisterOTSServer.java 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/RegisterOTSServer.java 2009-07-15 12:37:20 UTC (rev 28048)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.jbossts.qa.Utils;
-
-import org.jboss.dtf.testframework.unittest.Test;
-import org.omg.CosTransactions.TransactionFactory;
-import org.omg.CosTransactions.TransactionFactoryHelper;
-
-/*
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- *
- * Arjuna Technology Ltd.
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: RegisterOTSServer.java,v 1.2 2003/06/26 11:45:07 rbegg Exp $
- */
-
-public class RegisterOTSServer extends Test
-{
- public final static String NAME_SERVICE_BIND_NAME_PROPERTY = "ots.server.bindname";
-
- public void run(String[] args)
- {
- String bindName = System.getProperty(NAME_SERVICE_BIND_NAME_PROPERTY);
-
- if (bindName != null)
- {
- logInformation("Registering OTS Server '" + bindName + "'");
-
- try
- {
- ORBInterface.initORB(args, null);
-
- String[] transactionFactoryParams = new String[1];
- transactionFactoryParams[0] = ORBServices.otsKind;
-
- TransactionFactory transactionFactory = TransactionFactoryHelper.narrow(ORBServices.getService(ORBServices.transactionService, transactionFactoryParams));
-
- registerService(bindName, ORBInterface.orb().object_to_string(transactionFactory));
-
- assertReady();
- assertSuccess();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- }
- else
- {
- logInformation("Bind name '" + NAME_SERVICE_BIND_NAME_PROPERTY + "' not specified");
- assertFailure();
- }
- }
-}
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer.java 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer.java 2009-07-15 12:37:20 UTC (rev 28048)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.jbossts.qa.Utils;
-
-import org.jboss.dtf.testframework.unittest.Test;
-import com.arjuna.orbportability.Services;
-
-/*
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- *
- * Arjuna Technology Ltd.
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: SetupOTSServer.java,v 1.2 2003/06/26 11:45:07 rbegg Exp $
- */
-
-public class SetupOTSServer extends Test
-{
- public void run(String[] args)
- {
- String bindName = System.getProperty(RegisterOTSServer.NAME_SERVICE_BIND_NAME_PROPERTY);
-
- if (bindName != null)
- {
- logInformation("Looking up OTS Server '" + bindName + "'");
-
- try
- {
- String transactionServiceIOR = getService(bindName);
-
- ORBInterface.initORB(args, null);
-
- String[] transactionFactoryParams = new String[1];
- transactionFactoryParams[0] = ORBServices.otsKind;
-
- Services services = new Services(ORBInterface.getORB());
-
- services.registerService(ORBInterface.orb().string_to_object(transactionServiceIOR), ORBServices.transactionService, transactionFactoryParams);
-
- assertReady();
- assertSuccess();
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- assertFailure();
- }
- }
- else
- {
- logInformation("Bind name '" + RegisterOTSServer.NAME_SERVICE_BIND_NAME_PROPERTY + "' not specified");
- assertFailure();
- }
- }
-}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer2.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer2.java 2009-07-15 12:28:29 UTC (rev 28047)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/SetupOTSServer2.java 2009-07-15 12:37:20 UTC (rev 28048)
@@ -40,9 +40,11 @@
public class SetupOTSServer2
{
+ public final static String NAME_SERVICE_BIND_NAME_PROPERTY = "ots.server.bindname";
+
public static void main(String[] args)
{
- String bindName = System.getProperty(RegisterOTSServer.NAME_SERVICE_BIND_NAME_PROPERTY);
+ String bindName = System.getProperty(NAME_SERVICE_BIND_NAME_PROPERTY);
if (bindName != null)
{
@@ -71,7 +73,7 @@
}
else
{
- System.out.println("Bind name '" + RegisterOTSServer.NAME_SERVICE_BIND_NAME_PROPERTY + "' not specified");
+ System.out.println("Bind name '" + NAME_SERVICE_BIND_NAME_PROPERTY + "' not specified");
System.out.println("Failed");
}
}
More information about the jboss-svn-commits
mailing list