From: Francisco R. <rev...@im...> - 2005-04-24 06:24:46
|
User: reverbel Date: 05/04/24 02:24:33 Modified: jbosstest build.xml Log: Target iiop-test needs the NameService reference and the client-side tx interceptor. Revision Changes Path 1.452 +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.451 retrieving revision 1.452 diff -u -b -r1.451 -r1.452 --- build.xml 13 Apr 2005 04:08:11 -0000 1.451 +++ build.xml 24 Apr 2005 06:24:33 -0000 1.452 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.451 2005/04/13 04:08:11 ejort Exp $ --> +<!-- $Id: build.xml,v 1.452 2005/04/24 06:24:33 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2271,6 +2271,8 @@ <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::localhost:3528/JBoss/Naming/root"/> + <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/> |
From: Adrian B. <adr...@jb...> - 2005-04-27 22:08:33
|
User: adrian Date: 05/04/27 18:08:17 Modified: jbosstest .classpath Log: Allow the xml tests to run from inside eclipse by adding src/resources to the classpath. Revision Changes Path 1.32 +1 -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.31 retrieving revision 1.32 diff -u -b -r1.31 -r1.32 --- .classpath 13 Apr 2005 04:08:13 -0000 1.31 +++ .classpath 27 Apr 2005 22:08:17 -0000 1.32 @@ -43,5 +43,6 @@ <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/> <classpathentry kind="src" path="/mbeans"/> <classpathentry kind="src" path="/jmx"/> + <classpathentry kind="lib" path="src/resources"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Scott S. <sco...@jb...> - 2005-04-28 22:16:53
|
User: starksm Date: 05/04/28 18:16:37 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Remove the maybejars depends on all but the main entry points as this is wasting time with recompiling. Revision Changes Path No revision No revision 1.406.2.58 +19 -20 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.57 retrieving revision 1.406.2.58 diff -u -b -r1.406.2.57 -r1.406.2.58 --- build.xml 13 Apr 2005 06:01:28 -0000 1.406.2.57 +++ build.xml 28 Apr 2005 22:16:37 -0000 1.406.2.58 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.57 2005/04/13 06:01:28 osdchicago Exp $ --> +<!-- $Id: build.xml,v 1.406.2.58 2005/04/28 22:16:37 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -946,8 +946,7 @@ </target> <target name="tomcat-sso-clustered-tests" - description="Tomcat tests requiring clustered SSO configured" - depends="maybejars"> + description="Tomcat tests requiring clustered SSO configured"> <!-- Create the sso enabled tomcat config starting with the default config --> <create-config baseconf="all" newconf="tomcat-sso-cluster0" @@ -1008,7 +1007,7 @@ <target name="test-example-binding-manager" description="Test the example binding configuration" - depends="maybejars"> + > <create-all-cluster-node conf="binding-manager1" ports="ports-01"/> <create-all-cluster-node conf="binding-manager2" ports="ports-02"/> <start-jboss conf="binding-manager1"/> @@ -1112,7 +1111,7 @@ | server distribution build. --> - <target name="tests-standard-unit" depends="maybejars"> + <target name="tests-standard-unit"> <echo><![CDATA[ junit.timeout: ${junit.timeout} jbosstest.iterationcount: ${jbosstest.iterationcount} @@ -1162,7 +1161,7 @@ </junit> </target> - <target name="tests-standard-stress" depends="maybejars"> + <target name="tests-standard-stress"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1203,7 +1202,7 @@ </junit> </target> - <target name="tests-clustering-unit" depends="maybejars"> + <target name="tests-clustering-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1273,7 +1272,7 @@ <stop-cluster/> </target> - <target name="tests-ha-unit" depends="maybejars"> + <target name="tests-ha-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1319,7 +1318,7 @@ | jar rather than the build.classes.dir. Typically these tests need to | control how classes are loaded. --> - <target name="tests-client-unit" depends="maybejars"> + <target name="tests-client-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1370,7 +1369,7 @@ | Standard security tests that should run successfully against a default | JBoss server distribution build. --> - <target name="tests-security-basic-unit" depends="maybejars"> + <target name="tests-security-basic-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1647,7 +1646,7 @@ <wait-on-shutdown conf="jacc"/> </target> - <target name="tests-standalone-aop-unit" depends="maybejars"> + <target name="tests-standalone-aop-unit"> <!-- <antcall target="tests-treecacheaop-unit" inheritRefs="true"/> --> @@ -1845,7 +1844,7 @@ | Standard Foe-Deployer tests that should run successfully against a default | JBoss server distribution build. --> - <target name="tests-foe-deployer-unit" depends="maybejars"> + <target name="tests-foe-deployer-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1895,7 +1894,7 @@ <!-- | JBossMX implementation tests that should run correctly. --> - <target name="tests-jbossmx-implementation" depends="maybejars"> + <target name="tests-jbossmx-implementation"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1936,7 +1935,7 @@ <!-- | JBossMX performance tests that should run correctly. --> - <target name="tests-jbossmx-performance" depends="maybejars"> + <target name="tests-jbossmx-performance"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1976,7 +1975,7 @@ <!-- | JBossMX compliance tests that should run correctly. --> - <target name="tests-jbossmx-compliance" depends="maybejars"> + <target name="tests-jbossmx-compliance"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2016,7 +2015,7 @@ <!-- | IIOP test cases that should run successfully --> - <target name="tests-iiop" depends="maybejars"> + <target name="tests-iiop"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2070,7 +2069,7 @@ </target> <!-- Test the XML binding framework --> - <target name="tests-xml-unit" depends="maybejars"> + <target name="tests-xml-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2280,7 +2279,7 @@ </target> <!-- Test for JAXR under the Web Services Umbrella --> - <target name="tests-scout-jaxr" depends="maybejars"> + <target name="tests-scout-jaxr"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2468,7 +2467,7 @@ --> <target name="tests-db" depends="run-db-tests, tests-report-html"/> - <target name="run-db-tests" depends="maybejars"> + <target name="run-db-tests"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2635,7 +2634,7 @@ <!-- | Run the JORAM JMS testsuite against JBossMQ --> - <target name="tests-objectweb-jms" depends="maybejars"> + <target name="tests-objectweb-jms"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" |
From: Clebert S. <csu...@jb...> - 2005-04-28 23:43:13
|
User: csuconic Date: 05/04/28 19:43:00 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Adding test-container for matrix checkings, acording to JBAS-1598 Revision Changes Path No revision No revision 1.406.2.59 +108 -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.58 retrieving revision 1.406.2.59 diff -u -b -r1.406.2.58 -r1.406.2.59 --- build.xml 28 Apr 2005 22:16:37 -0000 1.406.2.58 +++ build.xml 28 Apr 2005 23:43:00 -0000 1.406.2.59 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.58 2005/04/28 22:16:37 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.59 2005/04/28 23:43:00 csuconic Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -613,6 +613,10 @@ description="The units tests which are run against the jboss all config"> <start-jboss conf="all" jvmargs="-Xmx128m"/> <wait-on-host/> + <!-- It requires -Dmatrix-versions=defined if you want to execute this task. + More information at http://www.jboss.org/wiki/Edit.jsp?page=HowToExecuteMatrixTests + --> + <antcall target="tests-standard-unit-matrix"/> <antcall target="tests-standard-unit"/> <antcall target="tests-client-unit"/> <antcall target="tests-security-basic-unit"/> @@ -2777,6 +2781,108 @@ </junitreport> </target> + + <target name="jboss-matrix-tests" + description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars" if="matrix-versions"> + <start-jboss conf="all" jvmargs="-Xmx128m"/> + <wait-on-host/> + <antcall target="tests-standard-unit-matrix"/> + <stop-jboss/> + <wait-on-shutdown conf="all"/> + </target> + + <target name="define-matrix-task"> + <taskdef name="matrixtask" classname="org.jboss.ant.taskdefs.AntCallOnDirectoryList"> + <classpath> + <pathelement location="${build.classes}"/> + </classpath> + </taskdef> + </target> + + <target name="tests-standard-unit-matrix" depends="define-matrix-task" if="matrix-versions"> + <matrixtask targetToExecute="tests-standard-unit-matrix-version" directoryProperty="current-version-dir" versionNameProperty="matrix-configuration"> + <dirset dir="${matrix-versions}"/> + </matrixtask> + </target> + + + <macrodef name="execute-matrix-unit"> + <attribute name="test-name"/> + <attribute name="parameter-filter"/> + <sequential> + <!-- this requires antcall as a property can't be redefined --> + <antcall target="execute-matrix-unit-target"> + <param name="test-name" value="@{test-name}"/> + <param name="parameter-filter" value="@{parameter-filter}"/> + </antcall> + </sequential> + </macrodef> + + <target name="execute-matrix-unit-target"> + <echo message=">>>>>> Executing test=${test-name} filter=${parameter-filter}"/> + <pathconvert pathSep="," dirSep="/" property="jbosstest.hometest"> + <path location="${build.classes}"/> + </pathconvert> + + <pathconvert pathSep="," dirSep="/" property="jbosstest.executionlist"> + <path > + <fileset dir="${build.classes}"> + <include name="${parameter-filter}"/> + </fileset> + </path> + </pathconvert> + + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="true" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> + <!-- Used for JGroups --> + <jvmarg value="-Dbind.address=${node0}"/> + <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="jboss-junit-configuration" value="${test-name}_${matrix-configuration}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + <classpath> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}"/> + <fileset dir="${current-version-dir}" includes="*.jar"/> + <path refid="library.classpath" /> + </classpath> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + usefile="${junit.formatter.usefile}" + extension="-${test-name}_${matrix-configuration}.xml"/> + + <batchtest todir="${build.reports}" + haltonerror="${junit.batchtest.haltonerror}" + haltonfailure="${junit.batchtest.haltonfailure}" + fork="${junit.batchtest.fork}"> + + <fileset dir="${build.classes}"> + <include name="org/jboss/test/compatibility/test/matrix/MatrixTestContainer.class"/> + </fileset> + </batchtest> + </junit> + + </target> + + <target name="tests-standard-unit-matrix-version"> + <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/> + <execute-matrix-unit test-name="WebService" parameter-filter="org/jboss/test/webservice/**/*TestCase.class"/> + <execute-matrix-unit test-name="BMP" parameter-filter="org/jboss/test/bmp/**/*TestCase.class"/> + <execute-matrix-unit test-name="CMP" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/> + <execute-matrix-unit test-name="JBossMX" parameter-filter="org/jboss/test/jbossmx/**/*TestCase.class"/> + <execute-matrix-unit test-name="JMS" parameter-filter="org/objectweb/jtests/jms/**/*Test.class"/> + </target> + <!-- | this currently spews logs of VariableReference crap, so it is turned | off by default. Once this is fixed, it should be built after |
From: Clebert S. <csu...@jb...> - 2005-04-29 19:23:44
|
User: csuconic Date: 05/04/29 15:23:30 Modified: jbosstest Tag: Branch_4_0 build.xml Log: rename the compatibility version test to tests-matrix. Revision Changes Path No revision No revision 1.406.2.60 +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.59 retrieving revision 1.406.2.60 diff -u -b -r1.406.2.59 -r1.406.2.60 --- build.xml 28 Apr 2005 23:43:00 -0000 1.406.2.59 +++ build.xml 29 Apr 2005 19:23:29 -0000 1.406.2.60 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.59 2005/04/28 23:43:00 csuconic Exp $ --> +<!-- $Id: build.xml,v 1.406.2.60 2005/04/29 19:23:29 csuconic Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2782,7 +2782,7 @@ </target> - <target name="jboss-matrix-tests" + <target name="tests-matrix" description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars" if="matrix-versions"> <start-jboss conf="all" jvmargs="-Xmx128m"/> <wait-on-host/> |
From: Steve E. <ste...@jb...> - 2005-04-29 22:40:47
|
User: sebersole Date: 05/04/29 18:40:32 Modified: jbosstest Tag: Branch_4_0 build.xml Log: upgrade to Hibernate3 Revision Changes Path No revision No revision 1.406.2.61 +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.60 retrieving revision 1.406.2.61 diff -u -b -r1.406.2.60 -r1.406.2.61 --- build.xml 29 Apr 2005 19:23:29 -0000 1.406.2.60 +++ build.xml 29 Apr 2005 22:40:31 -0000 1.406.2.61 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.60 2005/04/29 19:23:29 csuconic Exp $ --> +<!-- $Id: build.xml,v 1.406.2.61 2005/04/29 22:40:31 sebersole Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -96,7 +96,7 @@ <path refid="hsqldb.hsqldb.classpath"/> <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> + <path refid="hibernate3.classpath"/> <path refid="odmg.classpath"/> <path refid="cglib.classpath"/> </path> |
From: Clebert S. <csu...@jb...> - 2005-04-30 04:32:32
|
User: csuconic Date: 05/04/30 00:32:13 Modified: jbosstest Tag: Branch_4_0 build.xml Log: This is a temporary change trying to fix cruisecontrol. Revision Changes Path No revision No revision 1.406.2.62 +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.61 retrieving revision 1.406.2.62 diff -u -b -r1.406.2.61 -r1.406.2.62 --- build.xml 29 Apr 2005 22:40:31 -0000 1.406.2.61 +++ build.xml 30 Apr 2005 04:32:13 -0000 1.406.2.62 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.61 2005/04/29 22:40:31 sebersole Exp $ --> +<!-- $Id: build.xml,v 1.406.2.62 2005/04/30 04:32:13 csuconic Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -611,7 +611,7 @@ <target name="jboss-all-config-tests" description="The units tests which are run against the jboss all config"> - <start-jboss conf="all" jvmargs="-Xmx128m"/> + <start-jboss conf="all" jvmargs="-verbose:gc -XX:MaxPermSize=128m -Xmx256m"/> <wait-on-host/> <!-- It requires -Dmatrix-versions=defined if you want to execute this task. More information at http://www.jboss.org/wiki/Edit.jsp?page=HowToExecuteMatrixTests |
From: Scott S. <sco...@jb...> - 2005-05-01 16:59:28
|
User: starksm Date: 05/05/01 12:59:14 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Disable the TCP stack tests until http://jira.jboss.com/jira/browse/JBAS-1761 is resolved Revision Changes Path No revision No revision 1.406.2.63 +4 -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.62 retrieving revision 1.406.2.63 diff -u -b -r1.406.2.62 -r1.406.2.63 --- build.xml 30 Apr 2005 04:32:13 -0000 1.406.2.62 +++ build.xml 1 May 2005 16:59:14 -0000 1.406.2.63 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.62 2005/04/30 04:32:13 csuconic Exp $ --> +<!-- $Id: build.xml,v 1.406.2.63 2005/05/01 16:59:14 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -763,11 +763,13 @@ <antcall target="tests-clustering"> <param name="jboss-junit-configuration" value="UDP"/> </antcall> - <!-- Test a TCP stack --> + <!-- Test a TCP stack. + Disabled until http://jira.jboss.com/jira/browse/JBAS-1761 is resolved <antcall target="tests-clustering"> <param name="jgroups-stack" value="TCP"/> <param name="jboss-junit-configuration" value="TCP"/> </antcall> + --> </target> <!-- Depending on the value of the ${jgroups-stack} variable, uses different JGroups stacks --> |
From: Scott S. <sco...@jb...> - 2005-05-02 01:09:42
|
User: starksm Date: 05/05/01 21:09:22 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Include the jmx-console.war in the jacc configuration Revision Changes Path No revision No revision 1.406.2.64 +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.63 retrieving revision 1.406.2.64 diff -u -b -r1.406.2.63 -r1.406.2.64 --- build.xml 1 May 2005 16:59:14 -0000 1.406.2.63 +++ build.xml 2 May 2005 01:09:22 -0000 1.406.2.64 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.63 2005/05/01 16:59:14 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.64 2005/05/02 01:09:22 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1498,6 +1498,7 @@ <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jmx-console.war/**"/> <include name="deploy/jbossjca-service.xml"/> <include name="deploy/jboss-local-jdbc.rar"/> <include name="deploy/mail-service.xml"/> @@ -1579,6 +1580,7 @@ <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jmx-console.war/**"/> <include name="deploy/jbossjca-service.xml"/> <include name="deploy/jboss-local-jdbc.rar"/> <include name="deploy/mail-service.xml"/> |
From: Scott S. <sco...@jb...> - 2005-05-02 01:24:14
|
User: starksm Date: 05/05/01 21:23:58 Modified: jbosstest build.xml Log: Merge some change from 4.0 Revision Changes Path 1.454 +204 -23 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.453 retrieving revision 1.454 diff -u -b -r1.453 -r1.454 --- build.xml 28 Apr 2005 23:31:30 -0000 1.453 +++ build.xml 2 May 2005 01:23:58 -0000 1.454 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.453 2005/04/28 23:31:30 adrian Exp $ --> +<!-- $Id: build.xml,v 1.454 2005/05/02 01:23:58 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -226,8 +226,8 @@ <property name="jbosstest.threadcount" value="5"/> <property name="jbosstest.beancount" value="5"/> <property name="jbosstest.nodeploy" value="false"/> + <property name="jbosstest.src.etc" value="${source.etc}"/> <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> <!-- Override JUnit Marathon defaults --> <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> @@ -350,6 +350,8 @@ <!-- Import the jboss server run targets --> <import file="imports/server-config.xml"/> + <!-- Propagate the dist directory as a jbosstest system property --> + <property name="jbosstest.dist" value="${jboss.dist}"/> <!-- ================================================================== --> <!-- Cleaning --> @@ -442,6 +444,7 @@ <patternset id="security.includes"> <include name="**/test/naming/test/Security*"/> <include name="**/test/security/test/*UnitTestCase.class"/> + <include name="**/test/jca/test/SecurityContextUnitTestCase.class"/> <include name="**/test/jmx/test/Secure*TestCase.class"/> <include name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <include name="**/test/perf/test/SecurePerfStressTestCase.class"/> @@ -450,6 +453,7 @@ <patternset id="security.excludes"> <exclude name="**/test/naming/test/Security*"/> <exclude name="**/test/security/test/*UnitTestCase.class"/> + <exclude name="**/test/jca/test/SecurityContextUnitTestCase.class"/> <exclude name="**/test/jmx/test/Secure*"/> <exclude name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/> @@ -539,6 +543,13 @@ <patternset id="deployment-service.excludes"> <exclude name="org/jboss/test/deployment/test/*TestCase.class"/> </patternset> + <!-- The compatibility tests need extra memory --> + <patternset id="compatibility.includes"> + <include name="org/jboss/test/compatibility/test/*TestCase.class"/> + </patternset> + <patternset id="compatibility.excludes"> + <exclude name="org/jboss/test/compatibility/test/*TestCase.class"/> + </patternset> <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> @@ -563,6 +574,7 @@ <patternset refid="iiop.excludes"/> <patternset refid="jbossxb.excludes"/> <patternset refid="deployment-service.excludes"/> + <patternset refid="compatibility.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -588,8 +600,10 @@ <antcall target="tomcat-ssl-tests"/> <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> + <antcall target="test-example-binding-manager"/> <antcall target="tests-jacc-security"/> - <antcall target="jrmp-invoker-tests"/> + <antcall target="tests-jacc-securitymgr"/> + <antcall target="tests-compatibility"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -788,6 +802,7 @@ </batchtest> </junit> <stop-jboss/> + <wait-on-shutdown conf="tomcat-ssl"/> </target> <!-- Tests of tomcat requiring SSO configured @@ -843,11 +858,11 @@ </batchtest> </junit> <stop-jboss/> + <wait-on-shutdown conf="tomcat-sso"/> </target> <target name="tomcat-sso-clustered-tests" - description="Tomcat tests requiring clustered SSO configured" - depends="maybejars"> + description="Tomcat tests requiring clustered SSO configured"> <!-- Create the sso enabled tomcat config starting with the default config --> <create-config baseconf="all" newconf="tomcat-sso-cluster0" @@ -902,8 +917,36 @@ <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> + <wait-on-shutdown conf="tomcat-sso-cluster0"/> + <wait-on-shutdown conf="tomcat-sso-cluster1"/> </target> + <target name="test-example-binding-manager" + description="Test the example binding configuration" + > + <create-all-cluster-node conf="binding-manager1" ports="ports-01"/> + <create-all-cluster-node conf="binding-manager2" ports="ports-02"/> + <start-jboss conf="binding-manager1"/> + <echo>Waiting for http://localhost:8180</echo> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8180"/> + </and> + </waitfor> + <fail message="Timeout waiting for binding-manager1 to start" if="cluster.timeout"/> + <start-jboss conf="binding-manager2"/> + <echo>Waiting for http://localhost:8280</echo> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8280"/> + </and> + </waitfor> + <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <stop-jboss url="jnp://localhost:1299"/> + <stop-jboss url="jnp://localhost:1199"/> + </target> <!-- | Tests ejb calls using the jrmp invoker @@ -1001,6 +1044,7 @@ <param name="jboss-junit-configuration" value="DeploymentService"/> </antcall> <stop-jboss/> + <wait-on-shutdown conf="deployment-service"/> </target> <target name="deployment-service-unit-tests"> @@ -1045,7 +1089,7 @@ | server distribution build. --> - <target name="tests-standard-unit" depends="maybejars"> + <target name="tests-standard-unit"> <echo><![CDATA[ junit.timeout: ${junit.timeout} jbosstest.iterationcount: ${jbosstest.iterationcount} @@ -1095,7 +1139,7 @@ </junit> </target> - <target name="tests-standard-stress" depends="maybejars"> + <target name="tests-standard-stress"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1136,7 +1180,7 @@ </junit> </target> - <target name="tests-clustering-unit" depends="maybejars"> + <target name="tests-clustering-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1206,7 +1250,7 @@ <stop-cluster/> </target> - <target name="tests-ha-unit" depends="maybejars"> + <target name="tests-ha-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1252,7 +1296,7 @@ | jar rather than the build.classes.dir. Typically these tests need to | control how classes are loaded. --> - <target name="tests-client-unit" depends="maybejars"> + <target name="tests-client-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1303,7 +1347,7 @@ | Standard security tests that should run successfully against a default | JBoss server distribution build. --> - <target name="tests-security-basic-unit" depends="maybejars"> + <target name="tests-security-basic-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1411,6 +1455,7 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="default"/> </target> <!-- Tests of the JACC security implementation --> @@ -1425,10 +1470,11 @@ <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jmx-console.war/**"/> <include name="deploy/jbossjca-service.xml"/> <include name="deploy/jboss-local-jdbc.rar"/> <include name="deploy/mail-service.xml"/> - <include name="deploy/jms/*"/> + <include name="deploy/jms/**"/> <include name="lib/**"/> </patternset> </create-config> @@ -1492,9 +1538,95 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="jacc"/> + </target> + + <target name="tests-jacc-securitymgr" + description="Tests run against a jboss server with JACC configured + security manager"> + <!-- Create the ssl enabled tomcat config --> + <create-config baseconf="default" newconf="jacc"> + <patternset> + <include name="conf/**"/> + <include name="deploy/hsqldb-ds.xml"/> + <include name="deploy/jbossweb*.sar/**"/> + <include name="deploy/ear-deployer.xml"/> + <include name="deploy/ejb-deployer.xml"/> + <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jmx-console.war/**"/> + <include name="deploy/jbossjca-service.xml"/> + <include name="deploy/jboss-local-jdbc.rar"/> + <include name="deploy/mail-service.xml"/> + <include name="deploy/jms/*"/> + <include name="lib/**"/> + </patternset> + </create-config> + <start-securitymgr conf="jacc"/> + + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.testlog}"/> + <waitfor maxwait="60" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> + <http url="http://localhost:8080/"/> + </waitfor> + <fail message="Timeout waiting for server to start" if="startup.timeout"/> + + + <junit dir="${module.output}" + printsummary="true" + haltonerror="false" + haltonfailure="false" + fork="true" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> + + <!-- + <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/client.policy"/> + <jvmarg value="-Djava.security.debug=access,failure"/> + --> + <sysproperty key="jboss.home" file="${project.root}"/> + <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/> + <sysproperty key="jboss.tools.dir" file="${project.root}/tools"/> + <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> + <sysproperty key="jbosstest.secure" value="true"/> + <sysproperty key="jboss-junit-configuration" value="JACC+SecurityMgr"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + <sysproperty key="java.security.auth.login.config" + value="${build.resources}/security/auth.conf"/> + <sysproperty key="build.testlog" value="${build.testlog}"/> + <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + + <classpath> + <pathelement location="${build.resources}"/> + <pathelement location="${build.classes}"/> + <path refid="tests.classpath"/> + </classpath> + + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + usefile="${junit.formatter.usefile}" + extension="-${jboss-junit-configuration}.xml"/> + + <batchtest todir="${build.reports}" + haltonerror="false" + haltonfailure="false" + fork="true"> + + <fileset dir="${build.classes}"> + <patternset refid="jacc.includes"/> + </fileset> + </batchtest> + </junit> + + <stop-jboss/> + <wait-on-shutdown conf="jacc"/> </target> - <target name="tests-standalone-aop-unit" depends="maybejars"> + <target name="tests-standalone-aop-unit"> <!-- <antcall target="tests-treecacheaop-unit" inheritRefs="true"/> --> @@ -1502,6 +1634,53 @@ <antcall target="tests-baseaop-unit" inheritRefs="true"/> </target> + <target name="tests-compatibility" + description="Checks compatibility on SerialUUID" depends="init"> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="true" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> + <jvmarg value="-XX:MaxPermSize=128m"/> + <jvmarg value="-Xmx196m"/> + <sysproperty key="jboss.dist" file="${jboss.dist}"/> + <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="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + + <!-- This runs with a minimal classpath as the jboss classes need to + be loaded in a seperate class loader. + --> + <classpath> + <pathelement location="${build.classes}" /> + <pathelement location="${build.resources}" /> + <path refid="jboss.varia.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}"> + <patternset refid="compatibility.includes"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="tests-treecacheaop-unit" depends="init"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -1645,7 +1824,7 @@ | Standard Foe-Deployer tests that should run successfully against a default | JBoss server distribution build. --> - <target name="tests-foe-deployer-unit" depends="maybejars"> + <target name="tests-foe-deployer-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1695,7 +1874,7 @@ <!-- | JBossMX implementation tests that should run correctly. --> - <target name="tests-jbossmx-implementation" depends="maybejars"> + <target name="tests-jbossmx-implementation"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1736,7 +1915,7 @@ <!-- | JBossMX performance tests that should run correctly. --> - <target name="tests-jbossmx-performance" depends="maybejars"> + <target name="tests-jbossmx-performance"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1776,7 +1955,7 @@ <!-- | JBossMX compliance tests that should run correctly. --> - <target name="tests-jbossmx-compliance" depends="maybejars"> + <target name="tests-jbossmx-compliance"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1816,7 +1995,7 @@ <!-- | IIOP test cases that should run successfully --> - <target name="tests-iiop" depends="maybejars"> + <target name="tests-iiop"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1870,7 +2049,7 @@ </target> <!-- Test the XML binding framework --> - <target name="tests-xml-unit" depends="maybejars"> + <target name="tests-xml-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2004,7 +2183,7 @@ <!-- Test for JAXR under the Web Services Umbrella --> - <target name="tests-scout-jaxr" depends="maybejars"> + <target name="tests-scout-jaxr"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2070,7 +2249,7 @@ <!-- Test for JAXR under the Web Services Umbrella --> - <target name="tests-jaxr" depends="maybejars"> + <target name="tests-jaxr"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2206,6 +2385,7 @@ <jvmarg value="${junit.jvm.options}"/> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Dbind.address=${env.MYTESTIP_1}"/> <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/> <!-- Used for JGroups --> <jvmarg value="-Dbind.address=${node0}"/> @@ -2307,7 +2487,7 @@ <!-- | Run the JORAM JMS testsuite against JBossMQ --> - <target name="tests-objectweb-jms" depends="maybejars"> + <target name="tests-objectweb-jms"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2352,7 +2532,7 @@ | of the unit test using the test property, -Dtest=org.jboss.test.... | Here you specify the testcase class, not the directory --> - <target name="one-test" depends="init" if="test" + <target name="one-test" if="test" description="Execute a single test."> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -2373,6 +2553,7 @@ <!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>--> <!-- Used for JGroups --> <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="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> |
From: Clebert S. <csu...@jb...> - 2005-05-02 17:01:05
|
User: csuconic Date: 05/05/02 13:00:46 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Removing the PermSize I added for cruisecontrol tests Revision Changes Path No revision No revision 1.406.2.65 +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.64 retrieving revision 1.406.2.65 diff -u -b -r1.406.2.64 -r1.406.2.65 --- build.xml 2 May 2005 01:09:22 -0000 1.406.2.64 +++ build.xml 2 May 2005 17:00:46 -0000 1.406.2.65 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.64 2005/05/02 01:09:22 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.65 2005/05/02 17:00:46 csuconic Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -611,7 +611,7 @@ <target name="jboss-all-config-tests" description="The units tests which are run against the jboss all config"> - <start-jboss conf="all" jvmargs="-verbose:gc -XX:MaxPermSize=128m -Xmx256m"/> + <start-jboss conf="all" jvmargs="-verbose:gc -Xmx128m"/> <wait-on-host/> <!-- It requires -Dmatrix-versions=defined if you want to execute this task. More information at http://www.jboss.org/wiki/Edit.jsp?page=HowToExecuteMatrixTests |
From: Adrian B. <adr...@jb...> - 2005-05-02 18:15:55
|
User: adrian Date: 05/05/02 14:15:40 Modified: jbosstest Tag: Branch_4_0 .classpath Log: JBoss4.0.2 eclipse build fixes includes trimming of what gets checked out to what is actually compiled/included in the build and sorting of the build.xml's modules so it is easy to see what is missing/redundant Revision Changes Path No revision No revision 1.24.2.7 +176 -44 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.6 retrieving revision 1.24.2.7 diff -u -b -r1.24.2.6 -r1.24.2.7 --- .classpath 14 Apr 2005 00:18:51 -0000 1.24.2.6 +++ .classpath 2 May 2005 18:15:39 -0000 1.24.2.7 @@ -1,48 +1,180 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/test/media/" kind="src" path="src/main"/> - <classpathentry kind="src" path="output/gen-src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/tools"/> - <classpathentry kind="src" path="/j2ee"/> - <classpathentry kind="src" path="/management"/> - <classpathentry kind="src" path="/jmx"/> - <classpathentry kind="src" path="/common"/> - <classpathentry kind="src" path="/system"/> - <classpathentry kind="src" path="/varia"/> - <classpathentry kind="src" path="/server"/> - <classpathentry kind="src" path="/cluster"/> - <classpathentry kind="src" path="/messaging"/> - <classpathentry kind="src" path="/naming"/> - <classpathentry kind="src" path="/connector"/> - <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/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="/tools/lib/ant.jar"/> - <classpathentry kind="src" path="/remoting"/> - <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"/> - <classpathentry kind="lib" path="/thirdparty/jacorb-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="src" path="/jboss.net"/> - <classpathentry kind="src" path="/hibernate"/> - <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate2.jar"/> - <classpathentry kind="src" path="/jaxrpc"/> - <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aop.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aspect-library.jar"/> - <classpathentry kind="src" path="/deployment"/> - <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/> + <classpathentry excluding="org/jboss/test/media/" kind="src" path="src/main"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="output/gen-src"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/tools"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/j2ee"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/management"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/jmx"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/common"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/system"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/varia"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/server"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/cluster"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/messaging"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/naming"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/connector"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/security"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/transaction"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/apache-commons/lib/commons-httpclient.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/junit-junit/lib/junit.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/junitejb/junitejb/lib/junitejb.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/tools/lib/ant.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/remoting"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/cache"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/javagroups-javagroups/lib/jgroups.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/media"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/jacorb-jacorb/lib/jacorb.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/iiop"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/webservice"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/hsqldb-hsqldb/lib/hsqldb.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/jboss.net"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/hibernate"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/jaxrpc"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aop.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aspect-library.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/deployment"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"> + <attributes> + </attributes> + </classpathentry> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Scott S. <sco...@jb...> - 2005-05-04 00:05:22
|
User: starksm Date: 05/05/03 20:05:05 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Correct the link to the HowToExecuteMatrixTests wiki page to not use the edit mode Revision Changes Path No revision No revision 1.406.2.66 +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.65 retrieving revision 1.406.2.66 diff -u -b -r1.406.2.65 -r1.406.2.66 --- build.xml 2 May 2005 17:00:46 -0000 1.406.2.65 +++ build.xml 4 May 2005 00:05:05 -0000 1.406.2.66 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.65 2005/05/02 17:00:46 csuconic Exp $ --> +<!-- $Id: build.xml,v 1.406.2.66 2005/05/04 00:05:05 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -614,7 +614,7 @@ <start-jboss conf="all" jvmargs="-verbose:gc -Xmx128m"/> <wait-on-host/> <!-- It requires -Dmatrix-versions=defined if you want to execute this task. - More information at http://www.jboss.org/wiki/Edit.jsp?page=HowToExecuteMatrixTests + More information at http://wiki.jboss.org/wiki/Wiki.jsp?page=HowToExecuteMatrixTests --> <antcall target="tests-standard-unit-matrix"/> <antcall target="tests-standard-unit"/> |
From: Scott S. <sco...@jb...> - 2005-05-04 23:14:45
|
User: starksm Date: 05/05/04 19:14:42 Modified: jbosstest build.xml Log: Add the deployment module classpath Revision Changes Path 1.455 +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.454 retrieving revision 1.455 diff -u -b -r1.454 -r1.455 --- build.xml 2 May 2005 01:23:58 -0000 1.454 +++ build.xml 4 May 2005 23:14:42 -0000 1.455 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.454 2005/05/02 01:23:58 starksm Exp $ --> +<!-- $Id: build.xml,v 1.455 2005/05/04 23:14:42 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -124,6 +124,7 @@ <path refid="jboss.cache.classpath"/> <path refid="jboss.cluster.classpath"/> <path refid="jboss.common.classpath"/> + <path refid="jboss.deployment.classpath"/> <path refid="jboss.hibernate.classpath"/> <path refid="jboss.iiop.classpath"/> <path refid="jboss.internal-server.classpath"/> |
From: Adrian B. <adr...@jb...> - 2005-05-04 23:31:40
|
User: adrian Date: 05/05/04 19:31:37 Modified: jbosstest .classpath Log: Fix the eclipse build Revision Changes Path 1.34 +188 -45 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.33 retrieving revision 1.34 diff -u -b -r1.33 -r1.34 --- .classpath 28 Apr 2005 23:31:30 -0000 1.33 +++ .classpath 4 May 2005 23:31:37 -0000 1.34 @@ -1,49 +1,192 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/test/recover/oracle/**" kind="src" path="src/main"/> - <classpathentry kind="src" path="output/gen-src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/tools"/> - <classpathentry kind="src" path="/management"/> - <classpathentry kind="src" path="/common"/> - <classpathentry kind="src" path="/system"/> - <classpathentry kind="src" path="/varia"/> - <classpathentry kind="src" path="/server"/> - <classpathentry kind="src" path="/cluster"/> - <classpathentry kind="src" path="/messaging"/> - <classpathentry kind="src" path="/naming"/> - <classpathentry kind="src" path="/connector"/> - <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/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="/tools/lib/ant.jar"/> - <classpathentry kind="src" path="/aop"/> - <classpathentry kind="src" path="/aspects"/> - <classpathentry kind="src" path="/remoting"/> - <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"/> - <classpathentry kind="lib" path="/thirdparty/jacorb-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="src" path="/hibernate"/> - <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> - <classpathentry kind="src" path="/jaxrpc"/> - <classpathentry kind="src" path="/j2ee"/> - <classpathentry kind="src" path="/j2se"/> - <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/> - <classpathentry kind="src" path="/mbeans"/> - <classpathentry kind="src" path="/jmx"/> - <classpathentry kind="lib" path="src/resources"/> - <classpathentry kind="src" path="/test"/> + <classpathentry excluding="org/jboss/test/recover/oracle/**" kind="src" path="src/main"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="output/gen-src"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/tools"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/management"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/common"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/system"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/varia"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/server"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/cluster"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/messaging"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/naming"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/connector"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/security"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/transaction"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/apache-commons/lib/commons-httpclient.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/junit-junit/lib/junit.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/junitejb/junitejb/lib/junitejb.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/tools/lib/ant.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/aop"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/aspects"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/remoting"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/cache"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/javagroups-javagroups/lib/jgroups.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/media"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/jacorb-jacorb/lib/jacorb.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/iiop"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/webservice"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/hsqldb-hsqldb/lib/hsqldb.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/hibernate"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/jaxrpc"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/j2ee"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/j2se"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/mbeans"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/jmx"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="src/resources"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/test"> + <attributes> + </attributes> + </classpathentry> + <classpathentry combineaccessrules="false" kind="src" path="/deployment"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"> + <attributes> + </attributes> + </classpathentry> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Francisco R. <rev...@im...> - 2005-05-10 00:24:33
|
User: reverbel Date: 05/05/09 20:23:51 Modified: jbosstest build.xml Log: Add DTM test. Revision Changes Path 1.456 +90 -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.455 retrieving revision 1.456 diff -u -b -r1.455 -r1.456 --- build.xml 4 May 2005 23:14:42 -0000 1.455 +++ build.xml 10 May 2005 00:23:51 -0000 1.456 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.455 2005/05/04 23:14:42 starksm Exp $ --> +<!-- $Id: build.xml,v 1.456 2005/05/10 00:23:51 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -922,6 +922,95 @@ <wait-on-shutdown conf="tomcat-sso-cluster1"/> </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"/> + <create-dtm-config conf="dtm1"/> + <create-dtm-config conf="dtm2"/> + <create-dtm-config conf="dtm3"/> + <!-- 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"/> + <!-- Start DTM nodes --> + <start-jboss conf="dtm0" host="${node0}"/> + <start-jboss conf="dtm1" host="${node1}"/> + <start-jboss conf="dtm2" host="${node2}"/> + <start-jboss conf="dtm3" host="${node3}"/> + <echo message="Waiting for DTM nodes to start..."/> + <waitfor maxwait="120" maxwaitunit="second" checkevery="5" + checkeveryunit="second" timeoutproperty="startup.timeout"> + <and> + <http url="http://${node0}:8080/"/> + <http url="http://${node1}:8080/"/> + <http url="http://${node2}:8080/"/> + <http url="http://${node3}:8080/"/> + </and> + </waitfor> + <fail message="Timeout waiting for nodes to start" if="startup.timeout"/> + <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 --> + <stop-jboss url="jnp://${node0}:1099"/> + <stop-jboss url="jnp://${node1}:1099"/> + <stop-jboss url="jnp://${node2}:1099"/> + <stop-jboss url="jnp://${node3}:1099"/> + </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}"/> + <!-- Used for JGroups --> + <jvmarg value="-Dbind.address=${node0}"/> + <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"/> + </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="**/DTMUnitTestCase.class"/> + </fileset> + </batchtest> + </junit> + </target> + <target name="test-example-binding-manager" description="Test the example binding configuration" > |
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" > |
From: Adrian B. <adr...@jb...> - 2005-05-13 01:01:33
|
User: adrian Date: 05/05/12 21:00:55 Modified: jbosstest .classpath Log: Fix the eclipse build Revision Changes Path 1.35 +4 -4 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.34 retrieving revision 1.35 diff -u -b -r1.34 -r1.35 --- .classpath 4 May 2005 23:31:37 -0000 1.34 +++ .classpath 13 May 2005 01:00:55 -0000 1.35 @@ -92,10 +92,6 @@ <attributes> </attributes> </classpathentry> - <classpathentry kind="src" path="/remoting"> - <attributes> - </attributes> - </classpathentry> <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"> <attributes> </attributes> @@ -188,5 +184,9 @@ <attributes> </attributes> </classpathentry> + <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"> + <attributes> + </attributes> + </classpathentry> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Francisco R. <rev...@im...> - 2005-05-13 05:09:00
|
User: reverbel Date: 05/05/13 01:08:50 Modified: jbosstest build.xml Log: Improvements on DTM/OTS testcases. Revision Changes Path 1.459 +7 -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.458 retrieving revision 1.459 diff -u -b -r1.458 -r1.459 --- build.xml 12 May 2005 21:28:00 -0000 1.458 +++ build.xml 13 May 2005 05:08:50 -0000 1.459 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.458 2005/05/12 21:28:00 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.459 2005/05/13 05:08:50 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -954,9 +954,12 @@ </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"> + <!-- 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> |
From: Francisco R. <rev...@im...> - 2005-05-20 22:03:04
|
User: reverbel Date: 05/05/20 18:02:45 Modified: jbosstest build.xml Log: Add tests for DTM/OTS and XA. The tests are commented out in build.xml, as they use the Derby database engine, which is not included in the JBoss distribution. To run the XA tests, uncomment T09DTMXAUnitTestCase and T10OTSXAUnitTestCase, copy derby.jar to server/default, go to the testsuite directory, and say 'build.sh dtm-tests'. Revision Changes Path 1.462 +27 -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.461 retrieving revision 1.462 diff -u -b -r1.461 -r1.462 --- build.xml 18 May 2005 04:24:59 -0000 1.461 +++ build.xml 20 May 2005 22:02:45 -0000 1.462 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.461 2005/05/18 04:24:59 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.462 2005/05/20 22:02:45 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -932,6 +932,8 @@ <filter token="HOST" value="${node0}"/> </filterset> </copy> + <copy todir="${jboss.dist}/server/dtm0/deploy" overwrite="true" + file="${source.resources}/dtm/derby-xa-ds.xml"/> <create-dtm-config conf="dtm1"/> <copy todir="${jboss.dist}/server/dtm1/conf" overwrite="true" file="${source.resources}/dtm/jacorb.properties"> @@ -939,6 +941,8 @@ <filter token="HOST" value="${node1}"/> </filterset> </copy> + <copy todir="${jboss.dist}/server/dtm1/deploy" overwrite="true" + file="${source.resources}/dtm/derby-xa-ds.xml"/> <create-dtm-config conf="dtm2"/> <copy todir="${jboss.dist}/server/dtm2/conf" overwrite="true" file="${source.resources}/dtm/jacorb.properties"> @@ -946,6 +950,8 @@ <filter token="HOST" value="${node2}"/> </filterset> </copy> + <copy todir="${jboss.dist}/server/dtm2/deploy" overwrite="true" + file="${source.resources}/dtm/derby-xa-ds.xml"/> <create-dtm-config conf="dtm3"/> <copy todir="${jboss.dist}/server/dtm3/conf" overwrite="true" file="${source.resources}/dtm/jacorb.properties"> @@ -953,6 +959,8 @@ <filter token="HOST" value="${node3}"/> </filterset> </copy> + <copy todir="${jboss.dist}/server/dtm3/deploy" overwrite="true" + file="${source.resources}/dtm/derby-xa-ds.xml"/> <!-- make jndi.properties files available to clients of node0 --> <copy todir="${build.resources}" overwrite="true"> @@ -970,6 +978,8 @@ <fileset dir="${build.lib}"> <include name="dtmaccount.jar"/> <include name="dtmaccountiiop.jar"/> + <include name="dtmaccountentity.jar"/> + <include name="dtmaccountentityiiop.jar"/> <include name="dtmworker.jar"/> </fileset> </copy> @@ -977,12 +987,16 @@ <fileset dir="${build.lib}"> <include name="dtmaccount.jar"/> <include name="dtmaccountiiop.jar"/> + <include name="dtmaccountentity.jar"/> + <include name="dtmaccountentityiiop.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.jar"/> + <include name="dtmaccountentityiiop.jar"/> </fileset> </copy> <!-- Start DTM nodes --> @@ -1066,14 +1080,18 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <include name="**/T1DTMUnitTestCase.class"/> - <include name="**/T2OTSUnitTestCase.class"/> - <include name="**/T3MixedDTMOTSUnitTestCase.class"/> - <include name="**/T4MixedOTSDTMUnitTestCase.class"/> - <include name="**/T5DTMInterpositionUnitTestCase.class"/> - <include name="**/T6OTSInterpositionUnitTestCase.class"/> - <include name="**/T7DTMOTSInterpositionUnitTestCase.class"/> - <include name="**/T8OTSDTMInterpositionUnitTestCase.class"/> + <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"/> + <!-- + <include name="**/T09DTMXAUnitTestCase.class"/> + <include name="**/T10OTSXAUnitTestCase.class"/> + --> </fileset> </batchtest> </junit> |
From: Francisco R. <rev...@im...> - 2005-05-21 00:13:58
|
User: reverbel Date: 05/05/20 20:13:39 Modified: jbosstest build.xml Log: Add a comment telling that the DTM/OTS XA tests need the Derby engine. BTW: derby.jar must be placed in server/default/lib, and *not* in server/default (as the previous commit messages incorrectly stated). Revision Changes Path 1.463 +8 -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.462 retrieving revision 1.463 diff -u -b -r1.462 -r1.463 --- build.xml 20 May 2005 22:02:45 -0000 1.462 +++ build.xml 21 May 2005 00:13:38 -0000 1.463 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.462 2005/05/20 22:02:45 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.463 2005/05/21 00:13:38 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1088,7 +1088,10 @@ <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"/> --> |
From: Scott S. <sco...@jb...> - 2005-05-26 17:05:23
|
User: starksm Date: 05/05/26 13:05:03 Modified: jbosstest build.xml Log: Use the run-junit macrodef to reduce the junit task usage duplication. Revision Changes Path 1.464 +27 -112 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.463 retrieving revision 1.464 diff -u -b -r1.463 -r1.464 --- build.xml 21 May 2005 00:13:38 -0000 1.463 +++ build.xml 26 May 2005 17:05:03 -0000 1.464 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.463 2005/05/21 00:13:38 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.464 2005/05/26 17:05:03 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -551,6 +551,13 @@ <patternset id="compatibility.excludes"> <exclude name="org/jboss/test/compatibility/test/*TestCase.class"/> </patternset> + <!-- --> + <patternset id="binding-manager.includes"> + <include name="org/jboss/test/binding/*TestCase.class"/> + </patternset> + <patternset id="binding-manager.excludes"> + <exclude name="org/jboss/test/binding/*TestCase.class"/> + </patternset> <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> @@ -576,6 +583,7 @@ <patternset refid="jbossxb.excludes"/> <patternset refid="deployment-service.excludes"/> <patternset refid="compatibility.excludes"/> + <patternset refid="binding-manager.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -765,43 +773,19 @@ </create-config> <start-jboss conf="tomcat-ssl"/> <wait-on-host/> - <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}"/> - <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="javax.net.ssl.keyStore" + <!-- Specify the JSSE properties --> + <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> - <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client"/> - <sysproperty key="javax.net.ssl.trustStore" + <property name="javax.net.ssl.keyStorePassword" value="unit-tests-client"/> + <property name="javax.net.ssl.trustStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> - <sysproperty key="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.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}"> + <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> - <fileset dir="${build.classes}"> - <patternset refid="tc-ssl.includes"/> - </fileset> - </batchtest> - </junit> + <propertyset id="tomcat-ssl-tests-props"> + <propertyref prefix="javax.net.ssl"/> + </propertyset> + <run-junit junit.patternset="tc-ssl.includes" + junit.syspropertyset="tomcat-ssl-tests-props" /> <stop-jboss/> <wait-on-shutdown conf="tomcat-ssl"/> </target> @@ -827,37 +811,7 @@ </create-config> <start-jboss conf="tomcat-sso"/> <wait-on-host/> - <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}"/> - <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"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.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}"> - <patternset refid="tc-sso.includes"/> - </fileset> - </batchtest> - </junit> + <run-junit junit.patternset="tc-sso.includes" /> <stop-jboss/> <wait-on-shutdown conf="tomcat-sso"/> </target> @@ -1124,6 +1078,7 @@ </and> </waitfor> <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <run-junit junit.patternset="binding-manager.includes" /> <stop-jboss url="jnp://localhost:1299"/> <stop-jboss url="jnp://localhost:1199"/> </target> @@ -1141,55 +1096,15 @@ <include name="lib/**"/> </patternset> </create-config> -<!-- <start-jboss-os conf="jrmp-invoker"/>--> <start-jboss conf="jrmp-invoker"/> <wait-on-host/> - <antcall target="jrmp-invoker-unit-tests"> - <param name="jboss-junit-configuration" value="JRMP-Invoker"/> - </antcall> + <run-junit junit.patternset="jrmp-invoker.includes" + junit.configuration="JRMP-Invoker" /> <stop-jboss/> </target> - <target name="jrmp-invoker-unit-tests"> - <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}"/> - <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="jboss-junit-configuration" value="${jboss-junit-configuration}"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" - usefile="${junit.formatter.usefile}" - extension="-${jboss-junit-configuration}.xml"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <patternset refid="jrmp-invoker.includes"/> - </fileset> - </batchtest> - </junit> - - </target> - <!-- | Tests DeploymentService --> |
From: Scott S. <sco...@jb...> - 2005-05-26 17:42:29
|
User: starksm Date: 05/05/26 13:42:03 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Add a unit test for the binding service to validate that the services are actually started Revision Changes Path No revision No revision 1.406.2.67 +27 -132 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.66 retrieving revision 1.406.2.67 diff -u -b -r1.406.2.66 -r1.406.2.67 --- build.xml 4 May 2005 00:05:05 -0000 1.406.2.66 +++ build.xml 26 May 2005 17:42:03 -0000 1.406.2.67 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.66 2005/05/04 00:05:05 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.67 2005/05/26 17:42:03 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -528,6 +528,13 @@ <patternset id="compatibility.excludes"> <exclude name="org/jboss/test/compatibility/test/*TestCase.class"/> </patternset> + <!-- Binding service tests --> + <patternset id="binding-manager.includes"> + <include name="org/jboss/test/binding/*TestCase.class"/> + </patternset> + <patternset id="binding-manager.excludes"> + <exclude name="org/jboss/test/binding/*TestCase.class"/> + </patternset> <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> @@ -554,6 +561,7 @@ <patternset refid="jbossxb.excludes"/> <patternset refid="deployment-service.excludes"/> <patternset refid="compatibility.excludes"/> + <patternset refid="binding-manager.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -683,37 +691,8 @@ <stop-jboss/> <!-- - <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}"/> - <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"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.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}"> - <patternset refid="tc-sso.includes"/> - </fileset> - </batchtest> - </junit> + <run-junit junit.patternset="netboot.includes" + /> --> <stop-jboss url="jnp://localhost:11099"/> </target> @@ -854,43 +833,19 @@ </create-config> <start-jboss conf="tomcat-ssl"/> <wait-on-host/> - <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}"/> - <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="javax.net.ssl.keyStore" + <!-- Specify the JSSE properties --> + <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> - <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client"/> - <sysproperty key="javax.net.ssl.trustStore" + <property name="javax.net.ssl.keyStorePassword" value="unit-tests-client"/> + <property name="javax.net.ssl.trustStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> - <sysproperty key="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.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}"> + <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> - <fileset dir="${build.classes}"> - <patternset refid="tc-ssl.includes"/> - </fileset> - </batchtest> - </junit> + <propertyset id="tomcat-ssl-tests-props"> + <propertyref prefix="javax.net.ssl"/> + </propertyset> + <run-junit junit.patternset="tc-ssl.includes" + junit.syspropertyset="tomcat-ssl-tests-props" /> <stop-jboss/> <wait-on-shutdown conf="tomcat-ssl"/> </target> @@ -916,37 +871,7 @@ </create-config> <start-jboss conf="tomcat-sso"/> <wait-on-host/> - <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}"/> - <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"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.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}"> - <patternset refid="tc-sso.includes"/> - </fileset> - </batchtest> - </junit> + <run-junit junit.patternset="tc-sso.includes" /> <stop-jboss/> <wait-on-shutdown conf="tomcat-sso"/> </target> @@ -1034,6 +959,7 @@ </and> </waitfor> <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <run-junit junit.patternset="binding-manager.includes" /> <stop-jboss url="jnp://localhost:1299"/> <stop-jboss url="jnp://localhost:1199"/> </target> @@ -1076,40 +1002,9 @@ </target> <target name="deployment-service-unit-tests"> - <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}"/> - <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="jboss-junit-configuration" value="${jboss-junit-configuration}"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" - usefile="${junit.formatter.usefile}" - extension="-${jboss-junit-configuration}.xml"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <patternset refid="deployment-service.includes"/> - </fileset> - </batchtest> - </junit> + <run-junit junit.patternset="deployment-service.includes" + junit.configuration="${jboss-junit-configuration}" + /> </target> <!-- |
From: Scott S. <sco...@jb...> - 2005-05-26 18:17:07
|
User: starksm Date: 05/05/26 14:16:45 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Add a jbosstest-props propertyset Revision Changes Path No revision No revision 1.406.2.68 +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.67 retrieving revision 1.406.2.68 diff -u -b -r1.406.2.67 -r1.406.2.68 --- build.xml 26 May 2005 17:42:03 -0000 1.406.2.67 +++ build.xml 26 May 2005 18:16:45 -0000 1.406.2.68 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.67 2005/05/26 17:42:03 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.68 2005/05/26 18:16:45 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -230,6 +230,9 @@ <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> <property name="marathon.threadcount" value="100"/> + <propertyset id="jbosstest-props"> + <propertyref prefix="jbosstest."/> + </propertyset> <!-- xdoclet --> <path id="xdoclet.task.classpath"> |
From: Scott S. <sco...@jb...> - 2005-05-26 18:19:39
|
User: starksm Date: 05/05/26 14:19:20 Modified: jbosstest build.xml Log: Add a jbosstest-props propertyset Revision Changes Path 1.465 +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.464 retrieving revision 1.465 diff -u -b -r1.464 -r1.465 --- build.xml 26 May 2005 17:05:03 -0000 1.464 +++ build.xml 26 May 2005 18:19:20 -0000 1.465 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.464 2005/05/26 17:05:03 starksm Exp $ --> +<!-- $Id: build.xml,v 1.465 2005/05/26 18:19:20 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -234,6 +234,9 @@ <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> <property name="marathon.threadcount" value="100"/> + <propertyset id="jbosstest-props"> + <propertyref prefix="jbosstest."/> + </propertyset> <!-- xdoclet --> <path id="xdoclet.task.classpath"> |