From: Francisco R. <rev...@im...> - 2005-05-12 21:28:09
|
User: reverbel Date: 05/05/12 17:28:00 Modified: jbosstest build.xml Log: Add OTS testcase. Revision Changes Path 1.458 +68 -9 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.457 retrieving revision 1.458 diff -u -b -r1.457 -r1.458 --- build.xml 12 May 2005 17:08:24 -0000 1.457 +++ build.xml 12 May 2005 21:28:00 -0000 1.458 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.457 2005/05/12 17:08:24 telrod Exp $ --> +<!-- $Id: build.xml,v 1.458 2005/05/12 21:28:00 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -926,16 +926,61 @@ <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> <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> <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> <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> + + <!-- make CosNaming jndi.properties file available to test clients --> + <copy todir="${build.resources}" overwrite="true" + file="${source.resources}/dtm/host0.cosnaming.jndi.properties"> + <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" - file="${build.lib}/dtmaccount.jar"/> - <copy todir="${jboss.dist}/server/dtm2/deploy" overwrite="true" - file="${build.lib}/dtmaccount.jar"/> - <copy todir="${jboss.dist}/server/dtm3/deploy" overwrite="true" - file="${build.lib}/dtmaccount.jar"/> + <copy todir="${jboss.dist}/server/dtm1/deploy" overwrite="true"> + <fileset dir="${build.lib}"> + <include name="dtmaccount.jar"/> + <include name="dtmaccountiiop.jar"/> + </fileset> + </copy> + <copy todir="${jboss.dist}/server/dtm2/deploy" overwrite="true"> + <fileset dir="${build.lib}"> + <include name="dtmaccount.jar"/> + <include name="dtmaccountiiop.jar"/> + </fileset> + </copy> + <copy todir="${jboss.dist}/server/dtm3/deploy" overwrite="true"> + <fileset dir="${build.lib}"> + <include name="dtmaccount.jar"/> + <include name="dtmaccountiiop.jar"/> + </fileset> + </copy> <!-- Start DTM nodes --> <start-jboss conf="dtm0" host="${node0}"/> <start-jboss conf="dtm1" host="${node1}"/> @@ -982,8 +1027,19 @@ jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> - <!-- Used for JGroups --> - <jvmarg value="-Dbind.address=${node0}"/> + <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}/security/tst.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"/> @@ -995,6 +1051,7 @@ <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}"/> @@ -1006,11 +1063,13 @@ <fileset dir="${build.classes}"> <include name="**/DTMUnitTestCase.class"/> + <include name="**/OTSUnitTestCase.class"/> </fileset> </batchtest> </junit> </target> + <target name="test-example-binding-manager" description="Test the example binding configuration" > |