[jboss-cvs] JBossAS SVN: r65825 - in trunk/testsuite: imports/sections and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 4 03:07:54 EDT 2007
Author: reverbel
Date: 2007-10-04 03:07:54 -0400 (Thu, 04 Oct 2007)
New Revision: 65825
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/cts.xml
Log:
Fix the testsuite build by disabling the compilation of the following testcases, which depend on the removed TM code: cts/test/StatefulSessionUnitTestCase, securitymgr/test/StatefulSessionUnitTestCase, messagedriven/beans/TestMessageDriven, and txpropiiop/**. THIS NEEDS TO BE REVISITED.
Remove all targets related to TM/DTM/OTS.
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-10-04 05:43:50 UTC (rev 65824)
+++ trunk/testsuite/build.xml 2007-10-04 07:07:54 UTC (rev 65825)
@@ -452,8 +452,10 @@
failonerror="${javac.fail.onerror}">
<src path="${source.java}"/>
<src path="${build.gen-src}"/>
- <exclude name="org/jboss/test/recover/oracle/**"/>
- <exclude name="org/jboss/test/recover/derby/**"/>
+ <exclude name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.java"/>
+ <exclude name="org/jboss/test/securitymgr/test/StatefulSessionUnitTestCase.java"/>
+ <exclude name="org/jboss/test/messagedriven/beans/TestMessageDriven.java"/>
+ <exclude name="org/jboss/test/txpropiiop/**"/>
<exclude name="org/jboss/test/xml/JaxpXPathBaseTestCase*" if="HAVE_JDK_1.4"/>
<exclude name="org/jboss/test/aop/**"/>
<classpath refid="tests.compile.classpath"/>
@@ -754,9 +756,6 @@
<patternset id="tomcat.webctx.includes">
<include name="org/jboss/test/web/test/WebCtxLoaderTestCase.class"/>
</patternset>
- <patternset id="dtm.excludes">
- <exclude name="org/jboss/test/dtm/**"/>
- </patternset>
<!-- ws-bpel integration tests -->
<patternset id="jbpm-bpel.includes">
<include name="org/jboss/test/bpel/**/*TestCase.class"/>
@@ -818,7 +817,6 @@
<patternset refid="deployment-service.excludes"/>
<patternset refid="compatibility.excludes"/>
<patternset refid="binding-manager.excludes"/>
- <patternset refid="dtm.excludes"/>
<patternset refid="jbossmq.excludes"/>
</patternset>
@@ -1030,575 +1028,6 @@
<server:stop name="tomcat-federation"/>
</target>
-
- <!-- DTM recovery tests -->
- <target name="dtm-ots-recovery-configs" description="DTM recovery tests">
- <!-- Create configs root-coordinator, xa-resource-manager,
- subordinate-coordinator-1 and subordinate-coordinator-2,
- with EJB3, DTM, and OTS -->
- <create-ejb3-dtm-config conf="root-coordinator"/>
- <copy todir="${jboss.dist}/server/root-coordinator/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node0}"/>
- </filterset>
- </copy>
- <create-ejb3-dtm-config conf="xa-resource-manager"/>
- <copy todir="${jboss.dist}/server/xa-resource-manager/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node1}"/>
- </filterset>
- </copy>
- <create-ejb3-dtm-config conf="subordinate-coordinator-1"/>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-1/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node2}"/>
- </filterset>
- </copy>
- <create-ejb3-dtm-config conf="subordinate-coordinator-2"/>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-2/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node3}"/>
- </filterset>
- </copy>
-
- <!-- make jndi.properties files available to clients of node0 -->
- <copy todir="${build.resources}" overwrite="true">
- <fileset dir="${source.resources}/recover">
- <include name="host0.jndi.properties"/>
- <include name="host0.cosnaming.jndi.properties"/>
- </fileset>
- <filterset>
- <filter token="HOST0" value="${node0}"/>
- </filterset>
- </copy>
-
- <!-- deploy dummy recoverable and logger wrapper services to node1 -->
- <copy todir="${jboss.dist}/server/xa-resource-manager/deploy" overwrite="true"
- file="${build.lib}/recover-dummyrecoverable.sar"/>
- <copy todir="${jboss.dist}/server/xa-resource-manager/lib" overwrite="true"
- file="${build.lib}/recover-loggerwrapper.jar"/>
-
- <!-- deploy dummy recoverable proxy and logger wrapper services
- to node0, node2 and node3 -->
- <copy todir="${jboss.dist}/server/root-coordinator/lib" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="recover-dummyrecoverableproxy.jar"/>
- <include name="recover-loggerwrapper.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/root-coordinator/deploy" overwrite="true"
- file="${build.resources}/recover/dummyrecoverableproxy-service.xml">
- <filterset>
- <filter token="HOST1" value="${node1}"/>
- </filterset>
- </copy>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-1/lib" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="recover-dummyrecoverableproxy.jar"/>
- <include name="recover-loggerwrapper.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-1/deploy" overwrite="true"
- file="${build.resources}/recover/dummyrecoverableproxy-service.xml">
- <filterset>
- <filter token="HOST1" value="${node1}"/>
- </filterset>
- </copy>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-2/lib" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="recover-dummyrecoverableproxy.jar"/>
- <include name="recover-loggerwrapper.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-2/deploy" overwrite="true"
- file="${build.resources}/recover/dummyrecoverableproxy-service.xml">
- <filterset>
- <filter token="HOST1" value="${node1}"/>
- </filterset>
- </copy>
-
- <!-- Deploy EJBs that will be used across server restarts -->
- <copy todir="${jboss.dist}/server/root-coordinator/deploy" overwrite="true"
- file="${build.lib}/recover-stateless.ejb3"/>
- <copy todir="${jboss.dist}/server/root-coordinator/deploy" overwrite="true"
- file="${build.lib}/recover-xaresenlistercaller.jar"/>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-1/deploy" overwrite="true"
- file="${build.lib}/recover-xaresenlister.jar"/>
- <copy todir="${jboss.dist}/server/subordinate-coordinator-2/deploy" overwrite="true"
- file="${build.lib}/recover-xaresenlister.jar"/>
- </target>
-
- <target name="xa-recovery-tests"
- description="XA recovery tests"
- depends="dtm-ots-recovery-configs">
- <!-- Start servers -->
- <server:start name="xa-resource-manager"/>
- <server:start name="root-coordinator"/>
- <echo message="Nodes have started, waiting for node set to stablize..."/>
- <sleep seconds="2" />
- <!-- Run XA recovery tests -->
- <run-dtm-recovery-test test="CrashBeforeTxCommitted"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashAfterTxCommitted"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHavePrepared"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHaveCommitted"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashAfterTxCommittedWithSuccessfulXARetryAtRecoveryTime"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime"
- restart="root-coordinator"/>
- <!-- Stop servers -->
- <server:stop name="root-coordinator"/>
- <server:stop name="xa-resource-manager"/>
- </target>
-
- <target name="dtm-recovery-tests"
- description="DTM recovery tests"
- depends="dtm-ots-recovery-configs">
- <!-- Start servers -->
- <server:start name="xa-resource-manager"/>
- <server:start name="subordinate-coordinator-1"/>
- <server:start name="subordinate-coordinator-2"/>
- <server:start name="root-coordinator"/>
- <echo message="Nodes have started, waiting for node set to stablize..."/>
- <sleep seconds="2" />
- <!-- Run DTM recovery tests -->
- <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashBeforeDistributedTxCommitted"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItPrepares"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItAnswersPrepare"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceAfterPrepare"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItPrepares"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItAnswersPrepare"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceAfterPrepare"
- restart="subordinate-coordinator-2"/>
- <!-- Stop servers -->
- <server:stop name="root-coordinator"/>
- <server:stop name="subordinate-coordinator-2"/>
- <server:stop name="subordinate-coordinator-1"/>
- <server:stop name="xa-resource-manager"/>
- </target>
-
- <target name="ots-recovery-tests"
- description="OTS recovery tests"
- depends="dtm-ots-recovery-configs">
- <!-- Start servers -->
- <server:start name="xa-resource-manager"/>
- <server:start name="subordinate-coordinator-1"/>
- <server:start name="subordinate-coordinator-2"/>
- <server:start name="root-coordinator"/>
- <echo message="Nodes have started, waiting for node set to stablize..."/>
- <sleep seconds="2" />
- <!-- Run OTS recovery tests -->
- <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedIIOP"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedIIOP"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItPreparesIIOP"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItAnswersPrepareIIOP"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceAfterPrepareIIOP"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItPreparesIIOP"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItAnswersPrepareIIOP"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceAfterPrepareIIOP"
- restart="subordinate-coordinator-2"/>
- <!-- Stop servers -->
- <server:stop name="root-coordinator"/>
- <server:stop name="subordinate-coordinator-2"/>
- <server:stop name="subordinate-coordinator-1"/>
- <server:stop name="xa-resource-manager"/>
- </target>
-
- <target name="mixed-dtm-ots-recovery-tests"
- description="Mixed DTM/OTS recovery tests"
- depends="dtm-ots-recovery-configs">
- <!-- Start servers -->
- <server:start name="xa-resource-manager"/>
- <server:start name="subordinate-coordinator-1"/>
- <server:start name="subordinate-coordinator-2"/>
- <server:start name="root-coordinator"/>
- <echo message="Nodes have started, waiting for node set to stablize..."/>
- <sleep seconds="2" />
- <!-- Run mixed DTM/OTS recovery tests -->
- <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedJBRemIIOP"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedJBRemIIOP"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItPreparesJBRemIIOP"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItAnswersPrepareJBRemIIOP"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceAfterPrepareJBRemIIOP"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItPreparesJBRemIIOP"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItAnswersPrepareJBRemIIOP"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceAfterPrepareJBRemIIOP"
- restart="subordinate-coordinator-2"/>
- <!-- Stop servers -->
- <server:stop name="root-coordinator"/>
- <server:stop name="subordinate-coordinator-2"/>
- <server:stop name="subordinate-coordinator-1"/>
- <server:stop name="xa-resource-manager"/>
- </target>
-
- <target name="mixed-ots-dtm-recovery-tests"
- description="Mixed OTS/DTM recovery tests"
- depends="dtm-ots-recovery-configs">
- <!-- Start servers -->
- <server:start name="xa-resource-manager"/>
- <server:start name="subordinate-coordinator-1"/>
- <server:start name="subordinate-coordinator-2"/>
- <server:start name="root-coordinator"/>
- <echo message="Nodes have started, waiting for node set to stablize..."/>
- <sleep seconds="2" />
- <!-- Run mixed OTS/DTM recovery tests -->
- <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedIIOPJBRem"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedIIOPJBRem"
- restart="root-coordinator"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItPreparesIIOPJBRem"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItAnswersPrepareIIOPJBRem"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfFirstRemoteResourceAfterPrepareIIOPJBRem"
- restart="subordinate-coordinator-1"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItPreparesIIOPJBRem"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceBeforeItAnswersPrepareIIOPJBRem"
- restart="subordinate-coordinator-2"/>
- <run-dtm-recovery-test test="CrashOfSecondRemoteResourceAfterPrepareIIOPJBRem"
- restart="subordinate-coordinator-2"/>
- <!-- Stop servers -->
- <server:stop name="root-coordinator"/>
- <server:stop name="subordinate-coordinator-2"/>
- <server:stop name="subordinate-coordinator-1"/>
- <server:stop name="xa-resource-manager"/>
- </target>
-
- <target name="all-xa-dtm-ots-recovery-tests"
- description="All XA/DTM/OTS recovery tests"
- depends="xa-recovery-tests, dtm-recovery-tests, ots-recovery-tests, mixed-dtm-ots-recovery-tests, mixed-ots-dtm-recovery-tests"/>
-
- <macrodef name="run-dtm-recovery-test">
- <attribute name="test" description="the name of the test to run"/>
- <attribute name="restart"
- description="the server that will crash and will need a restart "/>
- <sequential>
- <run-dtm-test test="org.jboss.test.recover.test.@{test}TestCase"/>
- <echo message="Server @{restart} should have crashed. Restarting it..."/>
- <server:start name="@{restart}"/>
- <echo message="Waiting for restarted server to perform transaction recovery..."/>
- <sleep seconds="2" />
- <run-dtm-test test="org.jboss.test.recover.test.RecoveryFrom@{test}TestCase"/>
- </sequential>
- </macrodef>
-
- <macrodef name="run-dtm-test"
- description="run a dtm test given its full class name">
- <attribute name="test"
- description="the fully qualified class name of the test to run"/>
- <sequential>
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- showoutput="${junit.showoutput}"
- jvm="${junit.jvm}">
-
- <jvmarg value="${junit.jvm.options}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
- <jvmarg value="-Djacorb.orb.print_version=off"/>
- <jvmarg value="-Djacorb.log.default.verbosity=0"/>
- <jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
- <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
- <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
- <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/NameService"/>
- <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
- <jvmarg value="-Djava.security.manager"/>
- <sysproperty key="java.security.policy" value="${build.resources}/iiop/client.policy"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="jbosstest.server.host" value="${node0}"/>
- <sysproperty key="jbosstest.resource1.server.host" value="${node2}"/>
- <sysproperty key="jbosstest.resource2.server.host" value="${node3}"/>
- <!-- Pass along any jbosstest.* system properties -->
- <syspropertyset>
- <propertyref prefix="jbosstest."/>
- </syspropertyset>
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
- </classpath>
-
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <formatter type="plain" usefile="${junit.formatter.usefile}"/>
-
- <test todir="${build.reports}"
- name="@{test}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}"/>
- </junit>
- </sequential>
- </macrodef>
-
- <!-- DTM recovery unit tests -->
- <target name="tests-dtm-recovery-unit">
- <echo><![CDATA[
- junit.timeout: ${junit.timeout}
- jbosstest.iterationcount: ${jbosstest.iterationcount}
- jbosstest.threadcount: ${jbosstest.threadcount}
- jbosstest.beancount: ${jbosstest.beancount}
- ]]></echo>
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <jvmarg value="${junit.jvm.options}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
- <jvmarg value="-Djacorb.orb.print_version=off"/>
- <jvmarg value="-Djacorb.log.default.verbosity=0"/>
- <jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
- <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
- <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
- <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/NameService"/>
- <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
- <jvmarg value="-Djava.security.manager"/>
- <sysproperty key="java.security.policy" value="${build.resources}/iiop/client.policy"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <!-- Pass along any jbosstest.* system properties -->
- <syspropertyset>
- <propertyref prefix="jbosstest."/>
- </syspropertyset>
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
- </classpath>
-
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.classes}">
- <include name="**/StatelessEJB3TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- DTM two-phase commit tests -->
- <target name="dtm-tests" description="DTM two-phase commit tests">
- <!-- Create configs dtm0-dtm3 with DTM and OTS -->
- <create-dtm-config conf="dtm0"/>
- <copy todir="${jboss.dist}/server/dtm0/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node0}"/>
- </filterset>
- </copy>
- <copy todir="${jboss.dist}/server/dtm0/deploy" overwrite="true"
- file="${source.resources}/dtm/xa-ds.xml"/>
- <create-dtm-config conf="dtm1"/>
- <copy todir="${jboss.dist}/server/dtm1/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node1}"/>
- </filterset>
- </copy>
- <copy todir="${jboss.dist}/server/dtm1/deploy" overwrite="true"
- file="${source.resources}/dtm/xa-ds.xml"/>
- <create-dtm-config conf="dtm2"/>
- <copy todir="${jboss.dist}/server/dtm2/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node2}"/>
- </filterset>
- </copy>
- <copy todir="${jboss.dist}/server/dtm2/deploy" overwrite="true"
- file="${source.resources}/dtm/xa-ds.xml"/>
- <create-dtm-config conf="dtm3"/>
- <copy todir="${jboss.dist}/server/dtm3/conf" overwrite="true"
- file="${source.resources}/dtm/jacorb.properties">
- <filterset>
- <filter token="HOST" value="${node3}"/>
- </filterset>
- </copy>
- <copy todir="${jboss.dist}/server/dtm3/deploy" overwrite="true"
- file="${source.resources}/dtm/xa-ds.xml"/>
-
- <!-- make jndi.properties files available to clients of node0 -->
- <copy todir="${build.resources}" overwrite="true">
- <fileset dir="${source.resources}/dtm">
- <include name="host0.jndi.properties"/>
- <include name="host0.cosnaming.jndi.properties"/>
- </fileset>
- <filterset>
- <filter token="HOST0" value="${node0}"/>
- </filterset>
- </copy>
-
- <!-- Deploy EJBs that will be called as transaction participants -->
- <copy todir="${jboss.dist}/server/dtm1/deploy" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="dtmaccount.jar"/>
- <include name="dtmaccountiiop.jar"/>
- <include name="dtmaccountentity-derby.jar"/>
- <include name="dtmaccountentityiiop-derby.jar"/>
- <include name="dtmworker.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/dtm2/deploy" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="dtmaccount.jar"/>
- <include name="dtmaccountiiop.jar"/>
- <include name="dtmaccountentity-derby.jar"/>
- <include name="dtmaccountentityiiop-derby.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/dtm3/deploy" overwrite="true">
- <fileset dir="${build.lib}">
- <include name="dtmaccount.jar"/>
- <include name="dtmaccountiiop.jar"/>
- <include name="dtmaccountentity-oracle.jar"/>
- <include name="dtmaccountentityiiop-oracle.jar"/>
- </fileset>
- </copy>
- <!-- Start DTM nodes -->
- <server:start name="dtm0"/>
- <server:start name="dtm1"/>
- <server:start name="dtm2"/>
- <server:start name="dtm3"/>
-
- <echo message="Nodes have started, waiting for node set to stablize..."/>
- <sleep seconds="10" />
- <!-- Run DTM unit tests -->
- <antcall target="tests-dtm-unit"/>
- <!-- Stop DTM nodes -->
- <server:stop name="dtm0"/>
- <server:stop name="dtm1"/>
- <server:stop name="dtm2"/>
- <server:stop name="dtm3"/>
- </target>
-
- <!-- DTM unit tests -->
- <target name="tests-dtm-unit">
- <echo><![CDATA[
- junit.timeout: ${junit.timeout}
- jbosstest.iterationcount: ${jbosstest.iterationcount}
- jbosstest.threadcount: ${jbosstest.threadcount}
- jbosstest.beancount: ${jbosstest.beancount}
- ]]></echo>
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <jvmarg value="${junit.jvm.options}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
- <jvmarg value="-Djacorb.orb.print_version=off"/>
- <jvmarg value="-Djacorb.log.default.verbosity=0"/>
- <jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
- <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
- <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
- <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/NameService"/>
- <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
- <jvmarg value="-Djava.security.manager"/>
- <sysproperty key="java.security.policy" value="${build.resources}/iiop/client.policy"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <!-- Pass along any jbosstest.* system properties -->
- <syspropertyset>
- <propertyref prefix="jbosstest."/>
- </syspropertyset>
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
- </classpath>
-
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.classes}">
- <include name="**/T01DTMUnitTestCase.class"/>
- <include name="**/T02OTSUnitTestCase.class"/>
- <include name="**/T03MixedDTMOTSUnitTestCase.class"/>
- <include name="**/T04MixedOTSDTMUnitTestCase.class"/>
- <include name="**/T05DTMInterpositionUnitTestCase.class"/>
- <include name="**/T06OTSInterpositionUnitTestCase.class"/>
- <include name="**/T07DTMOTSInterpositionUnitTestCase.class"/>
- <include name="**/T08OTSDTMInterpositionUnitTestCase.class"/>
- <!-- The XA tests below are commented out because they use the
- Derby database engine, which is not included in JBoss.
- To run these tests, you need to put derby.jar in the
- directory server/default/lib.
- <include name="**/T09DTMXAUnitTestCase.class"/>
- <include name="**/T10OTSXAUnitTestCase.class"/>
- -->
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
<target name="test-example-binding-manager"
description="Test the example binding configuration"
>
Modified: trunk/testsuite/imports/sections/cts.xml
===================================================================
--- trunk/testsuite/imports/sections/cts.xml 2007-10-04 05:43:50 UTC (rev 65824)
+++ trunk/testsuite/imports/sections/cts.xml 2007-10-04 07:07:54 UTC (rev 65825)
@@ -90,6 +90,7 @@
<src path="${source.java}"/>
<classpath refid="tests.classpath"/>
<include name="org/jboss/test/cts/**"/>
+ <exclude name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.java"/>
</javac>
<jar destfile="${build.lib}/cts-v1cmp.sar">
<fileset dir="${build.classes}">
@@ -159,6 +160,7 @@
<src path="${source.java}"/>
<classpath refid="tests.classpath"/>
<include name="org/jboss/test/cts/**"/>
+ <exclude name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.java"/>
</javac>
<jar destfile="${build.lib}/cts-v2cmp.sar">
<fileset dir="${build.classes}">
More information about the jboss-cvs-commits
mailing list