Menu
▾
▴
jboss-cvs-commits
|
From: Ben W. <bw...@us...> - 2005-01-31 07:40:47
|
User: bwang00 Date: 05/01/30 23:40:40 Modified: . Tag: Branch_4_0 build.xml Log: Updated Revision Changes Path No revision No revision 1.406.2.36 +3 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.35 retrieving revision 1.406.2.36 diff -u -r1.406.2.35 -r1.406.2.36 --- build.xml 26 Jan 2005 23:01:25 -0000 1.406.2.35 +++ build.xml 31 Jan 2005 07:40:38 -0000 1.406.2.36 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.35 2005/01/26 23:01:25 clebert Exp $ --> +<!-- $Id: build.xml,v 1.406.2.36 2005/01/31 07:40:38 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -738,7 +738,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="Two Nodes"/> + <param name="jboss-junit-configuration" value="Default"/> </antcall> <antcall target="tests-clustering-shutdown" /> @@ -751,7 +751,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="New Configuration tests-clustering"/> + <param name="jboss-junit-configuration" value="Mode=repl;UseJvm=true"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> |
|
From: Ben W. <bw...@us...> - 2005-01-31 07:39:38
|
User: bwang00 Date: 05/01/30 23:39:26 Modified: . build.xml Log: Updated Revision Changes Path 1.443 +3 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.442 retrieving revision 1.443 diff -u -r1.442 -r1.443 --- build.xml 29 Jan 2005 04:23:27 -0000 1.442 +++ build.xml 31 Jan 2005 07:39:24 -0000 1.443 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.442 2005/01/29 04:23:27 telrod Exp $ --> +<!-- $Id: build.xml,v 1.443 2005/01/31 07:39:24 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -666,7 +666,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="Two Nodes"/> + <param name="jboss-junit-configuration" value="Default"/> </antcall> <antcall target="tests-clustering-shutdown" /> @@ -679,7 +679,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="New Configuration tests-clustering"/> + <param name="jboss-junit-configuration" value="Mode=sync;UseJvm=true"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> |
|
From: Tom E. <te...@us...> - 2005-02-01 08:25:03
|
User: telrod Date: 05/02/01 00:24:56 Modified: . build.xml Log: Changed to use unified invoker by default. Also updated testsuite to run default tests using unified invoker. Revision Changes Path 1.444 +16 -16 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.443 retrieving revision 1.444 diff -u -r1.443 -r1.444 --- build.xml 31 Jan 2005 07:39:24 -0000 1.443 +++ build.xml 1 Feb 2005 08:24:56 -0000 1.444 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.443 2005/01/31 07:39:24 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.444 2005/02/01 08:24:56 telrod Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -493,8 +493,8 @@ <patternset id="iiop.excludes"> <exclude name="org/jboss/test/*iiop/test/*"/> </patternset> - <!-- Tests needing unified invoker --> - <patternset id="unified-invoker.includes"> + <!-- Tests needing jrmp invoker --> + <patternset id="jrmp-invoker.includes"> <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/> <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/> @@ -512,7 +512,7 @@ <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/> <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/> </patternset> - <patternset id="unified-invoker.excludes"> + <patternset id="jrmp-invoker.excludes"> <exclude name="org/jboss/test/bank/test/*"/> </patternset> <!-- Tests needing xml binding setup --> @@ -574,7 +574,7 @@ <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> <antcall target="tests-jacc-security"/> - <antcall target="unified-invoker-tests"/> + <antcall target="jrmp-invoker-tests"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -891,30 +891,30 @@ <!-- - | Tests ejb calls using the unified invoker + | Tests ejb calls using the jrmp invoker --> - <target name="unified-invoker-tests" - description="EJB tests using the unified invoker"> - <!-- Create the unified invoker enabled config --> - <create-config baseconf="default" newconf="unified-invoker"> + <target name="jrmp-invoker-tests" + description="EJB tests using the jrmp invoker"> + <!-- Create the jrmp invoker enabled config --> + <create-config baseconf="default" newconf="jrmp-invoker"> <patternset> <include name="conf/**"/> <include name="deploy/**"/> <include name="lib/**"/> </patternset> </create-config> -<!-- <start-jboss-os conf="unified-invoker"/>--> - <start-jboss conf="unified-invoker"/> +<!-- <start-jboss-os conf="jrmp-invoker"/>--> + <start-jboss conf="jrmp-invoker"/> <wait-on-host/> - <antcall target="unified-invoker-unit-tests"> - <param name="jboss-junit-configuration" value="UnifiedInvoker"/> + <antcall target="jrmp-invoker-unit-tests"> + <param name="jboss-junit-configuration" value="JRMP-Invoker"/> </antcall> <stop-jboss/> </target> - <target name="unified-invoker-unit-tests"> + <target name="jrmp-invoker-unit-tests"> <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" @@ -945,7 +945,7 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <patternset refid="unified-invoker.includes"/> + <patternset refid="jrmp-invoker.includes"/> </fileset> </batchtest> </junit> |
|
From: Ben W. <bw...@us...> - 2005-02-01 22:57:27
|
User: bwang00 Date: 05/02/01 14:57:03 Modified: . build.xml Log: Used another name for config Revision Changes Path 1.445 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.444 retrieving revision 1.445 diff -u -r1.444 -r1.445 --- build.xml 1 Feb 2005 08:24:56 -0000 1.444 +++ build.xml 1 Feb 2005 22:55:16 -0000 1.445 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.444 2005/02/01 08:24:56 telrod Exp $ --> +<!-- $Id: build.xml,v 1.445 2005/02/01 22:55:16 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -679,7 +679,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="Mode=sync;UseJvm=true"/> + <param name="jboss-junit-configuration" value="SyncModeNUseJvm"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> |
|
From: Ben W. <bw...@us...> - 2005-02-01 23:02:11
|
User: bwang00 Date: 05/02/01 15:02:05 Modified: . Tag: Branch_4_0 build.xml Log: Use alternative config name Revision Changes Path No revision No revision 1.406.2.38 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.37 retrieving revision 1.406.2.38 diff -u -r1.406.2.37 -r1.406.2.38 --- build.xml 1 Feb 2005 23:00:26 -0000 1.406.2.37 +++ build.xml 1 Feb 2005 23:01:52 -0000 1.406.2.38 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.37 2005/02/01 23:00:26 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.406.2.38 2005/02/01 23:01:52 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -751,7 +751,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="ReplModeNUseJvm"/> + <param name="jboss-junit-configuration" value="SyncModeNUseJvm"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> |
|
From: Ben W. <bw...@us...> - 2005-02-01 23:01:09
|
User: bwang00 Date: 05/02/01 15:01:00 Modified: . Tag: Branch_4_0 build.xml Log: Use alternative config name Revision Changes Path No revision No revision 1.406.2.37 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.36 retrieving revision 1.406.2.37 diff -u -r1.406.2.36 -r1.406.2.37 --- build.xml 31 Jan 2005 07:40:38 -0000 1.406.2.36 +++ build.xml 1 Feb 2005 23:00:26 -0000 1.406.2.37 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.36 2005/01/31 07:40:38 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.406.2.37 2005/02/01 23:00:26 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -751,7 +751,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="Mode=repl;UseJvm=true"/> + <param name="jboss-junit-configuration" value="ReplModeNUseJvm"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> |
|
From: Dimitris A. <an...@us...> - 2005-02-03 21:47:24
|
User: andd Date: 05/02/03 13:47:18 Modified: . build.xml Log: DeploymentService testcases with their own server configuration Revision Changes Path 1.446 +84 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.445 retrieving revision 1.446 diff -u -r1.445 -r1.446 --- build.xml 1 Feb 2005 22:55:16 -0000 1.445 +++ build.xml 3 Feb 2005 21:47:17 -0000 1.446 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.445 2005/02/01 22:55:16 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.446 2005/02/03 21:47:17 andd Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -525,7 +525,14 @@ <patternset id="jaxr.includes"> <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> </patternset> - + <!-- Tests needing deployment service setup --> + <patternset id="deployment-service.includes"> + <include name="org/jboss/test/deployment/test/*TestCase.class"/> + </patternset> + <patternset id="deployment-service.excludes"> + <exclude name="org/jboss/test/deployment/test/*TestCase.class"/> + </patternset> + <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> <exclude name="org/jboss/test/aop/test/RemotingUnitTestCase"/> @@ -548,6 +555,7 @@ <patternset refid="tc-ssl.excludes"/> <patternset refid="iiop.excludes"/> <patternset refid="jbossxb.excludes"/> + <patternset refid="deployment-service.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -951,6 +959,80 @@ </junit> </target> + + <!-- + | Tests DeploymentService + --> + <target name="deployment-service-tests" + description="Tests targeting the deployment service"> + <!-- Create configuration --> + <create-config baseconf="default" newconf="deployment-service"> + <patternset> + <include name="conf/**"/> + <include name="deploy/jbossweb-tomcat55.sar/**"/> + <include name="deploy/jmx-console.war/**"/> + <include name="deploy/jbossjca-service.xml"/> + <include name="deploy/jboss-local-jdbc.rar"/> + <include name="deploy/jmx-invoker-service.xml"/> + <include name="lib/**"/> + </patternset> + </create-config> + <!-- overlay the deployment-service stuff --> + <copy todir="${jboss.dist}/server/deployment-service/conf"> + <fileset dir="${jboss.dist}/docs/examples/varia/deployment-service"> + <include name="templates/**"/> + </fileset> + </copy> + <copy todir="${jboss.dist}/server/deployment-service/deploy"> + <fileset dir="${jboss.dist}/docs/examples/varia/deployment-service"> + <include name="deployment-service.sar"/> + </fileset> + </copy> + <start-jboss-os conf="deployment-service"/> + <wait-on-host/> + <antcall target="deployment-service-unit-tests"> + <param name="jboss-junit-configuration" value="DeploymentService"/> + </antcall> + <stop-jboss/> + </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> + </target> + <!-- | Standard tests that should run successfully against a default JBoss | server distribution build. |
|
From: Tom E. <te...@us...> - 2005-02-04 05:14:55
|
User: telrod Date: 05/02/03 21:14:45 Modified: . build.xml Log: Removing invalid cts tests for the jrmp invoker (just commented out for now). Revision Changes Path 1.447 +9 -5 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.446 retrieving revision 1.447 diff -u -r1.446 -r1.447 --- build.xml 3 Feb 2005 21:47:17 -0000 1.446 +++ build.xml 4 Feb 2005 05:14:44 -0000 1.447 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.446 2005/02/03 21:47:17 andd Exp $ --> +<!-- $Id: build.xml,v 1.447 2005/02/04 05:14:44 telrod Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -496,15 +496,15 @@ <!-- Tests needing jrmp invoker --> <patternset id="jrmp-invoker.includes"> <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> +<!-- <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/>--> <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/> <include name="org/jboss/test/cts/test/CtsCmp2UnitTestCase.class"/> <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class"/> <include name="org/jboss/test/cts/test/LocalEjbTestCase.class"/> <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/MDBInvoker.class"/> - <include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/SessionInvoker.class"/> +<!-- <include name="org/jboss/test/cts/test/MDBInvoker.class"/>--> +<!-- <include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/>--> +<!-- <include name="org/jboss/test/cts/test/SessionInvoker.class"/>--> <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class"/> <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/> <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/> @@ -2317,6 +2317,10 @@ jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> +<!-- <jvmarg value="-Xdebug"/>--> +<!-- <jvmarg value="-Xnoagent"/>--> +<!-- <jvmarg value="-Djava.compiler=NONE"/>--> +<!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>--> <!-- Used for JGroups --> <jvmarg value="-Dbind.address=${node0}"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> |
|
From: Scott M S. <st...@us...> - 2005-02-08 01:29:40
|
User: starksm Date: 05/02/07 17:29:33 Modified: . Tag: Branch_4_0 build.xml Log: Update for the tomcat55 sar and run the jacc tests under a security manager Revision Changes Path No revision No revision 1.406.2.39 +7 -7 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.38 retrieving revision 1.406.2.39 diff -u -r1.406.2.38 -r1.406.2.39 --- build.xml 1 Feb 2005 23:01:52 -0000 1.406.2.38 +++ build.xml 8 Feb 2005 01:29:31 -0000 1.406.2.39 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.38 2005/02/01 23:01:52 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.406.2.39 2005/02/08 01:29:31 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -613,9 +613,9 @@ <patternset> <include name="conf/**"/> <include name="lib/**"/> - <include name="deploy/jbossweb-tomcat50.sar/**"/> + <include name="deploy/jbossweb-tomcat55.sar/**"/> <include name="deploy/jmx-invoker-service.xml"/> - <exclude name="deploy/jbossweb-tomcat50.sar/ROOT.war/**"/> + <exclude name="deploy/jbossweb-tomcat55.sar/ROOT.war/**"/> </patternset> </create-config> <property name="netboot.deploy" @@ -629,7 +629,7 @@ <include name="conf/**"/> <include name="lib/**"/> <include name="deploy/**"/> - <exclude name="deploy/jbossweb-tomcat50.sar/**"/> + <exclude name="deploy/jbossweb-tomcat55.sar/**"/> <exclude name="deploy/http-invoker.sar/**"/> <exclude name="deploy/jmx-console.war/**"/> <exclude name="deploy/jboss-aop.deployer/**"/> @@ -639,8 +639,8 @@ <exclude name="deploy/jms/jbossmq-httpil.sar/**"/> </fileset> </copy> - <jar basedir="${jboss.dist}/server/default/deploy/jbossweb-tomcat50.sar" - destfile="${netboot.deploy}/server/default/deploy/jbossweb-tomcat50.sar"/> + <jar basedir="${jboss.dist}/server/default/deploy/jbossweb-tomcat55.sar" + destfile="${netboot.deploy}/server/default/deploy/jbossweb-tomcat55.sar"/> <start-jboss conf="netboot"/> <wait-on-host port="18080"/> <!-- Start the netboot instance --> @@ -1380,7 +1380,7 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="jacc"/> + <start-securitymgr conf="jacc"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
|
From: Scott M S. <st...@us...> - 2005-02-15 05:10:04
|
User: starksm Date: 05/02/14 21:09:57 Modified: . Tag: Branch_4_0_1_SP1 build.xml Log: Move the environment variable import to ../tools/etc/buildmagic/build-common.xml and run the JACC tests with a security manager Revision Changes Path No revision No revision 1.406.2.32.2.1 +11 -9 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.32 retrieving revision 1.406.2.32.2.1 diff -u -r1.406.2.32 -r1.406.2.32.2.1 --- build.xml 23 Dec 2004 04:58:13 -0000 1.406.2.32 +++ build.xml 15 Feb 2005 05:09:56 -0000 1.406.2.32.2.1 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.32 2004/12/23 04:58:13 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.32.2.1 2005/02/15 05:09:56 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -23,7 +23,6 @@ <property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/> <property name="buildlog.level" value="info"/> - <property environment="env"/> <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME otherwise and initialize the node0/node1 cluster hostnames to localhost @@ -40,6 +39,12 @@ <os family="windows"/> </not> </condition> + + <!--We will use local.properties file to provide some configuration + to the testsuite mainly for the Clustering framework. Please + do not checkin your local.properties file into CVS--> + <property file="local.properties"/> + <!-- Cluster node0 defaults --> <property name="node0" value="localhost"/> <property name="node0.http.url" value="http://${node0}:8080"/> @@ -49,11 +54,6 @@ <property name="node1.http.url" value="http://${node1}:8080"/> <property name="node1.jndi.url" value="jnp://${node1}:1099"/> - <!--We will use local.properties file to provide some configuration to the testsuite - mainly for the Clustering framework. Please do not checkin your local.properties file - into CVS--> - <property file="local.properties"/> - <!-- =================== --> <!-- Basic Configuration --> <!-- =================== --> @@ -978,6 +978,8 @@ 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"/> @@ -1343,7 +1345,7 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="jacc"/> + <start-securitymgr conf="jacc"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -1402,7 +1404,7 @@ </batchtest> </junit> - <stop-jboss/> + <!--stop-jboss/--> </target> <target name="tests-standalone-aop-unit" depends="maybejars"> |
|
From: Scott M S. <st...@us...> - 2005-02-15 16:00:54
|
User: starksm Date: 05/02/15 08:00:48 Modified: . Tag: Branch_4_0_1_SP1 build.xml Log: Remove the comments around the tests-jacc-security stop call Revision Changes Path No revision No revision 1.406.2.32.2.2 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.32.2.1 retrieving revision 1.406.2.32.2.2 diff -u -r1.406.2.32.2.1 -r1.406.2.32.2.2 --- build.xml 15 Feb 2005 05:09:56 -0000 1.406.2.32.2.1 +++ build.xml 15 Feb 2005 16:00:44 -0000 1.406.2.32.2.2 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.32.2.1 2005/02/15 05:09:56 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.32.2.2 2005/02/15 16:00:44 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1404,7 +1404,7 @@ </batchtest> </junit> - <!--stop-jboss/--> + <stop-jboss/> </target> <target name="tests-standalone-aop-unit" depends="maybejars"> |
|
From: Scott M S. <st...@us...> - 2005-02-15 19:01:48
|
User: starksm Date: 05/02/15 11:01:40 Modified: . Tag: Branch_4_0_1_SP1 build.xml Log: Run the jacc tests with and without a security manager Revision Changes Path No revision No revision 1.406.2.32.2.3 +82 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.32.2.2 retrieving revision 1.406.2.32.2.3 diff -u -r1.406.2.32.2.2 -r1.406.2.32.2.3 --- build.xml 15 Feb 2005 16:00:44 -0000 1.406.2.32.2.2 +++ build.xml 15 Feb 2005 19:00:31 -0000 1.406.2.32.2.3 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.32.2.2 2005/02/15 16:00:44 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.32.2.3 2005/02/15 19:00:31 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -559,6 +559,7 @@ <antcall target="tomcat-sso-clustered-tests"/> <antcall target="test-example-binding-manager"/> <antcall target="tests-jacc-security"/> + <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -1345,6 +1346,86 @@ <include name="lib/**"/> </patternset> </create-config> + <start-jboss 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"/> + <!-- 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 type="xml"/> + + <batchtest todir="${build.reports}" + haltonerror="false" + haltonfailure="false" + fork="true"> + + <fileset dir="${build.classes}"> + <patternset refid="jacc.includes"/> + </fileset> + </batchtest> + </junit> + + <stop-jboss/> + </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/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}"/> |
|
From: Scott M S. <st...@us...> - 2005-02-17 02:33:16
|
User: starksm Date: 05/02/16 18:33:08 Modified: . Tag: Branch_4_0 build.xml Log: Run the jacc tests with and without a security manager Revision Changes Path No revision No revision 1.406.2.40 +82 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.39 retrieving revision 1.406.2.40 diff -u -r1.406.2.39 -r1.406.2.40 --- build.xml 8 Feb 2005 01:29:31 -0000 1.406.2.39 +++ build.xml 17 Feb 2005 02:33:04 -0000 1.406.2.40 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.39 2005/02/08 01:29:31 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.40 2005/02/17 02:33:04 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -559,6 +559,7 @@ <antcall target="tomcat-sso-clustered-tests"/> <antcall target="test-example-binding-manager"/> <antcall target="tests-jacc-security"/> + <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -1380,6 +1381,86 @@ <include name="lib/**"/> </patternset> </create-config> + <start-jboss 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"/> + <!-- 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 type="xml"/> + + <batchtest todir="${build.reports}" + haltonerror="false" + haltonfailure="false" + fork="true"> + + <fileset dir="${build.classes}"> + <patternset refid="jacc.includes"/> + </fileset> + </batchtest> + </junit> + + <stop-jboss/> + </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/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}"/> |
|
From: Dimitris A. <an...@us...> - 2005-02-24 15:22:34
|
User: andd Date: 05/02/24 07:22:28 Modified: . Tag: Branch_4_0 build.xml Log: porting deployment service updates from HEAD Revision Changes Path No revision No revision 1.406.2.41 +83 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.40 retrieving revision 1.406.2.41 diff -u -r1.406.2.40 -r1.406.2.41 --- build.xml 17 Feb 2005 02:33:04 -0000 1.406.2.40 +++ build.xml 24 Feb 2005 15:22:05 -0000 1.406.2.41 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.40 2005/02/17 02:33:04 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.41 2005/02/24 15:22:05 andd Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -508,7 +508,14 @@ <patternset id="jaxr.includes"> <include name="org/jboss/test/jaxr/**/*TestCase.class"/> </patternset> - + <!-- Tests needing deployment service setup --> + <patternset id="deployment-service.includes"> + <include name="org/jboss/test/deployment/test/*TestCase.class"/> + </patternset> + <patternset id="deployment-service.excludes"> + <exclude name="org/jboss/test/deployment/test/*TestCase.class"/> + </patternset> + <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> <exclude name="org/jboss/test/aop/test/RemotingUnitTestCase"/> @@ -532,6 +539,7 @@ <patternset refid="iiop.excludes"/> <patternset refid="jbossnet.excludes"/> <patternset refid="jbossxb.excludes"/> + <patternset refid="deployment-service.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -990,6 +998,79 @@ </target> <!-- + | Tests DeploymentService + --> + <target name="deployment-service-tests" + description="Tests targeting the deployment service"> + <!-- Create configuration --> + <create-config baseconf="default" newconf="deployment-service"> + <patternset> + <include name="conf/**"/> + <include name="deploy/jbossweb-tomcat55.sar/**"/> + <include name="deploy/jmx-console.war/**"/> + <include name="deploy/jbossjca-service.xml"/> + <include name="deploy/jboss-local-jdbc.rar"/> + <include name="deploy/jmx-invoker-service.xml"/> + <include name="lib/**"/> + </patternset> + </create-config> + <!-- overlay the deployment-service stuff --> + <copy todir="${jboss.dist}/server/deployment-service/conf"> + <fileset dir="${jboss.dist}/docs/examples/varia/deployment-service"> + <include name="templates/**"/> + </fileset> + </copy> + <copy todir="${jboss.dist}/server/deployment-service/deploy"> + <fileset dir="${jboss.dist}/docs/examples/varia/deployment-service"> + <include name="deployment-service.sar"/> + </fileset> + </copy> + <start-jboss-os conf="deployment-service"/> + <wait-on-host/> + <antcall target="deployment-service-unit-tests"> + <param name="jboss-junit-configuration" value="DeploymentService"/> + </antcall> + <stop-jboss/> + </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> + </target> + + <!-- | Standard tests that should run successfully against a default JBoss | server distribution build. --> |
|
From: Scott M S. <st...@us...> - 2005-02-25 02:38:31
|
User: starksm Date: 05/02/24 18:38:05 Modified: . Tag: Branch_4_0 build.xml Log: Add org.jboss.test.jca.test.SecurityContextUnitTestCase to the security.includes/security.excludes patternsets as this requires the proper security configuration. Revision Changes Path No revision No revision 1.406.2.42 +3 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.41 retrieving revision 1.406.2.42 diff -u -r1.406.2.41 -r1.406.2.42 --- build.xml 24 Feb 2005 15:22:05 -0000 1.406.2.41 +++ build.xml 25 Feb 2005 02:38:04 -0000 1.406.2.42 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.41 2005/02/24 15:22:05 andd Exp $ --> +<!-- $Id: build.xml,v 1.406.2.42 2005/02/25 02:38:04 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -436,6 +436,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"/> @@ -444,6 +445,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"/> |
|
From: Anil S. <osd...@us...> - 2005-03-12 03:56:16
|
User: osdchicago Date: 05/03/11 19:56:06 Modified: . Tag: Branch_4_0 build.xml Log: Added a new target "tests-scout-jaxr" that tests the new JAXR stack!!! Revision Changes Path No revision No revision 1.406.2.43 +68 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.42 retrieving revision 1.406.2.43 diff -u -r1.406.2.42 -r1.406.2.43 --- build.xml 25 Feb 2005 02:38:04 -0000 1.406.2.42 +++ build.xml 12 Mar 2005 03:55:52 -0000 1.406.2.43 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.42 2005/02/25 02:38:04 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.43 2005/03/12 03:55:52 osdchicago Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -508,7 +508,7 @@ <exclude name="org/jboss/test/xml/*TestCase.class"/> </patternset> <patternset id="jaxr.includes"> - <include name="org/jboss/test/jaxr/**/*TestCase.class"/> + <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> </patternset> <!-- Tests needing deployment service setup --> <patternset id="deployment-service.includes"> @@ -608,7 +608,7 @@ <antcall target="tests-jbossmx-implementation"/> <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> - <antcall target="tests-jaxr"/> + <antcall target="tests-scout-jaxr"/> <antcall target="tests-webservice"/> <antcall target="tests-txtimer"/> <stop-jboss/> @@ -2138,6 +2138,71 @@ </junit> </target> + <!-- Test for JAXR under the Web Services Umbrella --> + <target name="tests-scout-jaxr" depends="maybejars"> + <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}" + failureProperty="tests.failure"> + + <jvmarg value="-Djava.endorsed.dirs=${jboss.server.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"/> + <sysproperty key="javax.xml.registry.ConnectionFactoryClass" + value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/> + <sysproperty key="jaxr.query.url" + value="http://localhost:8080/juddi/inquiry"/> + <sysproperty key="jaxr.publish.url" + value="http://localhost:8080/juddi/publish"/> + <sysproperty key="juddi.proxy.transportClass" + value="org.jboss.jaxr.juddi.axis.JBossJuddiAxisTransport"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + + <classpath> + <pathelement location="${build.classes}"/> + + <path refid="apache.xerces.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="sun.jaf.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="juddi.juddi.classpath"/> + <path refid="apache.scout.classpath"/> + + <fileset dir="${jboss.dist}/client"> + <include name="jbossall-client.jar"/> + <include name="jboss-j2ee.jar"/> + <include name="axis-ws4ee.jar"/> + <include name="jboss-juddiaxis.jar"/> + </fileset> + </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="jaxr.includes"/> + </fileset> + </batchtest> + </junit> + </target> + + <!-- | Standard jaxr tests that should run successfully against a | JBoss server distribution build that contains jaxr. |
|
From: Scott M S. <st...@us...> - 2005-03-13 23:10:09
|
User: starksm Date: 05/03/13 15:09:59 Modified: . Tag: Branch_4_0 build.xml Log: Use the XMLJUnitMultipleResultFormatter to seperate the JACC tests rerun with a security manager. Revision Changes Path No revision No revision 1.406.2.44 +5 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.43 retrieving revision 1.406.2.44 diff -u -r1.406.2.43 -r1.406.2.44 --- build.xml 12 Mar 2005 03:55:52 -0000 1.406.2.43 +++ build.xml 13 Mar 2005 23:09:34 -0000 1.406.2.44 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.43 2005/03/12 03:55:52 osdchicago Exp $ --> +<!-- $Id: build.xml,v 1.406.2.44 2005/03/13 23:09:34 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1575,6 +1575,7 @@ <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."/> @@ -1590,7 +1591,9 @@ <path refid="tests.classpath"/> </classpath> - <formatter type="xml"/> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + usefile="${junit.formatter.usefile}" + extension="-${jboss-junit-configuration}.xml" /> <batchtest todir="${build.reports}" haltonerror="false" |
|
From: Scott M S. <st...@us...> - 2005-03-16 04:45:14
|
User: starksm Date: 05/03/15 20:45:06 Modified: . Tag: Branch_4_0 build.xml Log: Add jbosstest.src.etc and jbosstest.dist properties Revision Changes Path No revision No revision 1.406.2.45 +3 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.44 retrieving revision 1.406.2.45 diff -u -r1.406.2.44 -r1.406.2.45 --- build.xml 13 Mar 2005 23:09:34 -0000 1.406.2.44 +++ build.xml 16 Mar 2005 04:45:02 -0000 1.406.2.45 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.44 2005/03/13 23:09:34 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.45 2005/03/16 04:45:02 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -222,6 +222,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="jbosstest.dist" value="${jboss.dist}"/> <property name="junit.batchtest.todir" value="${build.reports}"/> <property name="junit.jvm.options" value="-Ddummy"/> <!-- Override JUnit Marathon defaults --> |
|
From: Ovidiu F. <ov...@us...> - 2005-03-19 08:18:38
|
User: ovidiuf Date: 05/03/19 00:18:31 Modified: . Tag: Branch_4_0 build.xml Log: http://jira.jboss.com/jira/browse/JBAS-1378 Changed clustering defaults and testsuite build configuration to run tests not only with a JGroups UDP stack, but also with a TCP stack. Revision Changes Path No revision No revision 1.406.2.46 +18 -6 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.45 retrieving revision 1.406.2.46 diff -u -r1.406.2.45 -r1.406.2.46 --- build.xml 16 Mar 2005 04:45:02 -0000 1.406.2.45 +++ build.xml 19 Mar 2005 08:18:29 -0000 1.406.2.46 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.45 2005/03/16 04:45:02 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.46 2005/03/19 08:18:29 ovidiuf Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -565,7 +565,7 @@ <antcall target="jboss-minimal-tests"/> <antcall target="jboss-all-config-tests"/> <antcall target="tests-security-manager"/> - <antcall target="tests-clustering"/> + <antcall target="tests-clustering-all-stacks"/> <antcall target="tomcat-ssl-tests"/> <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> @@ -741,6 +741,18 @@ <antcall target="tests-ha-unit"></antcall> </target> + <!-- Run all clustering tests with two JGroups stacks (UDP and TCP)--> + <target name="tests-clustering-all-stacks" + description="Execute clustering tests requiring two nodes."> + <!-- Test the default UDP stack --> + <antcall target="tests-clustering"/> + <!-- Test a TCP stack --> + <antcall target="tests-clustering"> + <param name="jgroups-stack" value="TCP"/> + </antcall> + </target> + + <!-- Depending on the value of the ${jgroups-stack} variable, uses different JGroups stacks --> <target name="tests-clustering" description="Execute clustering tests requiring two nodes."> <antcall target="tests-clustering-startup" /> @@ -770,15 +782,15 @@ </target> <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}"> - <create-cluster-node conf="node0"/> + <create-cluster-node conf="node0" host="${node0}"/> <start-jboss conf="node0" host="${node0}"/> - <create-cluster-node conf="node1"/> + <create-cluster-node conf="node1" host="${node1}"/> <start-jboss conf="node1" host="${node1}"/> </target> <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}"> - <create-cluster-node conf="node0"/> - <create-cluster-node conf="node1"/> + <create-cluster-node conf="node0" host="${node0}"/> + <create-cluster-node conf="node1" host="${node1}"/> <echo message="Modifying the node0 and node1 Tomcat configuration"/> <http-cluster-node-config-change conf="node0"/> |
|
From: Scott M S. <st...@us...> - 2005-03-25 16:17:40
|
User: starksm Date: 05/03/25 08:17:29 Modified: . Tag: Branch_4_0 build.xml Log: Include all deploy/jms content recursively in the jacc test configuration Revision Changes Path No revision No revision 1.406.2.47 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.46 retrieving revision 1.406.2.47 diff -u -r1.406.2.46 -r1.406.2.47 --- build.xml 19 Mar 2005 08:18:29 -0000 1.406.2.46 +++ build.xml 25 Mar 2005 16:17:23 -0000 1.406.2.47 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.46 2005/03/19 08:18:29 ovidiuf Exp $ --> +<!-- $Id: build.xml,v 1.406.2.47 2005/03/25 16:17:23 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1474,7 +1474,7 @@ <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> |
|
From: Ovidiu F. <ov...@us...> - 2005-03-28 03:47:16
|
User: ovidiuf Date: 05/03/27 19:47:07 Modified: . Tag: Branch_4_0 build.xml Log: tests-clustering-all-stacks generates different test report sets for each stack configuration Revision Changes Path No revision No revision 1.406.2.48 +7 -4 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.47 retrieving revision 1.406.2.48 diff -u -r1.406.2.47 -r1.406.2.48 --- build.xml 25 Mar 2005 16:17:23 -0000 1.406.2.47 +++ build.xml 28 Mar 2005 03:47:05 -0000 1.406.2.48 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.47 2005/03/25 16:17:23 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.48 2005/03/28 03:47:05 ovidiuf Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -745,10 +745,13 @@ <target name="tests-clustering-all-stacks" description="Execute clustering tests requiring two nodes."> <!-- Test the default UDP stack --> - <antcall target="tests-clustering"/> + <antcall target="tests-clustering"> + <param name="jboss-junit-configuration" value="UDP"/> + </antcall> <!-- Test a TCP stack --> <antcall target="tests-clustering"> <param name="jgroups-stack" value="TCP"/> + <param name="jboss-junit-configuration" value="TCP"/> </antcall> </target> @@ -763,7 +766,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="Default"/> + <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/> </antcall> <antcall target="tests-clustering-shutdown" /> @@ -776,7 +779,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> - <param name="jboss-junit-configuration" value="SyncModeNUseJvm"/> + <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> |
|
From: Ryan C. <rec...@us...> - 2005-03-30 00:07:45
|
User: recampbell Date: 05/03/29 16:07:34 Modified: . Tag: Branch_4_0 build.xml Log: Added wait-on-shutdown calls to prevent the next configuration from starting before the previous one has completely shutdown and released all ports. Revision Changes Path No revision No revision 1.406.2.49 +11 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.48 retrieving revision 1.406.2.49 diff -u -r1.406.2.48 -r1.406.2.49 --- build.xml 28 Mar 2005 03:47:05 -0000 1.406.2.48 +++ build.xml 30 Mar 2005 00:07:29 -0000 1.406.2.49 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.48 2005/03/28 03:47:05 ovidiuf Exp $ --> +<!-- $Id: build.xml,v 1.406.2.49 2005/03/30 00:07:29 recampbell Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -806,6 +806,8 @@ <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}"> <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> + <wait-on-shutdown conf="node0"/> + <wait-on-shutdown conf="node1"/> </target> <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}"> <echo message="Waiting for nodes to start..."/> @@ -873,6 +875,7 @@ </batchtest> </junit> <stop-jboss/> + <wait-on-shutdown conf="tomcat-ssl"/> </target> <!-- Tests of tomcat requiring SSO configured @@ -928,6 +931,7 @@ </batchtest> </junit> <stop-jboss/> + <wait-on-shutdown conf="tomcat-sso"/> </target> <target name="tomcat-sso-clustered-tests" @@ -987,6 +991,8 @@ <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" @@ -1050,6 +1056,7 @@ <param name="jboss-junit-configuration" value="DeploymentService"/> </antcall> <stop-jboss/> + <wait-on-shutdown conf="deployment-service"/> </target> <target name="deployment-service-unit-tests"> @@ -1460,6 +1467,7 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="default"/> </target> <!-- Tests of the JACC security implementation --> @@ -1541,6 +1549,7 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="jacc"/> </target> <target name="tests-jacc-securitymgr" @@ -1624,6 +1633,7 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="jacc"/> </target> <target name="tests-standalone-aop-unit" depends="maybejars"> |
|
From: Clebert R. S. <cl...@us...> - 2005-03-30 22:34:17
|
User: clebert Date: 05/03/30 14:34:09 Modified: . Tag: Branch_4_0 build.xml Log: Adding tests-compatibility for checks into SerialUID Revision Changes Path No revision No revision 1.406.2.50 +36 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.49 retrieving revision 1.406.2.50 diff -u -r1.406.2.49 -r1.406.2.50 --- build.xml 30 Mar 2005 00:07:29 -0000 1.406.2.49 +++ build.xml 30 Mar 2005 22:33:45 -0000 1.406.2.50 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.49 2005/03/30 00:07:29 recampbell Exp $ --> +<!-- $Id: build.xml,v 1.406.2.50 2005/03/30 22:33:45 clebert Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -573,6 +573,7 @@ <antcall target="tests-jacc-security"/> <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-report"/> + <antcall target="tests-compatibility"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -1644,6 +1645,40 @@ <antcall target="tests-baseaop-unit" inheritRefs="true"/> </target> + <target name="tests-compatibility" + description="Checks compatibility on SerialUUID" depends="compile-classes-only"> + <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="jboss.dist" file="${jboss.dist}"/> + + <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="org/jboss/test/compatibility/test/*JarTest.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="tests-treecacheaop-unit" depends="init"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
|
From: Clebert R. S. <cl...@us...> - 2005-03-31 20:28:26
|
User: clebert Date: 05/03/31 12:28:17 Modified: . Tag: Branch_4_0 build.xml Log: placing tests-compatibility in the right place Revision Changes Path No revision No revision 1.406.2.51 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.50 retrieving revision 1.406.2.51 diff -u -r1.406.2.50 -r1.406.2.51 --- build.xml 30 Mar 2005 22:33:45 -0000 1.406.2.50 +++ build.xml 31 Mar 2005 20:27:44 -0000 1.406.2.51 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.50 2005/03/30 22:33:45 clebert Exp $ --> +<!-- $Id: build.xml,v 1.406.2.51 2005/03/31 20:27:44 clebert Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -572,8 +572,8 @@ <antcall target="test-example-binding-manager"/> <antcall target="tests-jacc-security"/> <antcall target="tests-jacc-securitymgr"/> - <antcall target="tests-report"/> <antcall target="tests-compatibility"/> + <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> |
|
From: Clebert R. S. <cl...@us...> - 2005-03-31 20:38:56
|
User: clebert Date: 05/03/31 12:38:48 Modified: . Tag: Branch_4_0 build.xml Log: Fixing log properties Revision Changes Path No revision No revision 1.406.2.52 +14 -4 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.51 retrieving revision 1.406.2.52 diff -u -r1.406.2.51 -r1.406.2.52 --- build.xml 31 Mar 2005 20:27:44 -0000 1.406.2.51 +++ build.xml 31 Mar 2005 20:38:38 -0000 1.406.2.52 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.51 2005/03/31 20:27:44 clebert Exp $ --> +<!-- $Id: build.xml,v 1.406.2.52 2005/03/31 20:38:38 clebert Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1645,8 +1645,8 @@ <antcall target="tests-baseaop-unit" inheritRefs="true"/> </target> - <target name="tests-compatibility" - description="Checks compatibility on SerialUUID" depends="compile-classes-only"> + <target name="tests-compatibility" + description="Checks compatibility on SerialUUID" depends="init"> <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" @@ -1658,6 +1658,16 @@ <jvmarg value="${junit.jvm.options}"/> <sysproperty key="jboss.dist" file="${jboss.dist}"/> + <jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/> + <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> + <classpath> <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> @@ -1677,7 +1687,7 @@ </batchtest> </junit> </target> - + <target name="tests-treecacheaop-unit" depends="init"> <mkdir dir="${build.reports}"/> |
Thanks for helping keep SourceForge clean.
X