From: Scott S. <sco...@jb...> - 2005-08-10 02:44:07
|
User: starksm Date: 05/08/08 20:56:29 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Only include the org/jboss/test/cmp2/simple/SimpleUnitTestCase in the jacc includes as the PageSizeUnitTestCase accesses the MBeanServer and will fail when run with a security mgr. Revision Changes Path No revision No revision 1.406.2.98 +2 -2 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.406.2.97 retrieving revision 1.406.2.98 diff -u -b -r1.406.2.97 -r1.406.2.98 --- build.xml 8 Aug 2005 19:55:33 -0000 1.406.2.97 +++ build.xml 9 Aug 2005 00:56:28 -0000 1.406.2.98 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.97 2005/08/08 19:55:33 adrian Exp $ --> +<!-- $Id: build.xml,v 1.406.2.98 2005/08/09 00:56:28 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -501,7 +501,7 @@ <include name="org/jboss/test/cmp2/cmrtransaction/test/*TestCase.class" /> <include name="org/jboss/test/cmp2/perf/test/*TestCase.class" /> <include name="org/jboss/test/cmp2/relationship/*TestCase.class" /> - <include name="org/jboss/test/cmp2/simple/*TestCase.class" /> + <include name="org/jboss/test/cmp2/simple/SimpleUnitTestCase.class" /> <include name="**/test/webservice/jbws309/*TestCase.class"/> </patternset> <patternset id="jacc.excludes"> |
From: Scott S. <sco...@jb...> - 2005-08-10 02:54:28
|
User: starksm Date: 05/08/09 01:34:39 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Add the auth.conf property to the tests-jacc-securitymgr target Revision Changes Path No revision No revision 1.406.2.99 +31 -5 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.406.2.98 retrieving revision 1.406.2.99 diff -u -b -r1.406.2.98 -r1.406.2.99 --- build.xml 9 Aug 2005 00:56:28 -0000 1.406.2.98 +++ build.xml 9 Aug 2005 05:34:38 -0000 1.406.2.99 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.98 2005/08/09 00:56:28 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.99 2005/08/09 05:34:38 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1450,6 +1450,12 @@ <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> + <property name="jbosstest.secure" value="true"/> + <property name="java.security.auth.login.config" + value="${build.resources}/security/auth.conf"/> + <propertyset id="jacc-tests-props"> + <propertyref prefix="java.security.auth"/> + </propertyset> <propertyset id="jacc-tests-props"> <propertyref prefix="java.security.auth"/> @@ -1463,6 +1469,26 @@ <wait-on-shutdown conf="jacc"/> </target> + <target name="x"> + <patternset id="jaccx.includes"> + <include name="org/jboss/test/jacc/test/EJBSpecUnitTestCase.class"/> + </patternset> + <property name="jbosstest.secure" value="true"/> + <property name="java.security.auth.login.config" + value="${build.resources}/security/auth.conf"/> + <propertyset id="jacc-tests-props"> + <propertyref prefix="java.security.auth"/> + </propertyset> + + <propertyset id="jacc-tests-props"> + <propertyref prefix="java.security.auth"/> + </propertyset> + + <run-junit junit.patternset="jaccx.includes" + junit.configuration="JACC+SecurityMgr" + junit.syspropertyset="jacc-tests-props" /> + </target> + <target name="tests-standalone-aop-unit"> <!-- <antcall target="tests-treecacheaop-unit" inheritRefs="true"/> |
From: Scott S. <sco...@jb...> - 2005-08-10 03:10:02
|
User: starksm Date: 05/08/08 20:58:41 Modified: jbosstest build.xml Log: Only include the org/jboss/test/cmp2/simple/SimpleUnitTestCase in the jacc includes as the PageSizeUnitTestCase accesses the MBeanServer and will fail when run with a security mgr. Revision Changes Path 1.487 +2 -2 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.486 retrieving revision 1.487 diff -u -b -r1.486 -r1.487 --- build.xml 8 Aug 2005 18:16:52 -0000 1.486 +++ build.xml 9 Aug 2005 00:58:41 -0000 1.487 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.486 2005/08/08 18:16:52 adrian Exp $ --> +<!-- $Id: build.xml,v 1.487 2005/08/09 00:58:41 starksm Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -494,7 +494,7 @@ <include name="org/jboss/test/cmp2/cmrtransaction/test/*TestCase.class" /> <include name="org/jboss/test/cmp2/perf/test/*TestCase.class" /> <include name="org/jboss/test/cmp2/relationship/*TestCase.class" /> - <include name="org/jboss/test/cmp2/simple/*TestCase.class" /> + <include name="org/jboss/test/cmp2/simple/SimpleUnitTestCase.class" /> <include name="**/test/webservice/jbws309/*TestCase.class"/> </patternset> <patternset id="jacc.excludes"> |
From: Scott S. <sco...@jb...> - 2005-08-10 03:39:48
|
User: starksm Date: 05/08/09 01:36:21 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Remove the x debug target Revision Changes Path No revision No revision 1.406.2.100 +1 -21 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.406.2.99 retrieving revision 1.406.2.100 diff -u -b -r1.406.2.99 -r1.406.2.100 --- build.xml 9 Aug 2005 05:34:38 -0000 1.406.2.99 +++ build.xml 9 Aug 2005 05:36:21 -0000 1.406.2.100 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.99 2005/08/09 05:34:38 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.100 2005/08/09 05:36:21 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1469,26 +1469,6 @@ <wait-on-shutdown conf="jacc"/> </target> - <target name="x"> - <patternset id="jaccx.includes"> - <include name="org/jboss/test/jacc/test/EJBSpecUnitTestCase.class"/> - </patternset> - <property name="jbosstest.secure" value="true"/> - <property name="java.security.auth.login.config" - value="${build.resources}/security/auth.conf"/> - <propertyset id="jacc-tests-props"> - <propertyref prefix="java.security.auth"/> - </propertyset> - - <propertyset id="jacc-tests-props"> - <propertyref prefix="java.security.auth"/> - </propertyset> - - <run-junit junit.patternset="jaccx.includes" - junit.configuration="JACC+SecurityMgr" - junit.syspropertyset="jacc-tests-props" /> - </target> - <target name="tests-standalone-aop-unit"> <!-- <antcall target="tests-treecacheaop-unit" inheritRefs="true"/> |
From: Adrian B. <adr...@jb...> - 2005-08-10 04:10:30
|
User: adrian Date: 05/08/08 15:55:33 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Fix the iiop-test target. Revision Changes Path No revision No revision 1.406.2.97 +3 -1 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.406.2.96 retrieving revision 1.406.2.97 diff -u -b -r1.406.2.96 -r1.406.2.97 --- build.xml 8 Aug 2005 17:09:21 -0000 1.406.2.96 +++ build.xml 8 Aug 2005 19:55:33 -0000 1.406.2.97 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.96 2005/08/08 17:09:21 adrian Exp $ --> +<!-- $Id: build.xml,v 1.406.2.97 2005/08/08 19:55:33 adrian Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2408,6 +2408,8 @@ <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/> + <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/> + <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> <sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/> <!-- Pass along any jbosstest.* system properties --> |
From: Thomas D. <tho...@jb...> - 2005-08-10 12:00:52
|
User: tdiesler Date: 05/08/10 07:59:32 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Copy and filter the webservice resources seperately. ${jboss.bind.address:localhost} is not and should not be resolved in wsdl Revision Changes Path No revision No revision 1.406.2.104 +3 -2 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.406.2.103 retrieving revision 1.406.2.104 diff -u -b -r1.406.2.103 -r1.406.2.104 --- build.xml 10 Aug 2005 02:14:39 -0000 1.406.2.103 +++ build.xml 10 Aug 2005 11:59:32 -0000 1.406.2.104 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.103 2005/08/10 02:14:39 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.104 2005/08/10 11:59:32 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -333,8 +333,9 @@ <!-- Compile resource files --> <target name="compile-resources"> <mkdir dir="${build.resources}"/> - <copy todir="${build.resources}" filtering="no"> + <copy todir="${build.resources}" filtering="yes"> <fileset dir="${source.resources}"> + <exclude name="webservice/**"/> <include name="**/*"/> </fileset> </copy> |
From: Thomas D. <tho...@jb...> - 2005-08-10 13:01:02
|
User: tdiesler Date: 05/08/10 08:59:46 Modified: jbosstest build.xml Log: Sync webservices with Branch_4_0 Revision Changes Path 1.491 +3 -2 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.490 retrieving revision 1.491 diff -u -b -r1.490 -r1.491 --- build.xml 10 Aug 2005 02:15:33 -0000 1.490 +++ build.xml 10 Aug 2005 12:59:46 -0000 1.491 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.490 2005/08/10 02:15:33 starksm Exp $ --> +<!-- $Id: build.xml,v 1.491 2005/08/10 12:59:46 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -331,6 +331,7 @@ <mkdir dir="${build.resources}"/> <copy todir="${build.resources}" filtering="no"> <fileset dir="${source.resources}"> + <exclude name="webservice/**"/> <include name="**/*"/> </fileset> </copy> |
From: Adrian B. <adr...@jb...> - 2005-08-10 21:02:01
|
User: adrian Date: 05/08/10 17:00:44 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Fix the jndi provider url for "test" and "one-test" Revision Changes Path No revision No revision 1.406.2.105 +4 -1 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.406.2.104 retrieving revision 1.406.2.105 diff -u -b -r1.406.2.104 -r1.406.2.105 --- build.xml 10 Aug 2005 11:59:32 -0000 1.406.2.104 +++ build.xml 10 Aug 2005 21:00:44 -0000 1.406.2.105 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.104 2005/08/10 11:59:32 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.105 2005/08/10 21:00:44 adrian Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2406,6 +2406,8 @@ <sysproperty key="jbosstest.deploy.dir" value="${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}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -2568,6 +2570,7 @@ <jvmarg value="-Dbind.address=${node0}"/> <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> |
From: Adrian B. <adr...@jb...> - 2005-08-10 21:04:50
|
User: adrian Date: 05/08/10 17:03:33 Modified: jbosstest build.xml Log: Fix the jndi provider url for "one-test" and "test" Revision Changes Path 1.492 +5 -1 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.491 retrieving revision 1.492 diff -u -b -r1.491 -r1.492 --- build.xml 10 Aug 2005 12:59:46 -0000 1.491 +++ build.xml 10 Aug 2005 21:03:33 -0000 1.492 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.491 2005/08/10 12:59:46 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.492 2005/08/10 21:03:33 adrian Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -2338,6 +2338,8 @@ <sysproperty key="jbosstest.deploy.dir" value="${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}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -2507,6 +2509,8 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jbosstest.secure" value="true"/> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> + <sysproperty key="jbosstest.server.host" value="${node0}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> |
From: Kabir K. <kk...@jb...> - 2005-08-11 18:15:47
|
User: kkhan Date: 05/08/11 14:14:30 Modified: jbosstest build.xml Log: Getting the Security and Tx aop tests to run with JDK 5 JBAS-2105 JBAS-2104 Revision Changes Path 1.493 +31 -3 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.492 retrieving revision 1.493 diff -u -b -r1.492 -r1.493 --- build.xml 10 Aug 2005 21:03:33 -0000 1.492 +++ build.xml 11 Aug 2005 18:14:30 -0000 1.493 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.492 2005/08/10 21:03:33 adrian Exp $ --> +<!-- $Id: build.xml,v 1.493 2005/08/11 18:14:30 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -171,6 +171,7 @@ <!-- Where source files live --> <property name="source.java" value="${module.source}/main"/> + <property name="source.java.5" value="${module.source}/jdk15"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.resources" value="${module.source}/resources"/> @@ -290,7 +291,33 @@ <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> </target> - <target name="compile-classes-only"> + <target name="compile-annotated-classes-50" if="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + + <!-- Make sure that jdk 50 aspect library comes first, since that contains the + JDK 5 version of the annotation types + --> + <path id="annotations.classpath"> + <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/> + <path refid="tests.classpath"/> + </path> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="1.5" + target="1.5" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java.5}"/> + <classpath refid="annotations.classpath"/> + </javac> + </target> + + <target name="compile-classes-only" depends="compile-annotated-classes-50"> <mkdir dir="${build.classes}"/> <javac destdir="${build.classes}" optimize="${javac.optimize}" @@ -306,6 +333,7 @@ <src path="${source.java}"/> <src path="${build.gen-src}"/> <exclude name="org/jboss/test/recover/oracle/**"/> + <exclude name="org/jboss/test/aop/bean/Annotated*" if="HAVE_JDK_1.5"/> <classpath refid="tests.classpath"/> </javac> </target> |
From: Kabir K. <kk...@jb...> - 2005-08-11 18:44:47
|
User: kkhan Date: 05/08/11 14:43:29 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Getting the Security and Tx aop tests to run with JDK 5 JBAS-2105 JBAS-2104 Revision Changes Path No revision No revision 1.406.2.106 +30 -2 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.406.2.105 retrieving revision 1.406.2.106 diff -u -b -r1.406.2.105 -r1.406.2.106 --- build.xml 10 Aug 2005 21:00:44 -0000 1.406.2.105 +++ build.xml 11 Aug 2005 18:43:29 -0000 1.406.2.106 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.105 2005/08/10 21:00:44 adrian Exp $ --> +<!-- $Id: build.xml,v 1.406.2.106 2005/08/11 18:43:29 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -176,6 +176,7 @@ <!-- Where source files live --> <property name="source.java" value="${module.source}/main"/> + <property name="source.java.5" value="${module.source}/jdk15"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.resources" value="${module.source}/resources"/> @@ -294,7 +295,33 @@ <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> </target> - <target name="compile-classes-only"> + <target name="compile-annotated-classes-50" if="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + + <!-- Make sure that jdk 50 aspect library comes first, since that contains the + JDK 5 version of the annotation types + --> + <path id="annotations.classpath"> + <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/> + <path refid="tests.classpath"/> + </path> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="1.5" + target="1.5" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java.5}"/> + <classpath refid="annotations.classpath"/> + </javac> + </target> + + <target name="compile-classes-only" depends="compile-annotated-classes-50"> <mkdir dir="${build.classes}"/> <javac destdir="${build.classes}" optimize="${javac.optimize}" @@ -310,6 +337,7 @@ <src path="${source.java}"/> <src path="${build.gen-src}"/> <exclude name="org/jboss/test/jbossnet/**" /> + <exclude name="org/jboss/test/aop/bean/Annotated*" if="HAVE_JDK_1.5"/> <classpath refid="tests.classpath"/> </javac> </target> |
From: Scott S. <sco...@jb...> - 2005-08-12 21:13:39
|
User: starksm Date: 05/08/12 17:12:21 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Update one-test target to use the correct naming/host properties Revision Changes Path No revision No revision 1.406.2.107 +3 -1 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.406.2.106 retrieving revision 1.406.2.107 diff -u -b -r1.406.2.106 -r1.406.2.107 --- build.xml 11 Aug 2005 18:43:29 -0000 1.406.2.106 +++ build.xml 12 Aug 2005 21:12:20 -0000 1.406.2.107 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.106 2005/08/11 18:43:29 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.406.2.107 2005/08/12 21:12:20 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2603,6 +2603,8 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jbosstest.secure" value="true"/> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> + <sysproperty key="jbosstest.server.host" value="${node0}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> |
From: Ben W. <bw...@jb...> - 2005-08-15 08:07:31
|
User: bwang Date: 05/08/15 04:06:08 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Exclude concurrent tests for clustering now since it interferes with the rest Revision Changes Path No revision No revision 1.406.2.108 +2 -1 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.406.2.107 retrieving revision 1.406.2.108 diff -u -b -r1.406.2.107 -r1.406.2.108 --- build.xml 12 Aug 2005 21:12:20 -0000 1.406.2.107 +++ build.xml 15 Aug 2005 08:06:07 -0000 1.406.2.108 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.107 2005/08/12 21:12:20 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.108 2005/08/15 08:06:07 bwang Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -476,6 +476,7 @@ <!-- patternsets for that require clustering to be enabled --> <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> + <exclude name="org/jboss/test/cluster/test/*ConcurrentTestCase.class"/> <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/> <include name="org/jboss/test/ha/farm/test/*TestCase.class" /> </patternset> |
From: Ruel L. <rue...@jb...> - 2005-08-15 14:31:57
|
User: rloehr Date: 05/08/15 10:30:35 Modified: jbosstest build.xml Log: removed references to libraries & modules.xml and added ref to libraries & modules.ent Revision Changes Path 1.494 +9 -4 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.493 retrieving revision 1.494 diff -u -b -r1.493 -r1.494 --- build.xml 11 Aug 2005 18:14:30 -0000 1.493 +++ build.xml 15 Aug 2005 14:30:35 -0000 1.494 @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> +]> <!-- ============================================================ --> <!-- JBoss, the OpenSource J2EE webOS --> @@ -6,13 +10,11 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.493 2005/08/11 18:14:30 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.494 2005/08/15 14:30:35 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> <import file="../tools/etc/buildmagic/build-common.xml"/> - <import file="../tools/etc/buildmagic/libraries.xml"/> - <import file="../tools/etc/buildmagic/modules.xml"/> <!-- ======================================================== --> <!-- Initialization --> @@ -69,6 +71,7 @@ <!-- ========= --> <!-- Libraries --> + &libraries; <!-- ========= --> <!-- The combined library classpath --> <path id="library.classpath"> @@ -112,6 +115,8 @@ <!-- ======= --> <!-- Modules --> + + &modules; <!-- ======= --> <!-- InternalServer --> <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate @@ -250,7 +255,7 @@ <!-- xdoclet --> <path id="xdoclet.task.classpath"> <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <fileset dir="${xdoclet.xdoclet.lib}"> <include name="**/*.jar"/> </fileset> </path> |
From: Ben W. <bw...@jb...> - 2005-08-15 21:23:56
|
User: bwang Date: 05/08/15 17:22:38 Modified: jbosstest build.xml Log: Excluded Concurrent test for clustering now since it interferes with the rest Revision Changes Path 1.495 +2 -1 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.494 retrieving revision 1.495 diff -u -b -r1.494 -r1.495 --- build.xml 15 Aug 2005 14:30:35 -0000 1.494 +++ build.xml 15 Aug 2005 21:22:38 -0000 1.495 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.494 2005/08/15 14:30:35 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.495 2005/08/15 21:22:38 bwang Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -486,6 +486,7 @@ <!-- patternsets for that require clustering to be enabled --> <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> + <exclude name="org/jboss/test/cluster/test/*ConcurrentTestCase.class"/> <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/> <include name="org/jboss/test/ha/farm/test/*TestCase.class" /> </patternset> |
From: Ryan C. <rca...@jb...> - 2005-08-18 19:39:41
|
User: rcampbell Date: 05/08/18 15:37:55 Modified: jbosstest build.xml Log: Fix the testsuite; Use the server:* tags to control the security manager tests Revision Changes Path 1.496 +5 -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.495 retrieving revision 1.496 diff -u -b -r1.495 -r1.496 --- build.xml 15 Aug 2005 21:22:38 -0000 1.495 +++ build.xml 18 Aug 2005 19:37:55 -0000 1.496 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.495 2005/08/15 21:22:38 bwang Exp $ --> +<!-- $Id: build.xml,v 1.496 2005/08/18 19:37:55 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1547,15 +1547,12 @@ <include name="lib/**"/> </patternset> </create-config> - <start-securitymgr conf="jacc"/> + <server:start name="jacc-securitymgr"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> + + <property name="jbosstest.secure" value="true"/> <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> @@ -1571,8 +1568,7 @@ junit.configuration="JACC+SecurityMgr" junit.syspropertyset="jacc-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="jacc"/> + <server:stop name="jacc-securitymgr"/> </target> <target name="tests-standalone-aop-unit"> |
From: Ryan C. <rca...@jb...> - 2005-08-18 23:30:04
|
User: rcampbell Date: 05/08/18 19:29:31 Modified: jbosstest build.xml Log: Exclude the dtm tests from jboss-all-config-tests since they obviously don't run there. Revision Changes Path 1.497 +5 -1 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.496 retrieving revision 1.497 diff -u -b -r1.496 -r1.497 --- build.xml 18 Aug 2005 19:37:55 -0000 1.496 +++ build.xml 18 Aug 2005 23:29:31 -0000 1.497 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.496 2005/08/18 19:37:55 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.497 2005/08/18 23:29:31 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -624,6 +624,9 @@ <patternset id="webservice-ssl.includes"> <include name="org/jboss/test/webservice/secure/*TestCase.class"/> </patternset> + <patternset id="dtm.excludes"> + <exclude name="org/jboss/test/dtm/**"/> + </patternset> <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> @@ -650,6 +653,7 @@ <patternset refid="deployment-service.excludes"/> <patternset refid="compatibility.excludes"/> <patternset refid="binding-manager.excludes"/> + <patternset refid="dtm.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and |
From: Adrian B. <adr...@jb...> - 2005-08-19 19:25:04
|
User: adrian Date: 05/08/19 15:24:55 Modified: jbosstest .classpath Log: Fix the eclipse build, cache is now binary Revision Changes Path 1.47 +1 -1 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.46 retrieving revision 1.47 diff -u -b -r1.46 -r1.47 --- .classpath 9 Aug 2005 16:32:00 -0000 1.46 +++ .classpath 19 Aug 2005 19:24:55 -0000 1.47 @@ -24,7 +24,6 @@ <classpathentry kind="src" path="/aop"/> <classpathentry kind="src" path="/aspects"/> <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/> - <classpathentry kind="src" path="/cache"/> <classpathentry kind="lib" path="/thirdparty/javagroups-javagroups/lib/jgroups.jar"/> <classpathentry kind="src" path="/media"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> @@ -49,5 +48,6 @@ <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> <classpathentry kind="lib" path="/thirdparty/xmlunit-xmlunit/lib/xmlunit1.0.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/hibernate-int"/> + <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Ben W. <bw...@jb...> - 2005-08-21 16:21:59
|
User: bwang Date: 05/08/21 12:21:55 Modified: jbosstest local.properties Log: UPD Revision Changes Path 1.12 +3 -3 jbosstest/local.properties (In the diff below, changes in quantity of whitespace are not shown.) Index: local.properties =================================================================== RCS file: /cvsroot/jboss/jbosstest/local.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- local.properties 19 Jul 2005 02:13:12 -0000 1.11 +++ local.properties 21 Aug 2005 16:21:55 -0000 1.12 @@ -2,7 +2,7 @@ #This file is used to pass config info to targets like apache_tomcat-clustering tests #Please uncomment or add your properties to this file. -# $Id: local.properties,v 1.11 2005/07/19 02:13:12 rcampbell Exp $ +# $Id: local.properties,v 1.12 2005/08/21 16:21:55 bwang Exp $ ### General compiler configuration ### @@ -49,11 +49,11 @@ # (even at the same machine). Actually what we needed are just node0 and node1 # ips and the rest are optional. # -#node0=192.168.1.103 +#node0=${env.MYTESTIP_1} #node0.http.url=http://192.168.1.103:8080 #node0.jndiurl=jnp://192.168.1.103:1099 -#node1=http://192.168.1.113 +#node1=${env.MYTESTIP_2} #node1.http.url=http://192.168.1.113:8080 #node1.jndiurl=jnp://192.168.1.113:1099 |
From: Adrian B. <adr...@jb...> - 2005-08-22 18:00:50
|
User: adrian Date: 05/08/22 14:00:23 Modified: jbosstest Tag: Branch_4_0 .classpath Log: Fix the eclipse build. cache is now binary. Revision Changes Path No revision No revision 1.24.2.18 +1 -1 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.24.2.17 retrieving revision 1.24.2.18 diff -u -b -r1.24.2.17 -r1.24.2.18 --- .classpath 2 Aug 2005 17:24:01 -0000 1.24.2.17 +++ .classpath 22 Aug 2005 18:00:23 -0000 1.24.2.18 @@ -16,7 +16,6 @@ <classpathentry kind="src" path="/connector"/> <classpathentry kind="src" path="/security"/> <classpathentry kind="src" path="/transaction"/> - <classpathentry kind="src" path="/cache"/> <classpathentry kind="src" path="/media"/> <classpathentry kind="src" path="/iiop"/> <classpathentry kind="src" path="/webservice"/> @@ -46,5 +45,6 @@ <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> <classpathentry kind="lib" path="/tools/lib/ant.jar"/> <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Ruel L. <rue...@jb...> - 2005-08-24 19:09:05
|
User: rloehr Date: 05/08/24 15:09:00 Modified: jbosstest Tag: REPO_BRANCH_HEAD build.xml Log: JBBUILD-132- merge thidparty build into buildmagic Revision Changes Path No revision No revision 1.497.2.1 +2 -2 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.497 retrieving revision 1.497.2.1 diff -u -b -r1.497 -r1.497.2.1 --- build.xml 18 Aug 2005 23:29:31 -0000 1.497 +++ build.xml 24 Aug 2005 19:09:00 -0000 1.497.2.1 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.497 2005/08/18 23:29:31 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.497.2.1 2005/08/24 19:09:00 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> |
From: Ruel L. <rue...@jb...> - 2005-08-29 15:59:31
|
User: rloehr Date: 05/08/29 11:59:28 Modified: jbosstest build.xml Log: JBBUILD-89 - change over to repository build Revision Changes Path 1.498 +2 -2 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.497 retrieving revision 1.498 diff -u -b -r1.497 -r1.498 --- build.xml 18 Aug 2005 23:29:31 -0000 1.497 +++ build.xml 29 Aug 2005 15:59:28 -0000 1.498 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.497 2005/08/18 23:29:31 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.498 2005/08/29 15:59:28 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> |
From: Francisco R. <rev...@im...> - 2005-08-29 16:11:06
|
User: reverbel Date: 05/08/29 12:10:52 Modified: jbosstest build.xml Log: XA recovery tests that start a server, crash the server in the middle of a transaction, restart the server, and check if the transaction was recovered correcly. Revision Changes Path 1.499 +204 -1 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.498 retrieving revision 1.499 diff -u -b -r1.498 -r1.499 --- build.xml 29 Aug 2005 15:59:28 -0000 1.498 +++ build.xml 29 Aug 2005 16:10:52 -0000 1.499 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.498 2005/08/29 15:59:28 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.499 2005/08/29 16:10:52 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -138,6 +138,7 @@ <path refid="jboss.cluster.classpath"/> <path refid="jboss.common.classpath"/> <path refid="jboss.deployment.classpath"/> + <path refid="jboss.ejb3x.classpath"/> <path refid="jboss.hibernate.classpath"/> <path refid="jboss.iiop.classpath"/> <path refid="jboss.internal-server.classpath"/> @@ -222,6 +223,8 @@ <pathelement path="${local.classpath}"/> <pathelement path="${project.tools}/lib/ant.jar"/> <pathelement path="${project.tools}/lib/ant-junit.jar"/> + <path refid="jboss.ejb3.classpath"/> + <path refid="jboss.ejb3x.classpath"/> <path refid="jboss.jmx.classpath"/> <path refid="jboss.jmx-remoting.classpath"/> <path refid="thirdparty.classpath"/> @@ -907,6 +910,206 @@ <server:stop name="tomcat-sso-cluster1"/> </target> + + <!-- DTM recovery tests --> + <target name="dtm-recovery-tests" description="DTM two-phase commit tests"> + <!-- Create configs dtmrec0 and dtmrec1 with EJB3, DTM, and OTS --> + <create-ejb3-dtm-config conf="dtmrec0"/> + <copy todir="${jboss.dist}/server/dtmrec0/conf" overwrite="true" + file="${source.resources}/dtm/jacorb.properties"> + <filterset> + <filter token="HOST" value="${node0}"/> + </filterset> + </copy> + <create-ejb3-dtm-config conf="dtmrec1"/> + <copy todir="${jboss.dist}/server/dtmrec1/conf" overwrite="true" + file="${source.resources}/dtm/jacorb.properties"> + <filterset> + <filter token="HOST" value="${node1}"/> + </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> + + <copy todir="${jboss.dist}/server/dtmrec0/lib" overwrite="true" + file="${build.lib}/recover-dummyrecoverableproxy.jar"/> + + <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true" + file="${build.resources}/recover/dummyrecoverableproxy-service.xml"> + <filterset> + <filter token="HOST1" value="${node1}"/> + </filterset> + </copy> + + <copy todir="${jboss.dist}/server/dtmrec1/deploy" overwrite="true" + file="${build.lib}/recover-dummyrecoverable.sar"/> + + <!-- Deploy EJB that will be used across server restarts --> + <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true"> + <fileset dir="${build.lib}"> + <include name="recover-stateless.ejb3"/> + </fileset> + </copy> + + <!-- Start DTM nodes --> + <server:start name="dtmrec1"/> + <server:start name="dtmrec0"/> + + <echo message="Nodes have started, waiting for node set to stablize..."/> + <sleep seconds="2" /> + + <!-- Run DTM recovery unit tests --> + <run-dtm-recovery-test test="CrashBeforeTxCommitted"/> + <run-dtm-recovery-test test="CrashAfterTxCommitted"/> + <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHavePrepared"/> + <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHaveCommitted"/> + <run-dtm-recovery-test test="CrashAfterTxCommittedWithSuccessfulXARetryAtRecoveryTime"/> + <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime"/> + + <!-- Stop DTM nodes --> + <server:stop name="dtmrec0"/> + <server:stop name="dtmrec1"/> + </target> + + <macrodef name="run-dtm-recovery-test"> + <attribute name="test" description="the name of the test to run"/> + <sequential> + <run-dtm-test test="@{test}TestCase"/> + <echo message="Server crashed as expected. Restarting it..."/> + <server:start name="dtmrec0"/> + <echo message="Waiting for restarted server to perform transaction recovery..."/> + <sleep seconds="1" /> + <run-dtm-test test="RecoveryFrom@{test}TestCase"/> + </sequential> + </macrodef> + + <macrodef name="run-dtm-test" + description="run a dtm test given its name"> + <attribute name="test" description="the 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}" + 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}/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"/> + <!-- 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="**/@{test}.class"/> + </fileset> + </batchtest> + </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}/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"/> + <!-- 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 --> |
From: Francisco R. <rev...@im...> - 2005-08-29 16:12:03
|
User: reverbel Date: 05/08/29 12:11:59 Modified: jbosstest .classpath Log: XA recovery tests that start a server, crash the server in the middle of a transaction, restart the server, and check if the transaction was recovered correcly. Revision Changes Path 1.48 +3 -0 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.47 retrieving revision 1.48 diff -u -b -r1.47 -r1.48 --- .classpath 19 Aug 2005 19:24:55 -0000 1.47 +++ .classpath 29 Aug 2005 16:11:59 -0000 1.48 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="org/jboss/test/recover/oracle/**" kind="src" path="src/main"/> + <classpathentry kind="src" path="src/jdk15"/> <classpathentry kind="src" path="output/gen-src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/tools"/> @@ -49,5 +50,7 @@ <classpathentry kind="lib" path="/thirdparty/xmlunit-xmlunit/lib/xmlunit1.0.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/hibernate-int"/> <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/ejb3x"/> + <classpathentry combineaccessrules="false" kind="src" path="/ejb3"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Adrian B. <adr...@jb...> - 2005-08-29 17:47:15
|
User: adrian Date: 05/08/29 13:47:13 Modified: jbosstest .classpath Log: Cutover the eclipse build to the new build, still some issues. Revision Changes Path 1.49 +7 -7 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.48 retrieving revision 1.49 diff -u -b -r1.48 -r1.49 --- .classpath 29 Aug 2005 16:11:59 -0000 1.48 +++ .classpath 29 Aug 2005 17:47:13 -0000 1.49 @@ -17,23 +17,23 @@ <classpathentry kind="src" path="/security"/> <classpathentry kind="src" path="/transaction"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-commons/lib/commons-httpclient.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit-junit/lib/junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/junitejb/junitejb/lib/junitejb.jar"/> + <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="/thirdparty/junitejb/lib/junitejb.jar"/> <classpathentry kind="lib" path="/tools/lib/ant.jar"/> <classpathentry kind="src" path="/aop"/> <classpathentry kind="src" path="/aspects"/> <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/> - <classpathentry kind="lib" path="/thirdparty/javagroups-javagroups/lib/jgroups.jar"/> + <classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/> <classpathentry kind="src" path="/media"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/jacorb-jacorb/lib/jacorb.jar"/> + <classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/> <classpathentry kind="src" path="/iiop"/> <classpathentry kind="src" path="/webservice"/> <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/> <classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/> - <classpathentry kind="lib" path="/thirdparty/hsqldb-hsqldb/lib/hsqldb.jar"/> + <classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> <classpathentry kind="src" path="/j2ee"/> <classpathentry kind="src" path="/j2se"/> @@ -43,7 +43,7 @@ <classpathentry kind="lib" path="src/resources"/> <classpathentry kind="src" path="/test"/> <classpathentry combineaccessrules="false" kind="src" path="/deployment"/> - <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/> + <classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> |