From: Adrian B. <adr...@jb...> - 2005-07-06 17:41:52
|
User: adrian Date: 05/07/06 13:40:52 Modified: jbosstest Tag: Branch_4_0 .classpath Log: Correct the build to use thirdparty/jboss/aop/lib rather than the binary-aop stuff. jboss-aop is also a library not a module so move the definition to libraries.[ent|xml] Revision Changes Path No revision No revision 1.24.2.10 +1 -1 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.24.2.9 retrieving revision 1.24.2.10 diff -u -b -r1.24.2.9 -r1.24.2.10 --- .classpath 4 Jul 2005 17:08:09 -0000 1.24.2.9 +++ .classpath 6 Jul 2005 17:40:52 -0000 1.24.2.10 @@ -39,7 +39,7 @@ <classpathentry kind="src" path="/hibernate"/> <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-aop.jar"/> <classpathentry kind="src" path="/deployment"/> <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/> <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/> |
From: Adrian B. <adr...@jb...> - 2005-07-07 06:54:00
|
User: adrian Date: 05/07/07 02:53:10 Modified: jbosstest Tag: Branch_4_0 .classpath Log: Fix the eclipse build to use remoting from thirdparty. Revision Changes Path No revision No revision 1.24.2.13 +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.24.2.12 retrieving revision 1.24.2.13 diff -u -b -r1.24.2.12 -r1.24.2.13 --- .classpath 7 Jul 2005 05:20:49 -0000 1.24.2.12 +++ .classpath 7 Jul 2005 06:53:10 -0000 1.24.2.13 @@ -46,5 +46,6 @@ <classpathentry kind="lib" path="/naming/output/lib/jnp-client.jar"/> <classpathentry kind="lib" path="/server/output/lib/jboss-client.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/test"/> + <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Adrian B. <adr...@jb...> - 2005-07-07 16:36:44
|
User: adrian Date: 05/07/07 12:35:54 Modified: jbosstest Tag: Branch_4_0 .classpath Log: Update the eclipse build to use hibernate-int Revision Changes Path No revision No revision 1.24.2.14 +1 -1 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.24.2.13 retrieving revision 1.24.2.14 diff -u -b -r1.24.2.13 -r1.24.2.14 --- .classpath 7 Jul 2005 06:53:10 -0000 1.24.2.13 +++ .classpath 7 Jul 2005 16:35:54 -0000 1.24.2.14 @@ -35,7 +35,6 @@ <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="src" path="/jaxrpc"/> <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/> @@ -47,5 +46,6 @@ <classpathentry kind="lib" path="/server/output/lib/jboss-client.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/hibernate-int"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Haroon B. <hb...@jb...> - 2005-07-07 23:38:51
|
User: hbarlas Date: 05/07/07 19:37:41 Modified: jbosstest Tag: Branch_4_0 build.xml Log: JBAS-1864 - reverted changes Revision Changes Path No revision No revision 1.406.2.83 +2 -14 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.82 retrieving revision 1.406.2.83 diff -u -b -r1.406.2.82 -r1.406.2.83 --- build.xml 7 Jul 2005 05:20:49 -0000 1.406.2.82 +++ build.xml 7 Jul 2005 23:37:40 -0000 1.406.2.83 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.82 2005/07/07 05:20:49 telrod Exp $ --> +<!-- $Id: build.xml,v 1.406.2.83 2005/07/07 23:37:40 hbarlas Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -322,19 +322,7 @@ <mkdir dir="${build.resources}"/> <copy todir="${build.resources}" filtering="no"> <fileset dir="${source.resources}"> - <include name="**/*.xml"/> - <include name="**/*.properties"/> - <include name="**/*.wsdl"/> - </fileset> - <filterset> - <filter token="NODE_0" value="${node0}"/> - </filterset> - </copy> - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${source.resources}"> - <exclude name="**/*.xml"/> - <exclude name="**/*.properties"/> - <exclude name="**/*.wsdl"/> + <include name="**/*"/> </fileset> </copy> </target> |
From: Thomas D. <tho...@jb...> - 2005-07-08 13:07:05
|
User: tdiesler Date: 05/07/08 09:06:14 Modified: jbosstest Tag: Branch_4_0 build.xml Log: include jboss-ws4ee.sar in jacc configuration Revision Changes Path No revision No revision 1.406.2.84 +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.83 retrieving revision 1.406.2.84 diff -u -b -r1.406.2.83 -r1.406.2.84 --- build.xml 7 Jul 2005 23:37:40 -0000 1.406.2.83 +++ build.xml 8 Jul 2005 13:06:14 -0000 1.406.2.84 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.83 2005/07/07 23:37:40 hbarlas Exp $ --> +<!-- $Id: build.xml,v 1.406.2.84 2005/07/08 13:06:14 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1351,6 +1351,7 @@ <include name="conf/**"/> <include name="deploy/hsqldb-ds.xml"/> <include name="deploy/jbossweb*.sar/**"/> + <include name="deploy/jboss-ws4ee.sar/**"/> <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> @@ -1394,6 +1395,7 @@ <include name="conf/**"/> <include name="deploy/hsqldb-ds.xml"/> <include name="deploy/jbossweb*.sar/**"/> + <include name="deploy/jboss-ws4ee.sar/**"/> <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> |
From: Thomas D. <tho...@jb...> - 2005-07-08 15:24:02
|
User: tdiesler Date: 05/07/08 11:23:07 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Include client deployer in jacc configuration Revision Changes Path No revision No revision 1.406.2.85 +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.84 retrieving revision 1.406.2.85 diff -u -b -r1.406.2.84 -r1.406.2.85 --- build.xml 8 Jul 2005 13:06:14 -0000 1.406.2.84 +++ build.xml 8 Jul 2005 15:23:07 -0000 1.406.2.85 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.84 2005/07/08 13:06:14 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.85 2005/07/08 15:23:07 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1352,6 +1352,7 @@ <include name="deploy/hsqldb-ds.xml"/> <include name="deploy/jbossweb*.sar/**"/> <include name="deploy/jboss-ws4ee.sar/**"/> + <include name="deploy/client-deployer-service.xml"/> <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> @@ -1396,6 +1397,7 @@ <include name="deploy/hsqldb-ds.xml"/> <include name="deploy/jbossweb*.sar/**"/> <include name="deploy/jboss-ws4ee.sar/**"/> + <include name="deploy/client-deployer-service.xml"/> <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> |
From: Thomas D. <tho...@jb...> - 2005-07-09 09:57:52
|
User: tdiesler Date: 05/07/09 05:56:57 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Integrate JBWS309TestCase with the jacc tests Revision Changes Path No revision No revision 1.406.2.86 +2 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.85 retrieving revision 1.406.2.86 diff -u -b -r1.406.2.85 -r1.406.2.86 --- build.xml 8 Jul 2005 15:23:07 -0000 1.406.2.85 +++ build.xml 9 Jul 2005 09:56:57 -0000 1.406.2.86 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.85 2005/07/08 15:23:07 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.86 2005/07/09 09:56:57 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -476,6 +476,7 @@ <!-- A patternset that requires jboss to run with a JACC security manager --> <patternset id="jacc.includes"> <include name="**/test/jacc/test/*TestCase.class"/> + <include name="**/test/webservice/jbws309/*TestCase.class"/> </patternset> <patternset id="jacc.excludes"> <exclude name="**/test/jacc/test/*"/> |
From: Ruel L. <rue...@jb...> - 2005-07-12 14:13:32
|
User: rloehr Date: 05/07/12 10:12:36 Modified: jbosstest Tag: Branch_4_0 build.xml Log: changed import of libraries & modules xml files to libraries and modules ent files. Revision Changes Path No revision No revision 1.406.2.87 +14 -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.406.2.86 retrieving revision 1.406.2.87 diff -u -b -r1.406.2.86 -r1.406.2.87 --- build.xml 9 Jul 2005 09:56:57 -0000 1.406.2.86 +++ build.xml 12 Jul 2005 14:12:35 -0000 1.406.2.87 @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> +]> + <!-- ============================================================ --> <!-- JBoss, the OpenSource J2EE webOS --> @@ -6,12 +11,11 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.86 2005/07/09 09:56:57 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.87 2005/07/12 14:12:35 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> - <import file="../tools/etc/buildmagic/libraries.xml"/> - <import file="../tools/etc/buildmagic/modules.xml"/> + <!-- ======================================================== --> <!-- Initialization --> @@ -68,6 +72,9 @@ <!-- ========= --> <!-- Libraries --> <!-- ========= --> + + &libraries; + <!-- The combined library classpath --> <path id="library.classpath"> <path refid="apache.avalon.classpath"/> @@ -108,6 +115,9 @@ <!-- ======= --> <!-- Modules --> <!-- ======= --> + + &modules; + <!-- InternalServer --> <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate tests that need internal jboss classes from those that don't. When I put it in, only @@ -241,7 +251,7 @@ <!-- xdoclet --> <path id="xdoclet.task.classpath"> <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <fileset dir="${xdoclet.xdoclet.lib}"> <include name="**/*.jar"/> </fileset> </path> |
From: Thomas D. <tho...@jb...> - 2005-07-14 18:52:36
|
User: tdiesler Date: 05/07/14 14:51:18 Modified: jbosstest .classpath Log: Update classpath Revision Changes Path 1.37 +47 -188 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.36 retrieving revision 1.37 diff -u -b -r1.36 -r1.37 --- .classpath 27 May 2005 19:54:04 -0000 1.36 +++ .classpath 14 Jul 2005 18:51:18 -0000 1.37 @@ -1,192 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="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="/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="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"> - <attributes> - </attributes> - </classpathentry> + <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="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="/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 combineaccessrules="false" kind="src" path="/deployment"/> + <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Thomas D. <tho...@jb...> - 2005-07-15 11:04:01
|
User: tdiesler Date: 05/07/15 07:03:01 Modified: jbosstest local.properties Log: Add instructions on how to use the eclipse compiler for hot code swapping Revision Changes Path 1.10 +18 -0 jbosstest/local.properties (In the diff below, changes in quantity of whitespace are not shown.) Index: local.properties =================================================================== RCS file: /cvsroot/jboss/jbosstest/local.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- local.properties 21 Jun 2005 14:30:53 -0000 1.9 +++ local.properties 15 Jul 2005 11:03:01 -0000 1.10 @@ -1,6 +1,24 @@ #IMPORTANT:- Please do not check this file into CVS with your local changes #This file is used to pass config info to targets like apache_tomcat-clustering tests #Please uncomment or add your properties to this file. + +# $Id: local.properties,v 1.10 2005/07/15 11:03:01 tdiesler Exp $ + +### General compiler configuration ### + +# Use the jikes compiler +#build.compiler=jikes + +# Use the eclipse compiler to allow for hot code swapping +# http://www.jboss.org/index.html?module=bb&op=viewtopic&t=65783 +# +# Make sure you have these jars in tools/lib +# +# org.eclipse.jdt.core_3.1.0.jar +# jdtCompilerAdapter.jar (is contained in org.eclipse.jdt.core_3.1.0.jar) +# +#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter + javac.optimize=false javac.debug=true javac.depend=false |
From: Ryan C. <rca...@jb...> - 2005-07-18 15:42:25
|
User: rcampbell Date: 05/07/18 11:41:24 Modified: jbosstest build.xml Log: JBAS-1864 use node0 instead of localhost Revision Changes Path 1.474 +14 -13 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.473 retrieving revision 1.474 diff -u -b -r1.473 -r1.474 --- build.xml 4 Jul 2005 00:44:05 -0000 1.473 +++ build.xml 18 Jul 2005 15:41:23 -0000 1.474 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.473 2005/07/04 00:44:05 telrod Exp $ --> +<!-- $Id: build.xml,v 1.474 2005/07/18 15:41:23 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -405,7 +405,7 @@ <macrodef name="wait-on-host"> <attribute name="seconds" default="60"/> - <attribute name="host" default="localhost"/> + <attribute name="host" default="${node0}"/> <sequential> <echo message="Waiting for @{host} to start..."/> <waitfor maxwait="@{seconds}" maxwaitunit="second" @@ -634,14 +634,14 @@ <target name="jboss-minimal-tests" description="Validate the minimal config"> - <start-jboss conf="minimal" host="localhost" /> + <start-jboss conf="minimal" host="${node0}" /> <copy file="${build.lib}/shutdown.sar" todir="${jboss.dist}/server/minimal/deploy" /> <!-- Wait for the 1099 jndi port --> <waitfor maxwait="30" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="minimal.timeout"> <and> - <socket server="localhost" port="1099" /> + <socket server="${node0}" port="1099" /> </and> </waitfor> <fail message="Timeout waiting for minimal to start" if="minimal.timeout"/> @@ -1450,7 +1450,7 @@ <mkdir dir="${build.testlog}"/> <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://localhost:8080/"/> + <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> @@ -1530,7 +1530,7 @@ <mkdir dir="${build.testlog}"/> <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://localhost:8080/"/> + <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> @@ -1573,7 +1573,7 @@ <mkdir dir="${build.testlog}"/> <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://localhost:8080/"/> + <http url="http://${node0}:8080/"/> </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> @@ -1593,6 +1593,7 @@ <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/client.policy"/> <jvmarg value="-Djava.security.debug=access,failure"/> --> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <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"/> @@ -2021,7 +2022,7 @@ <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="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/> <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" @@ -2239,9 +2240,9 @@ <sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/> <sysproperty key="jaxr.query.url" - value="http://localhost:8080/juddi/inquiry"/> + value="http://${node0}:8080/juddi/inquiry"/> <sysproperty key="jaxr.publish.url" - value="http://localhost:8080/juddi/publish"/> + value="http://${node0}:8080/juddi/publish"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -2304,9 +2305,9 @@ <sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="com.sun.xml.registry.ebxml.ConnectionFactoryImpl"/> <sysproperty key="jaxr.queryurl" - value="http://localhost:8080/ebxmlrr/registry/soap"/> + value="http://${node0}:8080/ebxmlrr/registry/soap"/> <sysproperty key="jaxr.publishurl" - value="http://localhost:8080/ebxmlrr/registry/soap"/> + value="http://${node0}:8080/ebxmlrr/registry/soap"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -2489,7 +2490,7 @@ <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="-DORBInitRef.NameService=corbaloc::${node0}: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: Ruel L. <rue...@jb...> - 2005-07-18 19:10:53
|
User: rloehr Date: 05/07/18 15:09:55 Modified: jbosstest Tag: Repo_Branch_4_0 build.xml Log: migration to jboss 4.0 thirdparty build Revision Changes Path No revision No revision 1.406.2.87.2.1 +2 -2 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.87 retrieving revision 1.406.2.87.2.1 diff -u -b -r1.406.2.87 -r1.406.2.87.2.1 --- build.xml 12 Jul 2005 14:12:35 -0000 1.406.2.87 +++ build.xml 18 Jul 2005 19:09:54 -0000 1.406.2.87.2.1 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> @@ -11,7 +11,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.87 2005/07/12 14:12:35 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.406.2.87.2.1 2005/07/18 19:09:54 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> |
From: Scott S. <sco...@jb...> - 2005-07-18 20:34:07
|
User: starksm Date: 05/07/18 16:33:05 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Include some cmp2 tests in the jacc.includes and annotate the jacc tests with a JACC junit.configuration attribute so that rerun tests show up with unique report output. Revision Changes Path No revision No revision 1.406.2.88 +9 -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.87 retrieving revision 1.406.2.88 diff -u -b -r1.406.2.87 -r1.406.2.88 --- build.xml 12 Jul 2005 14:12:35 -0000 1.406.2.87 +++ build.xml 18 Jul 2005 20:33:04 -0000 1.406.2.88 @@ -11,7 +11,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.87 2005/07/12 14:12:35 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.406.2.88 2005/07/18 20:33:04 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -486,6 +486,13 @@ <!-- A patternset that requires jboss to run with a JACC security manager --> <patternset id="jacc.includes"> <include name="**/test/jacc/test/*TestCase.class"/> + <include name="org/jboss/test/cmp2/audit/test/*TestCase.class" /> + <include name="org/jboss/test/cmp2/commerce/*TestCase.class" /> + <include name="org/jboss/test/cmp2/cmrstress/*TestCase.class" /> + <include name="org/jboss/test/cmp2/cmrtransaction/test/*TestCase.class" /> + <include name="org/jboss/test/cmp2/perf/test/*TestCase.class" /> + <include name="org/jboss/test/cmp2/relationship/*TestCase.class" /> + <include name="org/jboss/test/cmp2/simple/*TestCase.class" /> <include name="**/test/webservice/jbws309/*TestCase.class"/> </patternset> <patternset id="jacc.excludes"> @@ -1393,6 +1400,7 @@ </propertyset> <run-junit junit.patternset="jacc.includes" + junit.configuration="JACC" junit.syspropertyset="jacc-tests-props" /> <stop-jboss/> |
From: Ryan C. <rca...@jb...> - 2005-07-19 02:14:13
|
User: rcampbell Date: 05/07/18 22:13:12 Modified: jbosstest local.properties Log: defaults should work outside of the QA lab Revision Changes Path 1.11 +3 -3 jbosstest/local.properties (In the diff below, changes in quantity of whitespace are not shown.) Index: local.properties =================================================================== RCS file: /cvsroot/jboss/jbosstest/local.properties,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- local.properties 15 Jul 2005 11:03:01 -0000 1.10 +++ local.properties 19 Jul 2005 02:13:12 -0000 1.11 @@ -2,7 +2,7 @@ #This file is used to pass config info to targets like apache_tomcat-clustering tests #Please uncomment or add your properties to this file. -# $Id: local.properties,v 1.10 2005/07/15 11:03:01 tdiesler Exp $ +# $Id: local.properties,v 1.11 2005/07/19 02:13:12 rcampbell Exp $ ### General compiler configuration ### @@ -49,11 +49,11 @@ # (even at the same machine). Actually what we needed are just node0 and node1 # ips and the rest are optional. # -node0=${env.MYTESTIP_1} +#node0=192.168.1.103 #node0.http.url=http://192.168.1.103:8080 #node0.jndiurl=jnp://192.168.1.103:1099 -node1=${env.MYTESTIP_2} +#node1=http://192.168.1.113 #node1.http.url=http://192.168.1.113:8080 #node1.jndiurl=jnp://192.168.1.113:1099 |
From: Ryan C. <rca...@jb...> - 2005-07-19 03:43:06
|
User: rcampbell Date: 05/07/18 23:42:01 Modified: jbosstest build.xml Log: intial deployment of new server control tasks Revision Changes Path 1.475 +4 -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.474 retrieving revision 1.475 diff -u -b -r1.474 -r1.475 --- build.xml 18 Jul 2005 15:41:23 -0000 1.474 +++ build.xml 19 Jul 2005 03:42:01 -0000 1.475 @@ -6,9 +6,10 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.474 2005/07/18 15:41:23 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.475 2005/07/19 03:42:01 rcampbell Exp $ --> -<project default="main" name="JBoss/Testsuite"> +<project default="main" name="JBoss/Testsuite" + xmlns:server="http://jboss.org/ns/test/ant/server"> <import file="../tools/etc/buildmagic/build-common.xml"/> <import file="../tools/etc/buildmagic/libraries.xml"/> <import file="../tools/etc/buildmagic/modules.xml"/> @@ -1500,8 +1501,7 @@ </batchtest> </junit> - <stop-jboss/> - <wait-on-shutdown conf="default"/> + <server:stop name="securitymgr"/> </target> <!-- Tests of the JACC security implementation --> |
From: Ryan C. <rca...@jb...> - 2005-07-19 14:18:05
|
User: rcampbell Date: 05/07/19 10:17:05 Modified: jbosstest build.xml Log: put the server manager taskdefs in a target so they aren't evaluated until classes are compiled Revision Changes Path 1.476 +19 -11 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.475 retrieving revision 1.476 diff -u -b -r1.475 -r1.476 --- build.xml 19 Jul 2005 03:42:01 -0000 1.475 +++ build.xml 19 Jul 2005 14:17:04 -0000 1.476 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.475 2005/07/19 03:42:01 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.476 2005/07/19 14:17:04 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1444,17 +1444,25 @@ <!-- Tests of Java2 permissions. The JBoss server must be running with a security manager for this test --> - <target name="tests-security-manager" + <target name="tests-security-manager" depends="serverTaskdefs" description="Tests run against a jboss server with a security manager"> - <start-securitymgr/> - <mkdir dir="${build.reports}"/> - <mkdir dir="${build.testlog}"/> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> + <echo message="Starting default with policy ${build.resources}/securitymgr/server.policy" /> + <echo message="jboss.home.dir=${jboss.dist}" /> + <echo message="jboss.server.home.dir=${jboss.dist}/server/default" /> + + <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}"> + <server name="securitymgr" config="default" host="${node0}"> + <jvmarg value="${jpda.cmdline}" /> + <jvmarg value="-Xmx64m" /> + <jvmarg value="-Djboss.home.dir=${jboss.dist}" /> + <jvmarg value="-Djboss.server.home.dir=${jboss.dist}/server/default" /> + <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/> + <jvmarg value="-Djava.security.debug=failure"/> + </server> + </server:config> + <server:start name="securitymgr"/> <junit dir="${module.output}" printsummary="true" @@ -1500,7 +1508,7 @@ </fileset> </batchtest> </junit> - + <echo>Waiting for server to shutdown...</echo> <server:stop name="securitymgr"/> </target> |
From: Ryan C. <rca...@jb...> - 2005-07-19 14:24:45
|
User: rcampbell Date: 05/07/19 10:23:40 Modified: jbosstest build.xml Log: tell ant to convert the path seperators correctly Revision Changes Path 1.477 +3 -3 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.476 retrieving revision 1.477 diff -u -b -r1.476 -r1.477 --- build.xml 19 Jul 2005 14:17:04 -0000 1.476 +++ build.xml 19 Jul 2005 14:23:40 -0000 1.477 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.476 2005/07/19 14:17:04 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.477 2005/07/19 14:23:40 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1449,14 +1449,14 @@ <echo message="Starting default with policy ${build.resources}/securitymgr/server.policy" /> <echo message="jboss.home.dir=${jboss.dist}" /> - <echo message="jboss.server.home.dir=${jboss.dist}/server/default" /> + <echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}default" /> <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}"> <server name="securitymgr" config="default" host="${node0}"> <jvmarg value="${jpda.cmdline}" /> <jvmarg value="-Xmx64m" /> <jvmarg value="-Djboss.home.dir=${jboss.dist}" /> - <jvmarg value="-Djboss.server.home.dir=${jboss.dist}/server/default" /> + <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}default" /> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/> <jvmarg value="-Djava.security.debug=failure"/> |
From: Alex L. <al...@jb...> - 2005-07-19 15:10:54
|
User: aloubyansky Date: 05/07/19 11:09:49 Modified: jbosstest build.xml Log: added xmlunit to the classpath Revision Changes Path 1.478 +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.477 retrieving revision 1.478 diff -u -b -r1.477 -r1.478 --- build.xml 19 Jul 2005 14:23:40 -0000 1.477 +++ build.xml 19 Jul 2005 15:09:49 -0000 1.478 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.477 2005/07/19 14:23:40 rcampbell Exp $ --> +<!-- $Id: build.xml,v 1.478 2005/07/19 15:09:49 aloubyansky Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -105,6 +105,9 @@ <path refid="hibernate3.classpath"/> <path refid="odmg.classpath"/> <path refid="cglib.classpath"/> + + <!-- xml binding --> + <path refid="xmlunit.xmlunit.classpath"/> </path> <!-- ======= --> |
From: Thomas D. <tho...@jb...> - 2005-07-20 08:31:44
|
User: tdiesler Date: 05/07/20 04:30:40 Modified: jbosstest .classpath Log: Add apache-xerces Revision Changes Path 1.38 +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.37 retrieving revision 1.38 diff -u -b -r1.37 -r1.38 --- .classpath 14 Jul 2005 18:51:18 -0000 1.37 +++ .classpath 20 Jul 2005 08:30:40 -0000 1.38 @@ -47,5 +47,6 @@ <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Thomas D. <tho...@jb...> - 2005-07-20 08:32:44
|
User: tdiesler Date: 05/07/20 04:31:42 Modified: jbosstest build.xml Log: Add tests-webservice-ssl to all-tests Revision Changes Path 1.479 +76 -72 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.478 retrieving revision 1.479 diff -u -b -r1.478 -r1.479 --- build.xml 19 Jul 2005 15:09:49 -0000 1.478 +++ build.xml 20 Jul 2005 08:31:42 -0000 1.479 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.478 2005/07/19 15:09:49 aloubyansky Exp $ --> +<!-- $Id: build.xml,v 1.479 2005/07/20 08:31:42 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -439,6 +439,16 @@ </sequential> </macrodef> + <!-- patternsets for specialized configs --> + <patternset id="apache_tomcat.cluster.includes"> + <include name="org/jboss/test/cluster/apache_tomcat/*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> <!-- patternsets for that require clustering to be enabled --> <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> @@ -448,13 +458,70 @@ <exclude name="org/jboss/test/cluster/test/*TestCase.class"/> <exclude name="org/jboss/test/testbeancluster/test/*TestCase.class"/> </patternset> - <patternset id="apache_tomcat.cluster.includes"> - <include name="org/jboss/test/cluster/apache_tomcat/*TestCase.class"/> + <!-- 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 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> <patternset id="ha.includes"> <include name="org/jboss/test/ha/jmx/test/*TestCase.class"/> <include name="org/jboss/test/ha/singleton/test/*TestCase.class"/> </patternset> + <!-- Tests needing IIOP setup --> + <patternset id="iiop.includes"> + <include name="org/jboss/test/*iiop/test/*TestCase.class"/> + </patternset> + <patternset id="iiop.excludes"> + <exclude name="org/jboss/test/*iiop/test/*"/> + </patternset> + <!-- A patternset that requires jboss to run with a JACC security manager --> + <patternset id="jacc.includes"> + <include name="**/test/jacc/test/*TestCase.class"/> + </patternset> + <patternset id="jacc.excludes"> + <exclude name="**/test/jacc/test/*"/> + </patternset> + <patternset id="jaxr.includes"> + <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> + </patternset> + <!-- Tests needing xml binding setup --> + <patternset id="jbossxb.includes"> + <include name="org/jboss/test/xml/*TestCase.class"/> + </patternset> + <patternset id="jbossxb.excludes"> + <exclude name="org/jboss/test/xml/*TestCase.class"/> + </patternset> + <!-- 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"/> + <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/StatefulSessionLocalUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/> + <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/> + <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/> + <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/> + </patternset> + <patternset id="jrmp-invoker.excludes"> + <exclude name="org/jboss/test/bank/test/*"/> + </patternset> <!-- A patternset for that require a security config --> <patternset id="security.includes"> <include name="**/test/naming/test/Security*"/> @@ -481,12 +548,8 @@ <patternset id="securitymgr.excludes"> <exclude name="**/test/securitymgr/test/*"/> </patternset> - <!-- A patternset that requires jboss to run with a JACC security manager --> - <patternset id="jacc.includes"> - <include name="**/test/jacc/test/*TestCase.class"/> - </patternset> - <patternset id="jacc.excludes"> - <exclude name="**/test/jacc/test/*"/> + <patternset id="stax.include"> + <include name="org/jboss/test/stax/**/*TestCase.class"/> </patternset> <!-- Tests needing non-clustered tomcat SSO --> <patternset id="tc-sso.includes"> @@ -509,68 +572,8 @@ <patternset id="tc-ssl.excludes"> <exclude name="org/jboss/test/web/test/ssl/*"/> </patternset> - <!-- Tests needing IIOP setup --> - <patternset id="iiop.includes"> - <include name="org/jboss/test/*iiop/test/*TestCase.class"/> - </patternset> - <patternset id="iiop.excludes"> - <exclude name="org/jboss/test/*iiop/test/*"/> - </patternset> - <!-- 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"/> - <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/StatefulSessionLocalUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/> - <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/> - <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/> - <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/> - </patternset> - <patternset id="jrmp-invoker.excludes"> - <exclude name="org/jboss/test/bank/test/*"/> - </patternset> - <!-- Tests needing xml binding setup --> - <patternset id="jbossxb.includes"> - <include name="org/jboss/test/xml/*TestCase.class"/> - </patternset> - <patternset id="jbossxb.excludes"> - <exclude name="org/jboss/test/xml/*TestCase.class"/> - </patternset> - <patternset id="jaxr.includes"> - <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> - </patternset> - <patternset id="stax.include"> - <include name="org/jboss/test/stax/**/*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> - <!-- 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> - <!-- --> - <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 id="webservice-ssl.includes"> + <include name="org/jboss/test/webservice/secure/*TestCase.class"/> </patternset> <!-- Tests that are currently broken --> @@ -627,6 +630,7 @@ <antcall target="tests-jacc-security"/> <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-compatibility"/> + <antcall target="tests-webservice-ssl"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -2203,7 +2207,7 @@ </target> - <target name="webservice-ssl-tests" + <target name="tests-webservice-ssl" description="Tomcat tests requiring an SSL connector"> <!-- Create the ssl enabled tomcat config --> <create-config baseconf="default" newconf="webservice-ssl"> |
From: Adrian B. <adr...@jb...> - 2005-07-20 16:16:12
|
User: adrian Date: 05/07/20 12:15:03 Modified: jbosstest .classpath Log: Fix the eclipse build Revision Changes Path 1.39 +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.38 retrieving revision 1.39 diff -u -b -r1.38 -r1.39 --- .classpath 20 Jul 2005 08:30:40 -0000 1.38 +++ .classpath 20 Jul 2005 16:15:03 -0000 1.39 @@ -48,5 +48,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> + <classpathentry kind="lib" path="/thirdparty/xmlunit-xmlunit/lib/xmlunit1.0.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Scott M. <sm...@no...> - 2005-07-22 01:25:56
|
User: smarlow Date: 05/07/21 21:24:50 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Added test case for farm deploying a small test file. Revision Changes Path No revision No revision 1.406.2.89 +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.88 retrieving revision 1.406.2.89 diff -u -b -r1.406.2.88 -r1.406.2.89 --- build.xml 18 Jul 2005 20:33:04 -0000 1.406.2.88 +++ build.xml 22 Jul 2005 01:24:49 -0000 1.406.2.89 @@ -11,7 +11,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.88 2005/07/18 20:33:04 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.89 2005/07/22 01:24:49 smarlow Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -445,6 +445,7 @@ <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/> + <include name="org/jboss/test/ha/farm/test/*TestCase.class" /> </patternset> <patternset id="cluster.excludes"> <exclude name="org/jboss/test/cluster/test/*TestCase.class"/> @@ -1154,6 +1155,7 @@ jvm="${junit.jvm}" failureProperty="tests.failure"> + <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.cluster.node0" value="${node0}"/> <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/> |
From: Scott M. <sm...@no...> - 2005-07-22 18:28:30
|
User: smarlow Date: 05/07/22 14:27:23 Modified: jbosstest build.xml Log: Add test case for farm deployment. Revision Changes Path 1.480 +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.479 retrieving revision 1.480 diff -u -b -r1.479 -r1.480 --- build.xml 20 Jul 2005 08:31:42 -0000 1.479 +++ build.xml 22 Jul 2005 18:27:23 -0000 1.480 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.479 2005/07/20 08:31:42 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.480 2005/07/22 18:27:23 smarlow Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -453,6 +453,7 @@ <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/> + <include name="org/jboss/test/ha/farm/test/*TestCase.class" /> </patternset> <patternset id="cluster.excludes"> <exclude name="org/jboss/test/cluster/test/*TestCase.class"/> @@ -1278,6 +1279,7 @@ jvm="${junit.jvm}" failureProperty="tests.failure"> + <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.cluster.node0" value="${node0}"/> <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/> |
From: Adrian B. <adr...@jb...> - 2005-07-25 23:14:47
|
User: adrian Date: 05/07/25 19:13:41 Modified: jbosstest Tag: Branch_4_0 .classpath Log: Fix the eclipse build Revision Changes Path No revision No revision 1.24.2.15 +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.24.2.14 retrieving revision 1.24.2.15 diff -u -b -r1.24.2.14 -r1.24.2.15 --- .classpath 7 Jul 2005 16:35:54 -0000 1.24.2.14 +++ .classpath 25 Jul 2005 23:13:41 -0000 1.24.2.15 @@ -47,5 +47,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/hibernate-int"/> + <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Ryan C. <rca...@jb...> - 2005-07-26 00:55:27
|
User: rcampbell Date: 05/07/25 20:54:16 Modified: jbosstest build.xml Log: Migrate the rest of the head testsuite to the server controller taskdefs. Revision Changes Path 1.481 +69 -165 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.480 retrieving revision 1.481 diff -u -b -r1.480 -r1.481 --- build.xml 22 Jul 2005 18:27:23 -0000 1.480 +++ build.xml 26 Jul 2005 00:54:16 -0000 1.481 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.480 2005/07/22 18:27:23 smarlow Exp $ --> +<!-- $Id: build.xml,v 1.481 2005/07/26 00:54:16 rcampbell Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -643,25 +643,19 @@ <target name="jboss-minimal-tests" description="Validate the minimal config"> - <start-jboss conf="minimal" host="${node0}" /> + <server:start name="minimal"/> <copy file="${build.lib}/shutdown.sar" todir="${jboss.dist}/server/minimal/deploy" /> - <!-- Wait for the 1099 jndi port --> - <waitfor maxwait="30" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="minimal.timeout"> - <and> - <socket server="${node0}" port="1099" /> - </and> - </waitfor> - <fail message="Timeout waiting for minimal to start" if="minimal.timeout"/> <echo message="Minimal server started, stopping"/> + <sleep seconds="5"/> <delete file="${jboss.dist}/server/minimal/deploy/shutdown.sar" /> + <sleep seconds="7"/> </target> <target name="jboss-all-config-tests" description="The units tests which are run against the jboss all config"> - <start-jboss conf="all" jvmargs="-Djava.endorsed.dirs=${jboss.dist}/lib/endorsed -Xmx128m"/> - <wait-on-host/> + <server:start name="all"/> + <antcall target="tests-standard-unit"/> <antcall target="tests-client-unit"/> <antcall target="tests-security-basic-unit"/> @@ -671,8 +665,8 @@ <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> <antcall target="tests-webservice" /> - <stop-jboss/> - <wait-on-shutdown conf="all" /> + + <server:stop name="all"/> </target> <target name="tests-apache-tomcat-clustering" @@ -681,18 +675,9 @@ <!-- Definition of apache is in imports/server-config.xml --> <apache location="${apache.location}" action-type="start"/> <create-cluster-node conf="node0"/> - <start-jboss conf="node0" host="${node0}"/> + <server:start name="node0" /> <create-cluster-node conf="node1"/> - <start-jboss conf="node1" host="${node1}"/> - <echo message="Waiting for nodes to start..."/> - <waitfor maxwait="120" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="${node0.http.url}"/> - <http url="${node1.http.url}"/> - </and> - </waitfor> - <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> + <server:start name="node1"/> <echo message="Nodes have started, waiting for cluster to stablize..."/> <!-- Need a custom condition that queries for the node membership == 2 --> @@ -702,8 +687,8 @@ <param name="cluster.includes.refid" value="apache_tomcat.cluster.includes"/> <param name="jboss-junit-configuration" value="Tomcat Clustering"/> </antcall> - <stop-jboss url="${node0.jndi.url}"/> - <stop-jboss url="${node1.jndi.url}"/> + <server:stop name="node0"/> + <server:stop name="node1"/> <apache location="${apache.location}" action-type="stop"/> </target> @@ -715,8 +700,10 @@ <target name="tests-clustering" description="Execute clustering tests requiring two nodes."> - <antcall target="tests-clustering-startup" /> - <antcall target="tests-clustering-wait" /> + <antcall target="tests-clustering-configure" inheritRefs="true"/> + + <server:start name="node0"/> + <server:start name="node1"/> <!-- Need a custom condition that queries for the node membership == 2 --> <echo message="Going to call target tests-clustering-unit"/> @@ -725,27 +712,31 @@ <param name="cluster.includes.refid" value="cluster.includes"/> <param name="jboss-junit-configuration" value="Default"/> </antcall> - <antcall target="tests-clustering-shutdown" /> + + <server:stop name="node0"/> + <server:stop name="node1"/> <sleep seconds="4"/> <echo message="Going to call target tests-clustering-unit again with new configuration"/> - <antcall target="tests-clustering-startup-with-config-change" /> - <antcall target="tests-clustering-wait" /> + <antcall target="tests-clustering-startup-with-config-change"/> + + <server:start name="node0"/> + <server:start name="node1"/> <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> <param name="jboss-junit-configuration" value="SyncModeNUseJvm"/> </antcall> - <antcall target="tests-clustering-shutdown" /> + + <server:stop name="node0"/> + <server:stop name="node1"/> </target> - <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}"> + <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}"> <create-cluster-node conf="node0"/> - <start-jboss conf="node0" host="${node0}"/> <create-cluster-node conf="node1"/> - <start-jboss conf="node1" host="${node1}"/> </target> <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}"> @@ -755,26 +746,6 @@ <echo message="Modifying the node0 and node1 Tomcat configuration"/> <http-cluster-node-config-change conf="node0"/> <http-cluster-node-config-change conf="node1"/> - - <start-jboss conf="node0" host="${node0}"/> - <start-jboss conf="node1" host="${node1}"/> - </target> - - <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}"> - <stop-jboss url="${node0.jndi.url}"/> - <stop-jboss url="${node1.jndi.url}"/> - </target> - <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}"> - <echo message="Waiting for nodes to start..."/> - <waitfor maxwait="120" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="${node0.http.url}"/> - <http url="${node1.http.url}"/> - </and> - </waitfor> - <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> - <echo message="Nodes have started, waiting for cluster to stablize..."/> </target> <!-- Tests of tomcat needing a ssl connector @@ -790,8 +761,9 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="tomcat-ssl"/> - <wait-on-host/> + + <server:start name="tomcat-ssl"/> + <!-- Specify the JSSE properties --> <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> @@ -805,8 +777,8 @@ </propertyset> <run-junit junit.patternset="tc-ssl.includes" junit.syspropertyset="tomcat-ssl-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="tomcat-ssl"/> + + <server:stop name="tomcat-ssl"/> </target> <!-- Tests of tomcat requiring SSO configured @@ -828,11 +800,9 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="tomcat-sso"/> - <wait-on-host/> + <server:start name="tomcat-sso"/> <run-junit junit.patternset="tc-sso.includes" /> - <stop-jboss/> - <wait-on-shutdown conf="tomcat-sso"/> + <server:stop name="tomcat-sso"/> </target> <target name="tomcat-sso-clustered-tests" @@ -872,16 +842,8 @@ </patternset> </create-config> - <start-jboss conf="tomcat-sso-cluster0" host="${node0}"/> - <start-jboss conf="tomcat-sso-cluster1" host="${node1}"/> - <waitfor maxwait="120" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="${node0.http.url}"/> - <http url="${node1.http.url}"/> - </and> - </waitfor> - <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> + <server:start name="tomcat-sso-cluster0"/> + <server:start name="tomcat-sso-cluster1"/> <echo message="Nodes have started, waiting for cluster to stablize..."/> <sleep seconds="10" /> <antcall target="tests-clustering-unit"> @@ -889,10 +851,8 @@ <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/> </antcall> - <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"/> + <server:stop name="tomcat-sso-cluster0"/> + <server:stop name="tomcat-sso-cluster1"/> </target> <!-- DTM two-phase commit tests --> @@ -973,30 +933,20 @@ </fileset> </copy> <!-- 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"/> + <server:start name="dtm0"/> + <server:start name="dtm1"/> + <server:start name="dtm2"/> + <server:start name="dtm3"/> + <echo message="Nodes have started, waiting for node set to stablize..."/> <sleep seconds="10" /> <!-- Run DTM unit tests --> <antcall target="tests-dtm-unit"/> <!-- Stop DTM nodes --> - <stop-jboss url="jnp://${node0}:1099"/> - <stop-jboss url="jnp://${node1}:1099"/> - <stop-jboss url="jnp://${node2}:1099"/> - <stop-jboss url="jnp://${node3}:1099"/> + <server:stop name="dtm0"/> + <server:stop name="dtm1"/> + <server:stop name="dtm2"/> + <server:stop name="dtm3"/> </target> <!-- DTM unit tests --> @@ -1079,27 +1029,13 @@ > <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"/> + <server:start name="binding-manager1"/> + <server:start name="binding-manager2"/> + <run-junit junit.patternset="binding-manager.includes" /> - <stop-jboss url="jnp://localhost:1299"/> - <stop-jboss url="jnp://localhost:1199"/> + + <server:stop name="binding-manager1"/> + <server:stop name="binding-manager2"/> </target> <!-- @@ -1115,13 +1051,12 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="jrmp-invoker"/> - <wait-on-host/> + <server:start name="jrmp-invoker"/> <run-junit junit.patternset="jrmp-invoker.includes" junit.configuration="JRMP-Invoker" /> - <stop-jboss/> + <server:stop name="jrmp-invoker"/> </target> <!-- @@ -1152,13 +1087,11 @@ <include name="deployment-service.sar"/> </fileset> </copy> - <start-jboss-os conf="deployment-service"/> - <wait-on-host/> + <server:start name="deployment-service"/> <antcall target="deployment-service-unit-tests"> <param name="jboss-junit-configuration" value="DeploymentService"/> </antcall> - <stop-jboss/> - <wait-on-shutdown conf="deployment-service"/> + <server:stop name="deployment-service"/> </target> <target name="deployment-service-unit-tests"> @@ -1331,11 +1264,6 @@ </fileset> </batchtest> </junit> - <antcall target="cleanup-clustering"></antcall> - </target> - <!-- Target stops the cluster when junit fails.--> - <target name="cleanup-clustering" if="test.failure"> - <stop-cluster/> </target> <target name="tests-ha-unit"> @@ -1453,24 +1381,13 @@ <!-- Tests of Java2 permissions. The JBoss server must be running with a security manager for this test --> - <target name="tests-security-manager" depends="serverTaskdefs" + <target name="tests-security-manager" description="Tests run against a jboss server with a security manager"> <echo message="Starting default with policy ${build.resources}/securitymgr/server.policy" /> <echo message="jboss.home.dir=${jboss.dist}" /> <echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}default" /> - <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}"> - <server name="securitymgr" config="default" host="${node0}"> - <jvmarg value="${jpda.cmdline}" /> - <jvmarg value="-Xmx64m" /> - <jvmarg value="-Djboss.home.dir=${jboss.dist}" /> - <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}default" /> - <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/> - <jvmarg value="-Djava.security.debug=failure"/> - </server> - </server:config> <server:start name="securitymgr"/> <junit dir="${module.output}" @@ -1541,15 +1458,10 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="jacc"/> + <server:start name="jacc"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> <property name="jbosstest.secure" value="true"/> <property name="java.security.auth.login.config" @@ -1561,14 +1473,13 @@ <run-junit junit.patternset="jacc.includes" junit.syspropertyset="jacc-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="jacc"/> + <server:stop name="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"> + <create-config baseconf="default" newconf="jacc-securitymgr"> <patternset> <include name="conf/**"/> <include name="deploy/hsqldb-ds.xml"/> @@ -1584,16 +1495,10 @@ <include name="lib/**"/> </patternset> </create-config> - <start-securitymgr conf="jacc"/> + <server:start name="jacc-securitymgr"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> - <junit dir="${module.output}" printsummary="true" @@ -1647,8 +1552,7 @@ </batchtest> </junit> - <stop-jboss/> - <wait-on-shutdown conf="jacc"/> + <server:stop name="jacc-securitymgr"/> </target> <target name="tests-standalone-aop-unit"> @@ -2217,8 +2121,7 @@ <include name="**/*"/> </patternset> </create-config> - <start-jboss conf="webservice-ssl"/> - <wait-on-host/> + <server:start name="webservice-ssl"/> <!-- Specify the JSSE properties --> <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/webservice-ssl/conf/client.keystore"/> @@ -2233,8 +2136,7 @@ </propertyset> <run-junit junit.patternset="webservice-ssl.includes" junit.syspropertyset="webservice-ssl-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="webservice-ssl"/> + <server:stop name="webservice-ssl"/> </target> <!-- Test for JAXR under the Web Services Umbrella --> @@ -2654,9 +2556,11 @@ <target name="tests-jboss-cluster" description="Test that two jboss cluster nodes can be started/stopped from ant"> - <start-cluster/> + <server:start name="node0"/> + <server:start name="node1"/> <start-sleep seconds="60"/> - <stop-cluster/> + <server:stop name="node0"/> + <server:stop name="node1"/> </target> <!-- Reporting targets that generate reports from JUnit output. |