From: Scott M S. <st...@us...> - 2004-11-01 11:43:03
|
User: starksm Date: 04/11/01 03:42:52 Modified: . Tag: Branch_4_0 build.xml Log: Include the source attribute in the javac task for jdk 1.5 Revision Changes Path No revision No revision 1.406.2.17 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.16 retrieving revision 1.406.2.17 diff -u -r1.406.2.16 -r1.406.2.17 --- build.xml 31 Oct 2004 20:08:31 -0000 1.406.2.16 +++ build.xml 1 Nov 2004 11:42:51 -0000 1.406.2.17 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.16 2004/10/31 20:08:31 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.17 2004/11/01 11:42:51 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -275,6 +275,7 @@ <mkdir dir="${build.classes}"/> <javac destdir="${build.classes}" optimize="${javac.optimize}" + source="${javac.source}" target="${javac.target}" debug="${javac.debug}" depend="${javac.depend}" |
From: Scott M S. <st...@us...> - 2004-11-01 11:53:32
|
User: starksm Date: 04/11/01 03:53:17 Modified: . build.xml Log: Include the source attribute in the javac task for jdk 1.5 Revision Changes Path 1.425 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.424 retrieving revision 1.425 diff -u -r1.424 -r1.425 --- build.xml 31 Oct 2004 20:05:03 -0000 1.424 +++ build.xml 1 Nov 2004 11:53:16 -0000 1.425 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.424 2004/10/31 20:05:03 starksm Exp $ --> +<!-- $Id: build.xml,v 1.425 2004/11/01 11:53:16 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -275,6 +275,7 @@ <mkdir dir="${build.classes}"/> <javac destdir="${build.classes}" optimize="${javac.optimize}" + source="${javac.source}" target="${javac.target}" debug="${javac.debug}" depend="${javac.depend}" |
From: Scott M S. <st...@us...> - 2004-11-01 23:27:16
|
User: starksm Date: 04/11/01 15:27:09 Modified: . Tag: Branch_4_0 build.xml Log: Include the mail-service.xml in the jacc configuration Revision Changes Path No revision No revision 1.406.2.18 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.17 retrieving revision 1.406.2.18 diff -u -r1.406.2.17 -r1.406.2.18 --- build.xml 1 Nov 2004 11:42:51 -0000 1.406.2.17 +++ build.xml 1 Nov 2004 23:27:06 -0000 1.406.2.18 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.17 2004/11/01 11:42:51 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.18 2004/11/01 23:27:06 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1215,6 +1215,7 @@ <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> |
From: Scott M S. <st...@us...> - 2004-11-01 23:29:25
|
User: starksm Date: 04/11/01 15:29:17 Modified: . build.xml Log: Add a tests-jacc-security target Revision Changes Path 1.426 +83 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- build.xml 1 Nov 2004 11:53:16 -0000 1.425 +++ build.xml 1 Nov 2004 23:29:17 -0000 1.426 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.425 2004/11/01 11:53:16 starksm Exp $ --> +<!-- $Id: build.xml,v 1.426 2004/11/01 23:29:17 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1188,6 +1188,88 @@ <stop-jboss/> </target> + <!-- Tests of the JACC security implementation --> + <target name="tests-jacc-security" + description="Tests run against a jboss server with JACC configured"> + <!-- 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-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}"> + <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/> + <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/> + </fileset> + </batchtest> + </junit> + + <stop-jboss/> + </target> + <target name="tests-standalone-aop-unit" depends="maybejars"> <!-- <antcall target="tests-treecacheaop-unit" inheritRefs="true"/> |
From: Thomas D. <tdi...@us...> - 2004-11-02 11:08:01
|
User: tdiesler Date: 04/11/02 03:07:44 Modified: . Tag: Branch_4_0 build.xml Log: Create the reports directory before running tests-webservices Revision Changes Path No revision No revision 1.406.2.19 +2 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.18 retrieving revision 1.406.2.19 diff -u -r1.406.2.18 -r1.406.2.19 --- build.xml 1 Nov 2004 23:27:06 -0000 1.406.2.18 +++ build.xml 2 Nov 2004 11:07:40 -0000 1.406.2.19 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.18 2004/11/01 23:27:06 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.19 2004/11/02 11:07:40 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1705,8 +1705,7 @@ <target name="tests-webservices" description="Execute Web Services Related Tests"> - <echo message="java.endorsed.dirs=${jboss.dist}/lib/endorsed"/> - + <mkdir dir="${build.reports}" /> <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" |
From: Thomas D. <tdi...@us...> - 2004-11-03 09:03:03
|
User: tdiesler Date: 04/11/03 01:02:56 Modified: . Tag: Branch_4_0 build.xml Log: Resurect JBoss.NET tests Revision Changes Path No revision No revision 1.406.2.20 +60 -7 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.19 retrieving revision 1.406.2.20 diff -u -r1.406.2.19 -r1.406.2.20 --- build.xml 2 Nov 2004 11:07:40 -0000 1.406.2.19 +++ build.xml 3 Nov 2004 09:02:55 -0000 1.406.2.20 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.19 2004/11/02 11:07:40 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.20 2004/11/03 09:02:55 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -827,11 +827,6 @@ <stop-jboss url="${node1.jndi.url}"/> </target> - <target name="jbossnet-tests" - description="Tomcat tests requiring SSO configured"> - <echo message="Not yet implemented"/> - </target> - <!-- | Standard tests that should run successfully against a default JBoss | server distribution build. @@ -1701,9 +1696,67 @@ </junit> </target> + <!-- + | Standard jbossnet tests that should run successfully against a + | JBoss server distribution build that contains jboss-net. + --> + + <target name="tests-jbossnet" + description="Execute JBoss.NET Tests"> + + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.testlog}"/> + <!-- choose a testpattern via a property --> + <property name="jbosstest.pattern" value="**/*"/> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="${junit.fork}" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg line="${junit.jvm.options}"/> + <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> + <sysproperty key="jbosstest.secure" value="true"/> + + <jvmarg value="-Djava.security.manager"/> + <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> + <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"/> + + <!-- make sure to use xerces on the client side as well, otherwise the element echo tests might fail --> + <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> + <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> + + <classpath> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}/security"/> + <pathelement location="${build.resources}"/> + <pathelement location="${jboss.jbossnet.lib}/jboss-net-client.jar"/> + <path refid="tests.classpath"/> + </classpath> + + <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <formatter type="plain" usefile="${junit.formatter.usefile}"/> + + <batchtest todir="${build.reports}" + haltonerror="${junit.batchtest.haltonerror}" + haltonfailure="${junit.batchtest.haltonfailure}" + fork="${junit.batchtest.fork}"> + + <fileset dir="${build.classes}"> + <include name="**/test/jbossnet/${jbosstest.pattern}TestCase.class"/> + </fileset> + </batchtest> + </junit> + </target> + <!-- Run the Web Services Tests--> <target name="tests-webservices" - description="Execute Web Services Related Tests"> + description="Execute JBossWS Tests"> <mkdir dir="${build.reports}" /> <junit dir="${module.output}" |
From: Thomas D. <tdi...@us...> - 2004-11-03 13:15:05
|
User: tdiesler Date: 04/11/03 05:14:52 Modified: . Tag: Branch_4_0 build.xml Log: Add message centric test cases Revision Changes Path No revision No revision 1.406.2.21 +2131 -2130jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.20 retrieving revision 1.406.2.21 diff -u -r1.406.2.20 -r1.406.2.21 --- build.xml 3 Nov 2004 09:02:55 -0000 1.406.2.20 +++ build.xml 3 Nov 2004 13:14:50 -0000 1.406.2.21 @@ -6,1708 +6,841 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.20 2004/11/03 09:02:55 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.21 2004/11/03 13:14:50 tdiesler 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 --> - <!-- ======================================================== --> - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp"/> - - <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 - and ${hostname} by default. If you cannot route multicast traffic between - localhost and hostname, then you need to specify node0 and node1 binding - in the local.properties that can in order to be able to run the clustering - tests. - --> - <condition property="hostname" value="${env.COMPUTERNAME}"> + <import file="../tools/etc/buildmagic/build-common.xml"/> + <import file="../tools/etc/buildmagic/libraries.xml"/> + <import file="../tools/etc/buildmagic/modules.xml"/> + + <!-- ======================================================== --> + <!-- Initialization --> + <!-- ======================================================== --> + <tstamp> + <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> + </tstamp> + <echo message="${TIMENOW}" file="run.tstamp"/> + + <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 + and ${hostname} by default. If you cannot route multicast traffic between + localhost and hostname, then you need to specify node0 and node1 binding + in the local.properties that can in order to be able to run the clustering + tests. + --> + <condition property="hostname" value="${env.COMPUTERNAME}"> + <os family="windows"/> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not> <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> - <os family="windows"/> - </not> - </condition> - <!-- Cluster node0 defaults --> - <property name="node0" value="localhost"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <!-- Cluster node1 defaults --> - <property name="node1" value="${hostname}"/> - <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 --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="testsuite"/> - <property name="module.Name" value="JBoss Testsuite"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - <!-- The combined library classpath --> - <path id="library.classpath"> - <path refid="apache.avalon.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="ibm.wsdl4j.classpath"/> - <path refid="jacorb.jacorb.classpath"/> - <path refid="jgroups.jgroups.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="junitejb.junitejb.classpath"/> - <path refid="javassist.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="trove.classpath"/> - - <!-- needed for JBossMQ selector tests --> - <path refid="gnu.regexp.classpath"/> + </not> + </condition> + <!-- Cluster node0 defaults --> + <property name="node0" value="localhost"/> + <property name="node0.http.url" value="http://${node0}:8080"/> + <property name="node0.jndi.url" value="jnp://${node0}:1099"/> + <!-- Cluster node1 defaults --> + <property name="node1" value="${hostname}"/> + <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 --> + <!-- =================== --> + + <!-- Module name(s) & version --> + <property name="module.name" value="testsuite"/> + <property name="module.Name" value="JBoss Testsuite"/> + <property name="module.version" value="DEV"/> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + <!-- The combined library classpath --> + <path id="library.classpath"> + <path refid="apache.avalon.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="ibm.wsdl4j.classpath"/> + <path refid="jacorb.jacorb.classpath"/> + <path refid="jgroups.jgroups.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="junitejb.junitejb.classpath"/> + <path refid="javassist.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="sun.servlet.classpath"/> + <path refid="trove.classpath"/> + + <!-- needed for JBossMQ selector tests --> + <path refid="gnu.regexp.classpath"/> + + <!-- needed for proxy tests --> + <path refid="apache.bcel.classpath"/> + <!-- needed for security login module tests --> + <path refid="hsqldb.hsqldb.classpath"/> + + <!-- Need hibernate jar for hibernate-based tests --> + <path refid="hibernate2.classpath"/> + <path refid="odmg.classpath"/> + <path refid="cglib.classpath"/> + </path> + + <!-- ======= --> + <!-- 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 + the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> + <property name="jboss.internal-server.root" value="${project.root}/server/output"/> + <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> + <path id="jboss.internal-server.classpath"> + <pathelement path="${jboss.server.lib}/jboss.jar"/> + <pathelement path="${jboss.server.lib}/jboss-system.jar"/> + </path> + + <!-- The combined dependant module classpath --> + <path id="dependentmodule.classpath"> + <path refid="jboss.aop.classpath"/> + <path refid="jboss.aspects.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jboss.cluster.classpath"/> + <path refid="jboss.common.classpath"/> + <path refid="jboss.hibernate.classpath"/> + <path refid="jboss.iiop.classpath"/> + <path refid="jboss.internal-server.classpath"/> + <path refid="jboss.j2ee.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> + <path refid="jboss.jbossnet.classpath"/> + <path refid="jboss.jca.classpath"/> + <path refid="jboss.jmx.classpath"/> + <path refid="jboss.management.classpath"/> + <path refid="jboss.media.classpath"/> + <path refid="jboss.messaging.classpath"/> + <path refid="jboss.naming.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="jboss.security.classpath"/> + <path refid="jboss.server.classpath"/> + <path refid="jboss.system.classpath"/> + <path refid="jboss.transaction.classpath"/> + <path refid="jboss.varia.classpath"/> + <path refid="jboss.webservice.classpath"/> + </path> + + <!-- RMI Stub generation --> + <patternset id="rmic.includes" + description="The patternset passed to the compile-stubs target"> + <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> + <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> + <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/jmx/invoker/Listener.class"/> + </patternset> + + <!-- ===== --> + <!-- Tasks --> + <!-- ===== --> + + <!-- Where source files live --> + <property name="source.java" value="${module.source}/main"/> + <property name="source.etc" value="${module.source}/etc"/> + <property name="source.docs" value="${module.source}/docs"/> + <property name="source.resources" value="${module.source}/resources"/> + <property name="source.stylesheets" value="${module.source}/stylesheets"/> + + <!-- Where build generated files will go --> + <property name="build.classes" value="${module.output}/classes"/> + <property name="build.lib" value="${module.output}/lib"/> + <property name="build.api" value="${module.output}/api"/> + <property name="build.etc" value="${module.output}/etc"/> + <property name="build.docs" value="${module.output}/docs"/> + <property name="build.resources" value="${module.output}/resources"/> + <property name="build.stylesheets" value="${module.output}/stylesheets"/> + <property name="build.reports" value="${module.output}/reports"/> + <property name="build.testlog" value="${module.output}/log"/> + + <!--xdoclet output directories--> + <property name="build.gen-src" value="${module.output}/gen-src/"/> + <!-- put ejb-jar.xml and other resources into build.resources--> + + <!-- Install/Release structure --> + <property name="install.id" value="${module.name}-${module.version}"/> + <property name="release.id" value="${install.id}"/> + <property name="install.root" value="${module.output}/${install.id}"/> + + <!-- The combined thirdparty classpath --> + <path id="thirdparty.classpath"> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </path> + + <path id="javac.classpath"> + <path refid="thirdparty.classpath"/> + </path> + + <!-- classpath and local.classpath must have a value using with a path --> + <property name="classpath" value=""/> + <property name="local.classpath" value=""/> + + <!-- Classpath to build and run the tests --> + <path id="tests.classpath"> + <pathelement path="${classpath}"/> + <pathelement path="${local.classpath}"/> + <pathelement path="${project.tools}/lib/ant.jar"/> + <pathelement path="${project.tools}/lib/optional.jar"/> + <path refid="jboss.jmx.classpath"/> + <path refid="thirdparty.classpath"/> + </path> + + <!-- The classpath required to build javadocs. --> + <path id="javadoc.classpath"> + <path refid="tests.classpath"/> + </path> + + <!-- Packages to include when generating api documentation --> + <property name="javadoc.packages" value="org.jboss.*"/> + + <!-- Override JUnit defaults --> + <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> + <property name="jbosstest.iterationcount" value="10"/> + <property name="jbosstest.threadcount" value="5"/> + <property name="jbosstest.beancount" value="5"/> + <property name="jbosstest.nodeploy" value="false"/> + <property name="junit.batchtest.todir" value="${build.reports}"/> + <property name="junit.jvm.options" value="-Ddummy"/> + <!-- Override JUnit Marathon defaults --> + <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> + <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> + <property name="marathon.threadcount" value="100"/> + + <!-- xdoclet --> + <path id="xdoclet.task.classpath"> + <path refid="tests.classpath"/> + <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> + + <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> + + <target name="init"> + <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> + <!-- Setup the version 1 classes so the tests compile --> + <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> + <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" + file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" + overwrite="false"/> + <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> + <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" + file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" + overwrite="false"/> + </target> - <!-- needed for proxy tests --> - <path refid="apache.bcel.classpath"/> - <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - - <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> - <path refid="odmg.classpath"/> - <path refid="cglib.classpath"/> - </path> - - <!-- ======= --> - <!-- 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 - the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> - <property name="jboss.internal-server.root" value="${project.root}/server/output"/> - <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> - <path id="jboss.internal-server.classpath"> - <pathelement path="${jboss.server.lib}/jboss.jar"/> - <pathelement path="${jboss.server.lib}/jboss-system.jar"/> - </path> + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + <import file="imports/code-generation.xml"/> - <!-- The combined dependant module classpath --> - <path id="dependentmodule.classpath"> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jboss.cluster.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.hibernate.classpath"/> - <path refid="jboss.iiop.classpath"/> - <path refid="jboss.internal-server.classpath"/> - <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jaxrpc.classpath"/> - <path refid="jboss.jbossnet.classpath"/> - <path refid="jboss.jca.classpath"/> - <path refid="jboss.jmx.classpath"/> - <path refid="jboss.management.classpath"/> - <path refid="jboss.media.classpath"/> - <path refid="jboss.messaging.classpath"/> - <path refid="jboss.naming.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.transaction.classpath"/> - <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> - </path> - - <!-- RMI Stub generation --> - <patternset id="rmic.includes" - description="The patternset passed to the compile-stubs target"> - <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> - <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> - <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> - <include name="org/jboss/test/jmx/invoker/Listener.class"/> - </patternset> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <!-- Where source files live --> - <property name="source.java" value="${module.source}/main"/> - <property name="source.etc" value="${module.source}/etc"/> - <property name="source.docs" value="${module.source}/docs"/> - <property name="source.resources" value="${module.source}/resources"/> - <property name="source.stylesheets" value="${module.source}/stylesheets"/> - - <!-- Where build generated files will go --> - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.docs" value="${module.output}/docs"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.stylesheets" value="${module.output}/stylesheets"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> - - <!--xdoclet output directories--> - <property name="build.gen-src" value="${module.output}/gen-src/"/> - <!-- put ejb-jar.xml and other resources into build.resources--> - - <!-- Install/Release structure --> - <property name="install.id" value="${module.name}-${module.version}"/> - <property name="release.id" value="${install.id}"/> - <property name="install.root" value="${module.output}/${install.id}"/> - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - </path> - - <path id="javac.classpath"> - <path refid="thirdparty.classpath"/> - </path> - - <!-- classpath and local.classpath must have a value using with a path --> - <property name="classpath" value=""/> - <property name="local.classpath" value=""/> - - <!-- Classpath to build and run the tests --> - <path id="tests.classpath"> - <pathelement path="${classpath}"/> - <pathelement path="${local.classpath}"/> - <pathelement path="${project.tools}/lib/ant.jar"/> - <pathelement path="${project.tools}/lib/optional.jar"/> - <path refid="jboss.jmx.classpath"/> - <path refid="thirdparty.classpath"/> - </path> - - <!-- The classpath required to build javadocs. --> - <path id="javadoc.classpath"> - <path refid="tests.classpath"/> - </path> - - <!-- Packages to include when generating api documentation --> - <property name="javadoc.packages" value="org.jboss.*"/> - - <!-- Override JUnit defaults --> - <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> - <property name="jbosstest.iterationcount" value="10"/> - <property name="jbosstest.threadcount" value="5"/> - <property name="jbosstest.beancount" value="5"/> - <property name="jbosstest.nodeploy" value="false"/> - <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> - <!-- Override JUnit Marathon defaults --> - <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> - <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> - <property name="marathon.threadcount" value="100"/> - - <!-- xdoclet --> - <path id="xdoclet.task.classpath"> - <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + <target name="compile" + depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" + description="Compile all source files."/> - <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> + <!-- Compile all class files --> + <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> + </target> - <target name="init"> - <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> - <!-- Setup the version 1 classes so the tests compile --> - <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> - <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" - file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" - overwrite="false"/> - <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> - <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" - file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" - overwrite="false"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - <import file="imports/code-generation.xml"/> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - <target name="compile" - depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" - description="Compile all source files."/> - - <!-- Compile all class files --> - <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> - </target> - - <target name="compile-classes-only"> - <mkdir dir="${build.classes}"/> - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - source="${javac.source}" - target="${javac.target}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${source.java}"/> - <src path="${build.gen-src}"/> - <classpath refid="tests.classpath"/> - </javac> - </target> - - <target name="compile-stubs"> - <rmic base="${build.classes}" - sourcebase="${build.classes}" - verify="${rmic.verify}" - iiop="${rmic.iiop}" - iiopopts="${rmic.iiopopts}" - idl="${rmic.idl}" - idlopts="${rmic.idlops}" - debug="${rmic.debug}" - stubVersion="${rmic.stubVersion}" - > - <classpath refid="tests.classpath"/> - <patternset refid="rmic.includes"/> - </rmic> - </target> - - <!-- Compile resource files --> - <target name="compile-resources"> - <mkdir dir="${build.resources}"/> - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${source.resources}"> - <include name="**/*"/> - </fileset> - </copy> - </target> - - <!-- Compile stylesheets files --> - <target name="compile-stylesheets"> - <mkdir dir="${build.stylesheets}"/> - <copy todir="${build.stylesheets}" filtering="yes"> - <fileset dir="${source.stylesheets}"> - <include name="**/*"/> - </fileset> - </copy> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc"> - <mkdir dir="${build.etc}"/> - <copy todir="${build.etc}" filtering="yes"> - <fileset dir="${source.etc}"> - <include name="**/*"/> - </fileset> - </copy> - </target> - - - <!-- Import the test jars build targets --> - <import file="imports/test-jars.xml"/> - - <!-- Import the jboss server run targets --> - <import file="imports/server-config.xml"/> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" - description="Cleans up most generated files."> - <delete dir="${module.output}"/> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" - description="Executes the default target (most)." - depends="most"/> - - <target name="all" - description="Builds everything." - depends="jars"/> - - <target name="most" - description="Builds almost everything." - depends="jars"/> + <target name="compile-classes-only"> + <mkdir dir="${build.classes}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="${javac.source}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + </javac> + </target> - <target name="help" description="Displays the project help"> - <echo> - The main targets are: - + jars : compile the tests and build the test jars - + tests : the main tests entry points which runs all normal unit tests - Use ant -projecthelp to list all documented targets. - </echo> - </target> + <target name="compile-stubs"> + <rmic base="${build.classes}" + sourcebase="${build.classes}" + verify="${rmic.verify}" + iiop="${rmic.iiop}" + iiopopts="${rmic.iiopopts}" + idl="${rmic.idl}" + idlopts="${rmic.idlops}" + debug="${rmic.debug}" + stubVersion="${rmic.stubVersion}" + > + <classpath refid="tests.classpath"/> + <patternset refid="rmic.includes"/> + </rmic> + </target> - <!-- ================================================================== --> - <!-- Tests --> - <!-- ================================================================== --> - - <macrodef name="wait-on-host"> - <attribu... [truncated message content] |
From: Thomas D. <tdi...@us...> - 2004-11-05 12:58:21
|
User: tdiesler Date: 04/11/05 04:57:57 Modified: . Tag: Branch_4_0 build.xml Log: Add ws4ee style admin devel example test Revision Changes Path No revision No revision 1.406.2.22 +4 -4 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.21 retrieving revision 1.406.2.22 diff -u -r1.406.2.21 -r1.406.2.22 --- build.xml 3 Nov 2004 13:14:50 -0000 1.406.2.21 +++ build.xml 5 Nov 2004 12:57:55 -0000 1.406.2.22 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.21 2004/11/03 13:14:50 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.22 2004/11/05 12:57:55 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -583,7 +583,7 @@ <antcall target="tests-jbossmx-implementation"/> <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> - <antcall target="tests-webservices"/> + <antcall target="test-webservice"/> <antcall target="tests-jaxr"/> <stop-jboss/> <wait-on-shutdown conf="all"/> @@ -1755,7 +1755,7 @@ </target> <!-- Run the Web Services Tests--> - <target name="tests-webservices" + <target name="test-webservice" description="Execute JBossWS Tests"> <mkdir dir="${build.reports}"/> @@ -2084,7 +2084,7 @@ | of the unit test using the test property, -Dtest=org.jboss.test.... | Here you specify the testcase class, not the directory --> - <target name="one-test" depends="maybejars" if="test" + <target name="one-test" if="test" description="Execute a single test."> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
From: Scott M S. <st...@us...> - 2004-11-05 17:10:52
|
User: starksm Date: 04/11/05 09:10:45 Modified: . Tag: Branch_4_0 build.xml Log: Include the tests-jacc-security target in the tests target Revision Changes Path No revision No revision 1.406.2.23 +2182 -2181jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.22 retrieving revision 1.406.2.23 diff -u -r1.406.2.22 -r1.406.2.23 --- build.xml 5 Nov 2004 12:57:55 -0000 1.406.2.22 +++ build.xml 5 Nov 2004 17:10:31 -0000 1.406.2.23 @@ -6,2233 +6,2234 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.22 2004/11/05 12:57:55 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.23 2004/11/05 17:10:31 starksm 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 --> - <!-- ======================================================== --> - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp"/> - - <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 - and ${hostname} by default. If you cannot route multicast traffic between - localhost and hostname, then you need to specify node0 and node1 binding - in the local.properties that can in order to be able to run the clustering - tests. - --> - <condition property="hostname" value="${env.COMPUTERNAME}"> - <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> + <import file="../tools/etc/buildmagic/build-common.xml"/> + <import file="../tools/etc/buildmagic/libraries.xml"/> + <import file="../tools/etc/buildmagic/modules.xml"/> + + <!-- ======================================================== --> + <!-- Initialization --> + <!-- ======================================================== --> + <tstamp> + <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> + </tstamp> + <echo message="${TIMENOW}" file="run.tstamp"/> + + <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 + and ${hostname} by default. If you cannot route multicast traffic between + localhost and hostname, then you need to specify node0 and node1 binding + in the local.properties that can in order to be able to run the clustering + tests. + --> + <condition property="hostname" value="${env.COMPUTERNAME}"> <os family="windows"/> - </not> - </condition> - <!-- Cluster node0 defaults --> - <property name="node0" value="localhost"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <!-- Cluster node1 defaults --> - <property name="node1" value="${hostname}"/> - <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 --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="testsuite"/> - <property name="module.Name" value="JBoss Testsuite"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - <!-- The combined library classpath --> - <path id="library.classpath"> - <path refid="apache.avalon.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="ibm.wsdl4j.classpath"/> - <path refid="jacorb.jacorb.classpath"/> - <path refid="jgroups.jgroups.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="junitejb.junitejb.classpath"/> - <path refid="javassist.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="trove.classpath"/> - - <!-- needed for JBossMQ selector tests --> - <path refid="gnu.regexp.classpath"/> - - <!-- needed for proxy tests --> - <path refid="apache.bcel.classpath"/> - <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - - <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> - <path refid="odmg.classpath"/> - <path refid="cglib.classpath"/> - </path> - - <!-- ======= --> - <!-- 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 - the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> - <property name="jboss.internal-server.root" value="${project.root}/server/output"/> - <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> - <path id="jboss.internal-server.classpath"> - <pathelement path="${jboss.server.lib}/jboss.jar"/> - <pathelement path="${jboss.server.lib}/jboss-system.jar"/> - </path> - - <!-- The combined dependant module classpath --> - <path id="dependentmodule.classpath"> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jboss.cluster.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.hibernate.classpath"/> - <path refid="jboss.iiop.classpath"/> - <path refid="jboss.internal-server.classpath"/> - <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jaxrpc.classpath"/> - <path refid="jboss.jbossnet.classpath"/> - <path refid="jboss.jca.classpath"/> - <path refid="jboss.jmx.classpath"/> - <path refid="jboss.management.classpath"/> - <path refid="jboss.media.classpath"/> - <path refid="jboss.messaging.classpath"/> - <path refid="jboss.naming.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.transaction.classpath"/> - <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> - </path> - - <!-- RMI Stub generation --> - <patternset id="rmic.includes" - description="The patternset passed to the compile-stubs target"> - <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> - <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> - <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> - <include name="org/jboss/test/jmx/invoker/Listener.class"/> - </patternset> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <!-- Where source files live --> - <property name="source.java" value="${module.source}/main"/> - <property name="source.etc" value="${module.source}/etc"/> - <property name="source.docs" value="${module.source}/docs"/> - <property name="source.resources" value="${module.source}/resources"/> - <property name="source.stylesheets" value="${module.source}/stylesheets"/> - - <!-- Where build generated files will go --> - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.docs" value="${module.output}/docs"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.stylesheets" value="${module.output}/stylesheets"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> - - <!--xdoclet output directories--> - <property name="build.gen-src" value="${module.output}/gen-src/"/> - <!-- put ejb-jar.xml and other resources into build.resources--> - - <!-- Install/Release structure --> - <property name="install.id" value="${module.name}-${module.version}"/> - <property name="release.id" value="${install.id}"/> - <property name="install.root" value="${module.output}/${install.id}"/> - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - </path> - - <path id="javac.classpath"> - <path refid="thirdparty.classpath"/> - </path> - - <!-- classpath and local.classpath must have a value using with a path --> - <property name="classpath" value=""/> - <property name="local.classpath" value=""/> - - <!-- Classpath to build and run the tests --> - <path id="tests.classpath"> - <pathelement path="${classpath}"/> - <pathelement path="${local.classpath}"/> - <pathelement path="${project.tools}/lib/ant.jar"/> - <pathelement path="${project.tools}/lib/optional.jar"/> - <path refid="jboss.jmx.classpath"/> - <path refid="thirdparty.classpath"/> - </path> - - <!-- The classpath required to build javadocs. --> - <path id="javadoc.classpath"> - <path refid="tests.classpath"/> - </path> - - <!-- Packages to include when generating api documentation --> - <property name="javadoc.packages" value="org.jboss.*"/> - - <!-- Override JUnit defaults --> - <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> - <property name="jbosstest.iterationcount" value="10"/> - <property name="jbosstest.threadcount" value="5"/> - <property name="jbosstest.beancount" value="5"/> - <property name="jbosstest.nodeploy" value="false"/> - <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> - <!-- Override JUnit Marathon defaults --> - <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> - <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> - <property name="marathon.threadcount" value="100"/> - - <!-- xdoclet --> - <path id="xdoclet.task.classpath"> - <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> - - <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> - - <target name="init"> - <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> - <!-- Setup the version 1 classes so the tests compile --> - <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> - <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" - file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" - overwrite="false"/> - <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> - <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" - file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" - overwrite="false"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - <import file="imports/code-generation.xml"/> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - <target name="compile" - depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" - description="Compile all source files."/> - - <!-- Compile all class files --> - <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> - </target> - - <target name="compile-classes-only"> - <mkdir dir="${build.classes}"/> - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - source="${javac.source}" - target="${javac.target}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${source.java}"/> - <src path="${build.gen-src}"/> - <classpath refid="tests.classpath"/> - </javac> - </target> - - <target name="compile-stubs"> - <rmic base="${build.classes}" - sourcebase="${build.classes}" - verify="${rmic.verify}" - iiop="${rmic.iiop}" - iiopopts="${rmic.iiopopts}" - idl="${rmic.idl}" - idlopts="${rmic.idlops}" - debug="${rmic.debug}" - stubVersion="${rmic.stubVersion}" - > - <classpath refid="tests.classpath"/> - <patternset refid="rmic.includes"/> - </rmic> - </target> - - <!-- Compile resource files --> - <target name="compile-resources"> - <mkdir dir="${build.resources}"/> - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${source.resources}"> - <include name="**/*"/> - </fileset> - </copy> - </target> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not> + <os family="windows"/> + </not> + </condition> + <!-- Cluster node0 defaults --> + <property name="node0" value="localhost"/> + <property name="node0.http.url" value="http://${node0}:8080"/> + <property name="node0.jndi.url" value="jnp://${node0}:1099"/> + <!-- Cluster node1 defaults --> + <property name="node1" value="${hostname}"/> + <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 --> + <!-- =================== --> + + <!-- Module name(s) & version --> + <property name="module.name" value="testsuite"/> + <property name="module.Name" value="JBoss Testsuite"/> + <property name="module.version" value="DEV"/> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + <!-- The combined library classpath --> + <path id="library.classpath"> + <path refid="apache.avalon.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="ibm.wsdl4j.classpath"/> + <path refid="jacorb.jacorb.classpath"/> + <path refid="jgroups.jgroups.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="junitejb.junitejb.classpath"/> + <path refid="javassist.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="sun.servlet.classpath"/> + <path refid="trove.classpath"/> - <!-- Compile stylesheets files --> - <target name="compile-stylesheets"> - <mkdir dir="${build.stylesheets}"/> - <copy todir="${build.stylesheets}" filtering="yes"> - <fileset dir="${source.stylesheets}"> - <include name="**/*"/> - </fileset> - </copy> - </target> + <!-- needed for JBossMQ selector tests --> + <path refid="gnu.regexp.classpath"/> - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc"> - <mkdir dir="${build.etc}"/> - <copy todir="${build.etc}" filtering="yes"> - <fileset dir="${source.etc}"> - <include name="**/*"/> + <!-- needed for proxy tests --> + <path refid="apache.bcel.classpath"/> + <!-- needed for security login module tests --> + <path refid="hsqldb.hsqldb.classpath"/> + + <!-- Need hibernate jar for hibernate-based tests --> + <path refid="hibernate2.classpath"/> + <path refid="odmg.classpath"/> + <path refid="cglib.classpath"/> + </path> + + <!-- ======= --> + <!-- 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 + the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> + <property name="jboss.internal-server.root" value="${project.root}/server/output"/> + <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> + <path id="jboss.internal-server.classpath"> + <pathelement path="${jboss.server.lib}/jboss.jar"/> + <pathelement path="${jboss.server.lib}/jboss-system.jar"/> + </path> + + <!-- The combined dependant module classpath --> + <path id="dependentmodule.classpath"> + <path refid="jboss.aop.classpath"/> + <path refid="jboss.aspects.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jboss.cluster.classpath"/> + <path refid="jboss.common.classpath"/> + <path refid="jboss.hibernate.classpath"/> + <path refid="jboss.iiop.classpath"/> + <path refid="jboss.internal-server.classpath"/> + <path refid="jboss.j2ee.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> + <path refid="jboss.jbossnet.classpath"/> + <path refid="jboss.jca.classpath"/> + <path refid="jboss.jmx.classpath"/> + <path refid="jboss.management.classpath"/> + <path refid="jboss.media.classpath"/> + <path refid="jboss.messaging.classpath"/> + <path refid="jboss.naming.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="jboss.security.classpath"/> + <path refid="jboss.server.classpath"/> + <path refid="jboss.system.classpath"/> + <path refid="jboss.transaction.classpath"/> + <path refid="jboss.varia.classpath"/> + <path refid="jboss.webservice.classpath"/> + </path> + + <!-- RMI Stub generation --> + <patternset id="rmic.includes" + description="The patternset passed to the compile-stubs target"> + <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> + <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> + <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/jmx/invoker/Listener.class"/> + </patternset> + + <!-- ===== --> + <!-- Tasks --> + <!-- ===== --> + + <!-- Where source files live --> + <property name="source.java" value="${module.source}/main"/> + <property name="source.etc" value="${module.source}/etc"/> + <property name="source.docs" value="${module.source}/docs"/> + <property name="source.resources" value="${module.source}/resources"/> + <property name="source.stylesheets" value="${module.source}/stylesheets"/> + + <!-- Where build generated files will go --> + <property name="build.classes" value="${module.output}/classes"/> + <property name="build.lib" value="${module.output}/lib"/> + <property name="build.api" value="${module.output}/api"/> + <property name="build.etc" value="${module.output}/etc"/> + <property name="build.docs" value="${module.output}/docs"/> + <property name="build.resources" value="${module.output}/resources"/> + <property name="build.stylesheets" value="${module.output}/stylesheets"/> + <property name="build.reports" value="${module.output}/reports"/> + <property name="build.testlog" value="${module.output}/log"/> + + <!--xdoclet output directories--> + <property name="build.gen-src" value="${module.output}/gen-src/"/> + <!-- put ejb-jar.xml and other resources into build.resources--> + + <!-- Install/Release structure --> + <property name="install.id" value="${module.name}-${module.version}"/> + <property name="release.id" value="${install.id}"/> + <property name="install.root" value="${module.output}/${install.id}"/> + + <!-- The combined thirdparty classpath --> + <path id="thirdparty.classpath"> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </path> + + <path id="javac.classpath"> + <path refid="thirdparty.classpath"/> + </path> + + <!-- classpath and local.classpath must have a value using with a path --> + <property name="classpath" value=""/> + <property name="local.classpath" value=""/> + + <!-- Classpath to build and run the tests --> + <path id="tests.classpath"> + <pathelement path="${classpath}"/> + <pathelement path="${local.classpath}"/> + <pathelement path="${project.tools}/lib/ant.jar"/> + <pathelement path="${project.tools}/lib/optional.jar"/> + <path refid="jboss.jmx.classpath"/> + <path refid="thirdparty.classpath"/> + </path> + + <!-- The classpath required to build javadocs. --> + <path id="javadoc.classpath"> + <path refid="tests.classpath"/> + </path> + + <!-- Packages to include when generating api documentation --> + <property name="javadoc.packages" value="org.jboss.*"/> + + <!-- Override JUnit defaults --> + <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> + <property name="jbosstest.iterationcount" value="10"/> + <property name="jbosstest.threadcount" value="5"/> + <property name="jbosstest.beancount" value="5"/> + <property name="jbosstest.nodeploy" value="false"/> + <property name="junit.batchtest.todir" value="${build.reports}"/> + <property name="junit.jvm.options" value="-Ddummy"/> + <!-- Override JUnit Marathon defaults --> + <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> + <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> + <property name="marathon.threadcount" value="100"/> + + <!-- xdoclet --> + <path id="xdoclet.task.classpath"> + <path refid="tests.classpath"/> + <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <include name="**/*.jar"/> </fileset> - </copy> - </target> + </path> + <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> + <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> - <!-- Import the test jars build targets --> - <import file="imports/test-jars.xml"/> + <target name="init"> + <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> + <!-- Setup the version 1 classes so the tests compile --> + <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> + <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" + file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" + overwrite="false"/> + <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> + <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" + file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" + overwrite="false"/> + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + <import file="imports/code-generation.xml"/> + + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + <target name="compile" + depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" + description="Compile all source files."/> + + <!-- Compile all class files --> + <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> + </target> + + <target name="compile-classes-only"> + <mkdir dir="${build.classes}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="${javac.source}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + </javac> + </target> + + <target name="compile-stubs"> + <rmic base="${build.classes}" + sourcebase="${build.classes}" + verify="${rmic.verify}" + iiop="${rmic.iiop}" + iiopopts="${rmic.iiopopts}" + idl="${rmic.idl}" + idlopts="${rmic.idlops}" + debug="${rmic.debug}" + stubVersion="${rmic.stubVersion}" + > + <classpath refid="tests.classpath"/> + <patternset refid="rmic.includes"/> + </rmic> + </target> + + <!-- Compile resource files --> + <target name="compile-resources"> + <mkdir dir="${build.resources}"/> + <copy todir="${build.resources}" filtering="no"> + <fileset dir="${source.resources}"> + <include name="**/*"/> + </fileset> + </copy> + </target> + + <!-- Compile stylesheets files --> + <target name="compile-stylesheets"> + <mkdir dir="${build.stylesheets}"/> + <copy todir="${build.stylesheets}" filtering="yes"> + <fileset dir="${source.stylesheets}"> + <include name="**/*"/> + </fileset> + </copy> + </target> + + <!-- Compile etc files (manifests and such) --> + <target name="compile-etc"> + <mkdir dir="${build.etc}"/> + <copy todir="${build.etc}" filtering="yes"> + <fileset dir="${source.etc}"> + <include name="**/*"/> + </fileset> + </copy> + </target> + + + <!-- Import the test jars build targets --> + <import file="imports/test-jars.xml"/> + + <!-- Import the jboss server run targets --> + <import file="imports/server-config.xml"/> + + <!-- ================================================================== --> + <!-- Cleaning --> + <!-- ================================================================== --> + + <!-- Clean up all build output --> + <target name="clean" + description="Cleans up most generated files."> + <delete dir="${module.output}"/> + </target> + + <!-- ================================================================== --> + <!-- Misc. --> + <!-- ===============================... [truncated message content] |
From: Scott M S. <st...@us...> - 2004-11-05 17:38:41
|
User: starksm Date: 04/11/05 09:38:31 Modified: . build.xml Log: Include the tests-jacc-security target in the tests target Revision Changes Path 1.427 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- build.xml 1 Nov 2004 23:29:17 -0000 1.426 +++ build.xml 5 Nov 2004 17:38:11 -0000 1.427 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.426 2004/11/01 23:29:17 starksm Exp $ --> +<!-- $Id: build.xml,v 1.427 2004/11/05 17:38:11 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -537,6 +537,7 @@ <antcall target="tomcat-ssl-tests"/> <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> + <antcall target="tests-jacc-security"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> |
From: Thomas D. <tdi...@us...> - 2004-11-05 18:18:08
|
User: tdiesler Date: 04/11/05 10:17:57 Modified: . Tag: Branch_3_2 build.xml Log: Synch JBoss.NET from Branch_4_0 to Branch_3_2 Revision Changes Path No revision No revision 1.165.2.170 +61 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.169 retrieving revision 1.165.2.170 diff -u -r1.165.2.169 -r1.165.2.170 --- build.xml 30 Oct 2004 02:19:15 -0000 1.165.2.169 +++ build.xml 5 Nov 2004 18:17:54 -0000 1.165.2.170 @@ -76,8 +76,8 @@ <path refid="apache.xalan.classpath"/> <path refid="apache.commons.classpath"/> <path refid="apache.log4j.classpath"/> - <path refid="apache.axis.classpath"/> <path refid="oswego.concurrent.classpath"/> + <path refid="ibm.wsdl4j.classpath"/> <path refid="jacorb.jacorb.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="junit.junit.classpath"/> @@ -116,6 +116,7 @@ <path id="dependentmodule.classpath"> <path refid="jboss.j2ee.classpath"/> <path refid="jboss.common.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> <path refid="jboss.jmx.classpath"/> <path refid="jboss.system.classpath"/> <path refid="jboss.naming.classpath"/> @@ -1312,6 +1313,64 @@ </junit> </target> + <!-- + | Standard jbossnet tests that should run successfully against a + | JBoss server distribution build that contains jboss-net. + --> + + <target name="tests-jbossnet" + description="Execute JBoss.NET Tests"> + + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.testlog}"/> + <!-- choose a testpattern via a property --> + <property name="jbosstest.pattern" value="**/*"/> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="${junit.fork}" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg line="${junit.jvm.options}"/> + <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> + <sysproperty key="jbosstest.secure" value="true"/> + + <jvmarg value="-Djava.security.manager"/> + <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> + <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"/> + + <!-- make sure to use xerces on the client side as well, otherwise the element echo tests might fail --> + <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> + <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> + + <classpath> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}/security"/> + <pathelement location="${build.resources}"/> + <pathelement location="${jboss.jbossnet.lib}/jboss-net-client.jar"/> + <path refid="tests.classpath"/> + </classpath> + + <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <formatter type="plain" usefile="${junit.formatter.usefile}"/> + + <batchtest todir="${build.reports}" + haltonerror="${junit.batchtest.haltonerror}" + haltonfailure="${junit.batchtest.haltonfailure}" + fork="${junit.batchtest.fork}"> + + <fileset dir="${build.classes}"> + <include name="**/test/jbossnet/${jbosstest.pattern}TestCase.class"/> + </fileset> + </batchtest> + </junit> + </target> + <!-- | IIOP test cases that should run successfully --> |
From: Scott M S. <st...@us...> - 2004-11-11 03:01:31
|
User: starksm Date: 04/11/10 19:01:21 Modified: . Tag: Branch_3_2 build.xml Log: Merge the iiop changes from 4.0 to address some java5 runtime problems Revision Changes Path No revision No revision 1.165.2.171 +7 -5 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.170 retrieving revision 1.165.2.171 diff -u -r1.165.2.170 -r1.165.2.171 --- build.xml 5 Nov 2004 18:17:54 -0000 1.165.2.170 +++ build.xml 11 Nov 2004 03:01:17 -0000 1.165.2.171 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.170 2004/11/05 18:17:54 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.165.2.171 2004/11/11 03:01:17 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1385,7 +1385,6 @@ timeout="${junit.timeout}" jvm="${junit.jvm}"> - <jvmarg value="${junit.jvm.options}"/> <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/> <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/> <jvmarg value="-Djacorb.orb.print_version=off"/> @@ -1394,15 +1393,18 @@ <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/> <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/> <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/> + <jvmarg value="-DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/> + <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> |
From: Thomas D. <tdi...@us...> - 2004-11-11 14:25:55
|
User: tdiesler Date: 04/11/11 06:25:49 Modified: . Tag: Branch_4_0 build.xml Log: Restore the vanished txtimer tests Revision Changes Path No revision No revision 1.406.2.24 +2236 -2178jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.23 retrieving revision 1.406.2.24 diff -u -r1.406.2.23 -r1.406.2.24 --- build.xml 5 Nov 2004 17:10:31 -0000 1.406.2.23 +++ build.xml 11 Nov 2004 14:25:46 -0000 1.406.2.24 @@ -6,2234 +6,2292 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.23 2004/11/05 17:10:31 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.24 2004/11/11 14:25:46 tdiesler 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 --> - <!-- ======================================================== --> - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp"/> - - <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 - and ${hostname} by default. If you cannot route multicast traffic between - localhost and hostname, then you need to specify node0 and node1 binding - in the local.properties that can in order to be able to run the clustering - tests. - --> - <condition property="hostname" value="${env.COMPUTERNAME}"> + <import file="../tools/etc/buildmagic/build-common.xml"/> + <import file="../tools/etc/buildmagic/libraries.xml"/> + <import file="../tools/etc/buildmagic/modules.xml"/> + + <!-- ======================================================== --> + <!-- Initialization --> + <!-- ======================================================== --> + <tstamp> + <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> + </tstamp> + <echo message="${TIMENOW}" file="run.tstamp"/> + + <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 + and ${hostname} by default. If you cannot route multicast traffic between + localhost and hostname, then you need to specify node0 and node1 binding + in the local.properties that can in order to be able to run the clustering + tests. + --> + <condition property="hostname" value="${env.COMPUTERNAME}"> + <os family="windows"/> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not> <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> - <os family="windows"/> - </not> - </condition> - <!-- Cluster node0 defaults --> - <property name="node0" value="localhost"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <!-- Cluster node1 defaults --> - <property name="node1" value="${hostname}"/> - <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 --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="testsuite"/> - <property name="module.Name" value="JBoss Testsuite"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - <!-- The combined library classpath --> - <path id="library.classpath"> - <path refid="apache.avalon.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="ibm.wsdl4j.classpath"/> - <path refid="jacorb.jacorb.classpath"/> - <path refid="jgroups.jgroups.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="junitejb.junitejb.classpath"/> - <path refid="javassist.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="trove.classpath"/> - - <!-- needed for JBossMQ selector tests --> - <path refid="gnu.regexp.classpath"/> - - <!-- needed for proxy tests --> - <path refid="apache.bcel.classpath"/> - <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - - <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> - <path refid="odmg.classpath"/> - <path refid="cglib.classpath"/> - </path> - - <!-- ======= --> - <!-- 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 - the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> - <property name="jboss.internal-server.root" value="${project.root}/server/output"/> - <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> - <path id="jboss.internal-server.classpath"> - <pathelement path="${jboss.server.lib}/jboss.jar"/> - <pathelement path="${jboss.server.lib}/jboss-system.jar"/> - </path> + </not> + </condition> + <!-- Cluster node0 defaults --> + <property name="node0" value="localhost"/> + <property name="node0.http.url" value="http://${node0}:8080"/> + <property name="node0.jndi.url" value="jnp://${node0}:1099"/> + <!-- Cluster node1 defaults --> + <property name="node1" value="${hostname}"/> + <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 --> + <!-- =================== --> + + <!-- Module name(s) & version --> + <property name="module.name" value="testsuite"/> + <property name="module.Name" value="JBoss Testsuite"/> + <property name="module.version" value="DEV"/> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + <!-- The combined library classpath --> + <path id="library.classpath"> + <path refid="apache.avalon.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="ibm.wsdl4j.classpath"/> + <path refid="jacorb.jacorb.classpath"/> + <path refid="jgroups.jgroups.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="junitejb.junitejb.classpath"/> + <path refid="javassist.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="sun.servlet.classpath"/> + <path refid="trove.classpath"/> + + <!-- needed for JBossMQ selector tests --> + <path refid="gnu.regexp.classpath"/> + + <!-- needed for proxy tests --> + <path refid="apache.bcel.classpath"/> + <!-- needed for security login module tests --> + <path refid="hsqldb.hsqldb.classpath"/> + + <!-- Need hibernate jar for hibernate-based tests --> + <path refid="hibernate2.classpath"/> + <path refid="odmg.classpath"/> + <path refid="cglib.classpath"/> + </path> + + <!-- ======= --> + <!-- 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 + the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> + <property name="jboss.internal-server.root" value="${project.root}/server/output"/> + <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> + <path id="jboss.internal-server.classpath"> + <pathelement path="${jboss.server.lib}/jboss.jar"/> + <pathelement path="${jboss.server.lib}/jboss-system.jar"/> + </path> + + <!-- The combined dependant module classpath --> + <path id="dependentmodule.classpath"> + <path refid="jboss.aop.classpath"/> + <path refid="jboss.aspects.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jboss.cluster.classpath"/> + <path refid="jboss.common.classpath"/> + <path refid="jboss.hibernate.classpath"/> + <path refid="jboss.iiop.classpath"/> + <path refid="jboss.internal-server.classpath"/> + <path refid="jboss.j2ee.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> + <path refid="jboss.jbossnet.classpath"/> + <path refid="jboss.jca.classpath"/> + <path refid="jboss.jmx.classpath"/> + <path refid="jboss.management.classpath"/> + <path refid="jboss.media.classpath"/> + <path refid="jboss.messaging.classpath"/> + <path refid="jboss.naming.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="jboss.security.classpath"/> + <path refid="jboss.server.classpath"/> + <path refid="jboss.system.classpath"/> + <path refid="jboss.transaction.classpath"/> + <path refid="jboss.varia.classpath"/> + <path refid="jboss.webservice.classpath"/> + </path> + + <!-- RMI Stub generation --> + <patternset id="rmic.includes" + description="The patternset passed to the compile-stubs target"> + <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> + <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> + <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/jmx/invoker/Listener.class"/> + </patternset> + + <!-- ===== --> + <!-- Tasks --> + <!-- ===== --> + + <!-- Where source files live --> + <property name="source.java" value="${module.source}/main"/> + <property name="source.etc" value="${module.source}/etc"/> + <property name="source.docs" value="${module.source}/docs"/> + <property name="source.resources" value="${module.source}/resources"/> + <property name="source.stylesheets" value="${module.source}/stylesheets"/> + + <!-- Where build generated files will go --> + <property name="build.classes" value="${module.output}/classes"/> + <property name="build.lib" value="${module.output}/lib"/> + <property name="build.api" value="${module.output}/api"/> + <property name="build.etc" value="${module.output}/etc"/> + <property name="build.docs" value="${module.output}/docs"/> + <property name="build.resources" value="${module.output}/resources"/> + <property name="build.stylesheets" value="${module.output}/stylesheets"/> + <property name="build.reports" value="${module.output}/reports"/> + <property name="build.testlog" value="${module.output}/log"/> + + <!--xdoclet output directories--> + <property name="build.gen-src" value="${module.output}/gen-src/"/> + <!-- put ejb-jar.xml and other resources into build.resources--> + + <!-- Install/Release structure --> + <property name="install.id" value="${module.name}-${module.version}"/> + <property name="release.id" value="${install.id}"/> + <property name="install.root" value="${module.output}/${install.id}"/> + + <!-- The combined thirdparty classpath --> + <path id="thirdparty.classpath"> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </path> + + <path id="javac.classpath"> + <path refid="thirdparty.classpath"/> + </path> + + <!-- classpath and local.classpath must have a value using with a path --> + <property name="classpath" value=""/> + <property name="local.classpath" value=""/> + + <!-- Classpath to build and run the tests --> + <path id="tests.classpath"> + <pathelement path="${classpath}"/> + <pathelement path="${local.classpath}"/> + <pathelement path="${project.tools}/lib/ant.jar"/> + <pathelement path="${project.tools}/lib/optional.jar"/> + <path refid="jboss.jmx.classpath"/> + <path refid="thirdparty.classpath"/> + </path> + + <!-- The classpath required to build javadocs. --> + <path id="javadoc.classpath"> + <path refid="tests.classpath"/> + </path> + + <!-- Packages to include when generating api documentation --> + <property name="javadoc.packages" value="org.jboss.*"/> + + <!-- Override JUnit defaults --> + <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> + <property name="jbosstest.iterationcount" value="10"/> + <property name="jbosstest.threadcount" value="5"/> + <property name="jbosstest.beancount" value="5"/> + <property name="jbosstest.nodeploy" value="false"/> + <property name="junit.batchtest.todir" value="${build.reports}"/> + <property name="junit.jvm.options" value="-Ddummy"/> + <!-- Override JUnit Marathon defaults --> + <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> + <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> + <property name="marathon.threadcount" value="100"/> + + <!-- xdoclet --> + <path id="xdoclet.task.classpath"> + <path refid="tests.classpath"/> + <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> + + <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> + + <target name="init"> + <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> + <!-- Setup the version 1 classes so the tests compile --> + <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> + <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" + file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" + overwrite="false"/> + <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> + <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" + file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" + overwrite="false"/> + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + <import file="imports/code-generation.xml"/> + + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + <target name="compile" + depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" + description="Compile all source files."/> + + <!-- Compile all class files --> + <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> + </target> + + <target name="compile-classes-only"> + <mkdir dir="${build.classes}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="${javac.source}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + </javac> + </target> + + <target name="compile-stubs"> + <rmic base="${build.classes}" + sourcebase="${build.classes}" + verify="${rmic.verify}" + iiop="${rmic.iiop}" + iiopopts="${rmic.iiopopts}" + idl="${rmic.idl}" + idlopts="${rmic.idlops}" + debug="${rmic.debug}" + stubVersion="${rmic.stubVersion}" + > + <classpath refid="tests.classpath"/> + <patternset refid="rmic.includes"/> + </rmic> + </target> + + <!-- Compile resource files --> + <target name="compile-resources"> + <mkdir dir="${build.resources}"/> + <copy todir="${build.resources}" filtering="no"> + <fileset dir="${source.resources}"> + <include name="**/*"/> + </fileset> + </copy> + </target> - <!-- The combined dependant module classpath --> - <path id="dependentmodule.classpath"> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jboss.cluster.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.hibernate.classpath"/> - <path refid="jboss.iiop.classpath"/> - <path refid="jboss.internal-server.classpath"/> - <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jaxrpc.classpath"/> - <path refid="jboss.jbossnet.classpath"/> - <path refid="jboss.jca.classpath"/> - <path refid="jboss.jmx.classpath"/> - <path refid="jboss.management.classpath"/> - <path refid="jboss.media.classpath"/> - <path refid="jboss.messaging.classpath"/> - <path refid="jboss.naming.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.transaction.classpath"/> - <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> - </path> - - <!-- RMI Stub generation --> - <patternset id="rmic.includes" - description="The patternset passed to the compile-stubs target"> - <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> - <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> - <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> - <include name="org/jboss/test/jmx/invoker/Listener.class"/> - </patternset> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <!-- Where source files live --> - <property name="source.java" value="${module.source}/main"/> - <property name="source.etc" value="${module.source}/etc"/> - <property name="source.docs" value="${module.source}/docs"/> - <property name="source.resources" value="${module.source}/resources"/> - <property name="source.stylesheets" value="${module.source}/stylesheets"/> - - <!-- Where build generated files will go --> - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.docs" value="${module.output}/docs"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.stylesheets" value="${module.output}/stylesheets"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> - - <!--xdoclet output directories--> - <property name="build.gen-src" value="${module.output}/gen-src/"/> - <!-- put ejb-jar.xml and other resources into build.resources--> - - <!-- Install/Release structure --> - <property name="install.id" value="${module.name}-${module.version}"/> - <property name="release.id" value="${install.id}"/> - <property name="install.root" value="${module.output}/${install.id}"/> - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - </path> - - <path id="javac.classpath"> - <path refid="thirdparty.classpath"/> - </path> - - <!-- classpath and local.classpath must have a value using with a path --> - <property name="classpath" value=""/> - <property name="local.classpath" value=""/> - - <!-- Classpath to build and run the tests --> - <path id="tests.classpath"> - <pathelement path="${classpath}"/> - <pathelement path="${local.classpath}"/> - <pathelement path="${project.tools}/lib/ant.jar"/> - <pathelement path="${project.tools}/lib/optional.jar"/> - <path refid="jboss.jmx.classpath"/> - <path refid="thirdparty.classpath"/> - </path> - - <!-- The classpath required to build javadocs. --> - <path id="javadoc.classpath"> - <path refid="tests.classpath"/> - </path> - - <!-- Packages to include when generating api documentation --> - <property name="javadoc.packages" value="org.jboss.*"/> - - <!-- Override JUnit defaults --> - <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> - <property name="jbosstest.iterationcount" value="10"/> - <property name="jbosstest.threadcount" value="5"/> - <property name="jbosstest.beancount" value="5"/> - <property name="jbosstest.nodeploy" value="false"/> - <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> - <!-- Override JUnit Marathon defaults --> - <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> - <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> - <property name="marathon.threadcount" value="100"/> - - <!-- xdoclet --> - <path id="xdoclet.task.classpath"> - <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> - <include name="**/*.jar"/> + <!-- Compile stylesheets files --> + <target name="compile-stylesheets"> + <mkdir dir="${build.stylesheets}"/> + <copy todir="${build.stylesheets}" filtering="yes"> + <fileset dir="${source.stylesheets}"> + <include name="**/*"/> </fileset> - </path> - <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> + </copy> + </target> - <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> + <!-- Compile etc files (manifests and such) --> + <target name="compile-etc"> + <mkdir dir="${build.etc}"/> + <copy todir="${build.etc}" filtering="yes"> + <fileset dir="${source.etc}"> + <include name="**/*"/> + </fileset> + </copy> + </target> - <target name="init"> - <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> - <!-- Setup the version 1 classes so the tests compile --> - <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> - <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" - file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" - overwrite="false"/> - <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> - <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" - file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" - overwrite="false"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - <import file="imports/code-generation.xml"/> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - <target name="compile" - depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" - description="Compile all source files."/> - - <!-- Compile all class files --> - <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> - </target> - - <target name="compile-classes-only"> - <mkdir dir="${build.classes}"/> - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - source="${javac.source}" - target="${javac.target}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${source.java}"/> - <src path="${build.gen-src}"/> - <classpath refid="tests.classpath"/> - </javac> - </target> - - <target name="compile-stubs"> - <rmic base="${build.classes}" - sourcebase="${build.classes}" - verify="${rmic.verify}" - iiop="${rmic.iiop}" - iiopopts="${rmic.iiopopts}" - idl="${rmic.idl}" - idlopts="${rmic.idlops}" - debug="${rmic.debug}" - stubVersion="${rmic.stubVersion}" - > - <classpath refid="tests.classpath"/> - <patternset refid="rmic.includes"/> - </rmic> - </target> - - <!-- Compile resource files --> - <target name="compile-resources"> - <mkdir dir="${build.resources}"/> - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${source.resources}"> - <include name="**/*"/> - </fileset> - </copy> - </target> - - <!-- Compile stylesheets files --> - <target name="compile-stylesheets"> - <mkdir dir="${build.stylesheets}"/> - <copy todir="${build.stylesheets}" filtering="yes"> - <fileset dir="${source.stylesheets}"> - <include name="**/*"/> - </fileset> - </copy> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc"> - <mkdir dir="${build.etc}"/> - <copy todir="${build.etc}" filtering="yes"> - <fileset dir="${source.etc}"> - <include name="**/*"/> - </fileset> - </copy> - </target> - - - <!-- Import the test jars build targets --> - <import file="imports/test-jars.xml"/> - - <!-- Import the jboss server run targets --> - <import file="imports/server-config.xml"/> - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" - description="Cleans up most generated files."> - <delete dir="${module.output}"/> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" - description="Executes the default tar... [truncated message content] |
From: Scott M S. <st...@us...> - 2004-11-12 03:27:48
|
User: starksm Date: 04/11/11 19:27:42 Modified: . Tag: Branch_3_2 build.xml Log: Add a sleep seconds="15" after the cluster node web servers are seen to be up to give the partition time to recognize the nodes. We need a custom test to validate the the cluster membership has the expected count on each node. Revision Changes Path No revision No revision 1.165.2.172 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.171 retrieving revision 1.165.2.172 diff -u -r1.165.2.171 -r1.165.2.172 --- build.xml 11 Nov 2004 03:01:17 -0000 1.165.2.171 +++ build.xml 12 Nov 2004 03:27:39 -0000 1.165.2.172 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.171 2004/11/11 03:01:17 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.172 2004/11/12 03:27:39 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -611,6 +611,7 @@ </waitfor> <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> <echo message="Nodes have started, waiting for cluster to stablize..."/> + <sleep seconds="15" /> <!-- Need a custom condition that queries for the node membership == 2 --> <echo message="Going to call target tests-clustering-unit"/> |
From: Anil S. <osd...@us...> - 2004-11-16 19:04:30
|
User: osdchicago Date: 04/11/16 11:04:21 Modified: . build.xml Log: Turn off Jaxr Tests from the "all" config related tests. Revision Changes Path 1.428 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.427 retrieving revision 1.428 diff -u -r1.427 -r1.428 --- build.xml 5 Nov 2004 17:38:11 -0000 1.427 +++ build.xml 16 Nov 2004 19:04:20 -0000 1.428 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.427 2004/11/05 17:38:11 starksm Exp $ --> +<!-- $Id: build.xml,v 1.428 2004/11/16 19:04:20 osdchicago Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -577,7 +577,7 @@ <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> <antcall target="tests-webservices" /> - <antcall target="tests-jaxr" /> +<!-- <antcall target="tests-jaxr" />--> <stop-jboss/> <wait-on-shutdown conf="all" /> </target> |
From: Thomas D. <tdi...@us...> - 2004-11-18 12:43:51
|
User: tdiesler Date: 04/11/18 04:43:42 Modified: . Tag: Branch_4_0 build.xml Log: Add webservice attachment test Revision Changes Path No revision No revision 1.406.2.25 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.24 retrieving revision 1.406.2.25 diff -u -r1.406.2.24 -r1.406.2.25 --- build.xml 11 Nov 2004 14:25:46 -0000 1.406.2.24 +++ build.xml 18 Nov 2004 12:43:41 -0000 1.406.2.25 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.24 2004/11/11 14:25:46 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.25 2004/11/18 12:43:41 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -82,6 +82,7 @@ <path refid="junit.junit.classpath"/> <path refid="junitejb.junitejb.classpath"/> <path refid="javassist.classpath"/> + <path refid="sun.jaf.classpath"/> <path refid="sun.javamail.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="trove.classpath"/> |
From: Scott M S. <st...@us...> - 2004-11-24 05:28:21
|
User: starksm Date: 04/11/23 21:28:13 Modified: . Tag: Branch_4_0 build.xml Log: Move tests-webservice and tests-txtimer to the jboss-all-config-tests as these need the all server running and they don't start their own server setup. Added a netboot-tests target. Revision Changes Path No revision No revision 1.406.2.26 +2322 -2236jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.25 retrieving revision 1.406.2.26 diff -u -r1.406.2.25 -r1.406.2.26 --- build.xml 18 Nov 2004 12:43:41 -0000 1.406.2.25 +++ build.xml 24 Nov 2004 05:28:02 -0000 1.406.2.26 @@ -6,2293 +6,2379 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.25 2004/11/18 12:43:41 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.26 2004/11/24 05:28:02 starksm 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 --> - <!-- ======================================================== --> - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp"/> - - <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 - and ${hostname} by default. If you cannot route multicast traffic between - localhost and hostname, then you need to specify node0 and node1 binding - in the local.properties that can in order to be able to run the clustering - tests. - --> - <condition property="hostname" value="${env.COMPUTERNAME}"> - <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> + <import file="../tools/etc/buildmagic/build-common.xml"/> + <import file="../tools/etc/buildmagic/libraries.xml"/> + <import file="../tools/etc/buildmagic/modules.xml"/> + + <!-- ======================================================== --> + <!-- Initialization --> + <!-- ======================================================== --> + <tstamp> + <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> + </tstamp> + <echo message="${TIMENOW}" file="run.tstamp"/> + + <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 + and ${hostname} by default. If you cannot route multicast traffic between + localhost and hostname, then you need to specify node0 and node1 binding + in the local.properties that can in order to be able to run the clustering + tests. + --> + <condition property="hostname" value="${env.COMPUTERNAME}"> <os family="windows"/> - </not> - </condition> - <!-- Cluster node0 defaults --> - <property name="node0" value="localhost"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <!-- Cluster node1 defaults --> - <property name="node1" value="${hostname}"/> - <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 --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="testsuite"/> - <property name="module.Name" value="JBoss Testsuite"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - <!-- The combined library classpath --> - <path id="library.classpath"> - <path refid="apache.avalon.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="ibm.wsdl4j.classpath"/> - <path refid="jacorb.jacorb.classpath"/> - <path refid="jgroups.jgroups.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="junitejb.junitejb.classpath"/> - <path refid="javassist.classpath"/> - <path refid="sun.jaf.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="trove.classpath"/> - - <!-- needed for JBossMQ selector tests --> - <path refid="gnu.regexp.classpath"/> - - <!-- needed for proxy tests --> - <path refid="apache.bcel.classpath"/> - <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - - <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> - <path refid="odmg.classpath"/> - <path refid="cglib.classpath"/> - </path> - - <!-- ======= --> - <!-- 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 - the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> - <property name="jboss.internal-server.root" value="${project.root}/server/output"/> - <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> - <path id="jboss.internal-server.classpath"> - <pathelement path="${jboss.server.lib}/jboss.jar"/> - <pathelement path="${jboss.server.lib}/jboss-system.jar"/> - </path> - - <!-- The combined dependant module classpath --> - <path id="dependentmodule.classpath"> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jboss.cluster.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.hibernate.classpath"/> - <path refid="jboss.iiop.classpath"/> - <path refid="jboss.internal-server.classpath"/> - <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jaxrpc.classpath"/> - <path refid="jboss.jbossnet.classpath"/> - <path refid="jboss.jca.classpath"/> - <path refid="jboss.jmx.classpath"/> - <path refid="jboss.management.classpath"/> - <path refid="jboss.media.classpath"/> - <path refid="jboss.messaging.classpath"/> - <path refid="jboss.naming.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.transaction.classpath"/> - <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> - </path> - - <!-- RMI Stub generation --> - <patternset id="rmic.includes" - description="The patternset passed to the compile-stubs target"> - <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> - <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> - <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> - <include name="org/jboss/test/jmx/invoker/Listener.class"/> - </patternset> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <!-- Where source files live --> - <property name="source.java" value="${module.source}/main"/> - <property name="source.etc" value="${module.source}/etc"/> - <property name="source.docs" value="${module.source}/docs"/> - <property name="source.resources" value="${module.source}/resources"/> - <property name="source.stylesheets" value="${module.source}/stylesheets"/> - - <!-- Where build generated files will go --> - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.docs" value="${module.output}/docs"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.stylesheets" value="${module.output}/stylesheets"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> - - <!--xdoclet output directories--> - <property name="build.gen-src" value="${module.output}/gen-src/"/> - <!-- put ejb-jar.xml and other resources into build.resources--> - - <!-- Install/Release structure --> - <property name="install.id" value="${module.name}-${module.version}"/> - <property name="release.id" value="${install.id}"/> - <property name="install.root" value="${module.output}/${install.id}"/> - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - </path> - - <path id="javac.classpath"> - <path refid="thirdparty.classpath"/> - </path> - - <!-- classpath and local.classpath must have a value using with a path --> - <property name="classpath" value=""/> - <property name="local.classpath" value=""/> - - <!-- Classpath to build and run the tests --> - <path id="tests.classpath"> - <pathelement path="${classpath}"/> - <pathelement path="${local.classpath}"/> - <pathelement path="${project.tools}/lib/ant.jar"/> - <pathelement path="${project.tools}/lib/optional.jar"/> - <path refid="jboss.jmx.classpath"/> - <path refid="thirdparty.classpath"/> - </path> - - <!-- The classpath required to build javadocs. --> - <path id="javadoc.classpath"> - <path refid="tests.classpath"/> - </path> - - <!-- Packages to include when generating api documentation --> - <property name="javadoc.packages" value="org.jboss.*"/> - - <!-- Override JUnit defaults --> - <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> - <property name="jbosstest.iterationcount" value="10"/> - <property name="jbosstest.threadcount" value="5"/> - <property name="jbosstest.beancount" value="5"/> - <property name="jbosstest.nodeploy" value="false"/> - <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> - <!-- Override JUnit Marathon defaults --> - <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> - <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> - <property name="marathon.threadcount" value="100"/> - - <!-- xdoclet --> - <path id="xdoclet.task.classpath"> - <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> - - <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> - - <target name="init"> - <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> - <!-- Setup the version 1 classes so the tests compile --> - <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> - <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" - file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" - overwrite="false"/> - <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> - <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" - file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" - overwrite="false"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - <import file="imports/code-generation.xml"/> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - <target name="compile" - depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" - description="Compile all source files."/> - - <!-- Compile all class files --> - <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> - </target> - - <target name="compile-classes-only"> - <mkdir dir="${build.classes}"/> - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - source="${javac.source}" - target="${javac.target}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${source.java}"/> - <src path="${build.gen-src}"/> - <classpath refid="tests.classpath"/> - </javac> - </target> - - <target name="compile-stubs"> - <rmic base="${build.classes}" - sourcebase="${build.classes}" - verify="${rmic.verify}" - iiop="${rmic.iiop}" - iiopopts="${rmic.iiopopts}" - idl="${rmic.idl}" - idlopts="${rmic.idlops}" - debug="${rmic.debug}" - stubVersion="${rmic.stubVersion}" - > - <classpath refid="tests.classpath"/> - <patternset refid="rmic.includes"/> - </rmic> - </target> - - <!-- Compile resource files --> - <target name="compile-resources"> - <mkdir dir="${build.resources}"/> - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${source.resources}"> - <include name="**/*"/> - </fileset> - </copy> - </target> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not> + <os family="windows"/> + </not> + </condition> + <!-- Cluster node0 defaults --> + <property name="node0" value="localhost"/> + <property name="node0.http.url" value="http://${node0}:8080"/> + <property name="node0.jndi.url" value="jnp://${node0}:1099"/> + <!-- Cluster node1 defaults --> + <property name="node1" value="${hostname}"/> + <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 --> + <!-- =================== --> + + <!-- Module name(s) & version --> + <property name="module.name" value="testsuite"/> + <property name="module.Name" value="JBoss Testsuite"/> + <property name="module.version" value="DEV"/> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + <!-- The combined library classpath --> + <path id="library.classpath"> + <path refid="apache.avalon.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="ibm.wsdl4j.classpath"/> + <path refid="jacorb.jacorb.classpath"/> + <path refid="jgroups.jgroups.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="junitejb.junitejb.classpath"/> + <path refid="javassist.classpath"/> + <path refid="sun.jaf.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="sun.servlet.classpath"/> + <path refid="trove.classpath"/> - <!-- Compile stylesheets files --> - <target name="compile-stylesheets"> - <mkdir dir="${build.stylesheets}"/> - <copy todir="${build.stylesheets}" filtering="yes"> - <fileset dir="${source.stylesheets}"> - <include name="**/*"/> - </fileset> - </copy> - </target> + <!-- needed for JBossMQ selector tests --> + <path refid="gnu.regexp.classpath"/> - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc"> - <mkdir dir="${build.etc}"/> - <copy todir="${build.etc}" filtering="yes"> - <fileset dir="${source.etc}"> - <include name="**/*"/> - </fileset> - </copy> - </target> + <!-- needed for proxy tests --> + <path refid="apache.bcel.classpath"/> + <!-- needed for security login module tests --> + <path refid="hsqldb.hsqldb.classpath"/> + + <!-- Need hibernate jar for hibernate-based tests --> + <path refid="hibernate2.classpath"/> + <path refid="odmg.classpath"/> + <path refid="cglib.classpath"/> + </path> + + <!-- ======= --> + <!-- 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 + the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> + <property name="jboss.internal-server.root" value="${project.root}/server/output"/> + <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> + <path id="jboss.internal-server.classpath"> + <pathelement path="${jboss.server.lib}/jboss.jar"/> + <pathelement path="${jboss.server.lib}/jboss-system.jar"/> + </path> + <!-- The combined dependant module classpath --> + <path id="dependentmodule.classpath"> + <path refid="jboss.aop.classpath"/> + <path refid="jboss.aspects.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jboss.cluster.classpath"/> + <path refid="jboss.common.classpath"/> + <path refid="jboss.hibernate.classpath"/> + <path refid="jboss.iiop.classpath"/> + <path refid="jboss.internal-server.classpath"/> + <path refid="jboss.j2ee.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> + <path refid="jboss.jbossnet.classpath"/> + <path refid="jboss.jca.classpath"/> + <path refid="jboss.jmx.classpath"/> + <path refid="jboss.management.classpath"/> + <path refid="jboss.media.classpath"/> + <path refid="jboss.messaging.classpath"/> + <path refid="jboss.naming.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="jboss.security.classpath"/> + <path refid="jboss.server.classpath"/> + <path refid="jboss.system.classpath"/> + <path refid="jboss.transaction.classpath"/> + <path refid="jboss.varia.classpath"/> + <path refid="jboss.webservice.classpath"/> + </path> + + <!-- RMI Stub generation --> + <patternset id="rmic.includes" + description="The patternset passed to the compile-stubs target"> + <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> + <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> + <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/jmx/invoker/Listener.class"/> + </patternset> + + <!-- ===== --> + <!-- Tasks --> + <!-- ===== --> + + <!-- Where source files live --> + <property name="source.java" value="${module.source}/main"/> + <property name="source.etc" value="${module.source}/etc"/> + <property name="source.docs" value="${module.source}/docs"/> + <property name="source.resources" value="${module.source}/resources"/> + <property name="source.stylesheets" value="${module.source}/stylesheets"/> + + <!-- Where build generated files will go --> + <property name="build.classes" value="${module.output}/classes"/> + <property name="build.lib" value="${module.output}/lib"/> + <property name="build.api" value="${module.output}/api"/> + <property name="build.etc" value="${module.output}/etc"/> + <property name="build.docs" value="${module.output}/docs"/> + <property name="build.resources" value="${module.output}/resources"/> + <property name="build.stylesheets" value="${module.output}/stylesheets"/> + <property name="build.reports" value="${module.output}/reports"/> + <property name="build.testlog" value="${module.output}/log"/> + + <!--xdoclet output directories--> + <property name="build.gen-src" value="${module.output}/gen-src/"/> + <!-- put ejb-jar.xml and other resources into build.resources--> + + <!-- Install/Release structure --> + <property name="install.id" value="${module.name}-${module.version}"/> + <property name="release.id" value="${install.id}"/> + <property name="install.root" value="${module.output}/${install.id}"/> + + <!-- The combined thirdparty classpath --> + <path id="thirdparty.classpath"> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </path> + + <path id="javac.classpath"> + <path refid="thirdparty.classpath"/> + </path> + + <!-- classpath and local.classpath must have a value using with a path --> + <property name="classpath" value=""/> + <property name="local.classpath" value=""/> + + <!-- Classpath to build and run the tests --> + <path id="tests.classpath"> + <pathelement path="${classpath}"/> + <pathelement path="${local.classpath}"/> + <pathelement path="${project.tools}/lib/ant.jar"/> + <pathelement path="${project.tools}/lib/optional.jar"/> + <path refid="jboss.jmx.classpath"/> + <path refid="thirdparty.classpath"/> + </path> + + <!-- The classpath required to build javadocs. --> + <path id="javadoc.classpath"> + <path refid="tests.classpath"/> + </path> + + <!-- Packages to include when generating api documentation --> + <property name="javadoc.packages" value="org.jboss.*"/> + + <!-- Override JUnit defaults --> + <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> + <property name="jbosstest.iterationcount" value="10"/> + <property name="jbosstest.threadcount" value="5"/> + <property name="jbosstest.beancount" value="5"/> + <property name="jbosstest.nodeploy" value="false"/> + <property name="junit.batchtest.todir" value="${build.reports}"/> + <property name="junit.jvm.options" value="-Ddummy"/> + <!-- Override JUnit Marathon defaults --> + <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> + <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> + <property name="marathon.threadcount" value="100"/> + + <!-- xdoclet --> + <path id="xdoclet.task.classpath"> + <path refid="tests.classpath"/> + <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> - <!-- Import the test jars build targets --> - <import file="imports/test-jars.xml"/> + <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> - <!-- Import the jboss server run targets --> - <import file="imports/server-config.xml"/> + <target name="init"> + <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> + <!-- Setup the version 1 classes so the tests compile --> + <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> + <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" + file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" + overwrite="false"/> + <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> + <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" + file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" + overwrite="false"/> + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + <import file="imports/code-generation.xml"/> + + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + <target name="compile" + depends="init, compile-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources" + description="Compile all source files."/> + + <!-- Compile all class files --> + <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> + </target> + + <target name="compile-classes-only"> + <mkdir dir="${build.classes}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="${javac.source}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + </javac> + </target> + + <target name="compile-stubs"> + <rmic base="${build.classes}" + sourcebase="${build.classes}" + verify="${rmic.verify}" + iiop="${rmic.iiop}" + iiopopts="${rmic.iiopopts}" + idl="${rmic.idl}" + idlopts="${rmic.idlops}" + debug="${rmic.debug}" + stubVersion="${rmic.stubVersion}" + > + <classpath refid="tests.classpath"/> + <patternset refid="rmic.includes"/> + </rmic> + </target> + + <!-- Compile resource files --> + <target name="compile-resources"> + <mkdir dir="${build.resources}"/> + <copy todir="${build.resources}" filtering="no"> + <fileset dir="${source.resources}"> + <include name="**/*"/> + </fileset> + </copy> + </target> + + <!-- Compile stylesheets files --> + <target name="compile-stylesheets"> + <mkdir dir="${build.stylesheets}"/> + <copy todir="${build.stylesheets}" filtering="yes"> + <fileset dir="${source.stylesheets}"> + <include name="**/*"/> + </fileset> + </copy> + </target> + + <!-- Compile etc files (manifests and such) --> + <target name="compile-etc"> + <mkdir dir="${build.etc}"/> + <copy todir="${build.etc}" filtering="yes"> + <fileset dir="${source.etc}"> + <include name="**/*"/> + </fileset> + </copy> + </target> + + + <!-- Import the test jars build targets --> + <import file="imports/test-jars.xml"/> + + <!-- Import the jboss server run targets --> + <import file="imports/server-config.xml"/> + + <!-- ================================================================== --> + <!-- Cleaning --> + <!-- ================================================================== --> + + <!-- Clean up all build output --> + <target name="clea... [truncated message content] |
From: Thomas D. <tdi...@us...> - 2004-11-26 07:14:29
|
User: tdiesler Date: 04/11/25 23:14:22 Modified: . build.xml Log: Synch webservice changes going into JBoss_4_0_1 with head Revision Changes Path 1.429 +8 -9 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.428 retrieving revision 1.429 diff -u -r1.428 -r1.429 --- build.xml 16 Nov 2004 19:04:20 -0000 1.428 +++ build.xml 26 Nov 2004 07:14:21 -0000 1.429 @@ -71,20 +71,21 @@ <path refid="apache.avalon.classpath"/> <path refid="apache.commons.classpath"/> <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> + <path refid="apache.xerces.classpath"/> <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.classpath"/> <path refid="ibm.wsdl4j.classpath"/> <path refid="jacorb.jacorb.classpath"/> <path refid="jgroups.jgroups.classpath"/> <path refid="junit.junit.classpath"/> <path refid="junitejb.junitejb.classpath"/> <path refid="javassist.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="sun.jaf.classpath"/> <path refid="sun.javamail.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="trove.classpath"/> + <path refid="wutka.dtdparser.classpath"/> <!-- needed for JBossMQ selector tests --> <path refid="gnu.regexp.classpath"/> @@ -576,7 +577,7 @@ <antcall target="tests-jbossmx-implementation"/> <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> - <antcall target="tests-webservices" /> + <antcall target="tests-webservice" /> <!-- <antcall target="tests-jaxr" />--> <stop-jboss/> <wait-on-shutdown conf="all" /> @@ -1688,11 +1689,9 @@ </target> <!-- Run the Web Services Tests--> - <target name="tests-webservices" + <target name="tests-webservice" description="Execute Web Services Related Tests"> - <echo message="java.endorsed.dirs=${jboss.dist}/lib/endorsed"/> - <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" @@ -2019,7 +2018,7 @@ | of the unit test using the test property, -Dtest=org.jboss.test.... | Here you specify the testcase class, not the directory --> - <target name="one-test" depends="maybejars" if="test" + <target name="one-test" depends="init" if="test" description="Execute a single test."> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
From: Scott M S. <st...@us...> - 2004-12-01 01:29:59
|
User: starksm Date: 04/11/30 17:29:52 Modified: . build.xml Log: Update the tests-jacc-security to use the jacc.includes patternset Revision Changes Path 1.430 +10 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- build.xml 26 Nov 2004 07:14:21 -0000 1.429 +++ build.xml 1 Dec 2004 01:29:52 -0000 1.430 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.429 2004/11/26 07:14:21 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.430 2004/12/01 01:29:52 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -453,6 +453,13 @@ <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> <!-- Tests needing non-clustered tomcat SSO --> <patternset id="tc-sso.includes"> <include name="org/jboss/test/web/test/SingleSignOnUnitTestCase.class"/> @@ -508,6 +515,7 @@ <patternset refid="cluster.excludes"/> <patternset refid="security.excludes"/> <patternset refid="securitymgr.excludes"/> + <patternset refid="jacc.excludes"/> <patternset refid="tc-sso.excludes"/> <patternset refid="tc-sso-clustered.excludes"/> <patternset refid="tc-ssl.excludes"/> @@ -1263,8 +1271,7 @@ fork="true"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/> - <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/> + <patternset refid="jacc.includes"/> </fileset> </batchtest> </junit> |
From: Scott M S. <st...@us...> - 2004-12-01 03:08:42
|
User: starksm Date: 04/11/30 19:08:35 Modified: . Tag: Branch_4_0 build.xml Log: Update the tests-jacc-security to use the jacc.includes patternset Revision Changes Path No revision No revision 1.406.2.27 +10 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.26 retrieving revision 1.406.2.27 diff -u -r1.406.2.26 -r1.406.2.27 --- build.xml 24 Nov 2004 05:28:02 -0000 1.406.2.26 +++ build.xml 1 Dec 2004 03:08:34 -0000 1.406.2.27 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.26 2004/11/24 05:28:02 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.27 2004/12/01 03:08:34 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -453,6 +453,13 @@ <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> <!-- Tests needing non-clustered tomcat SSO --> <patternset id="tc-sso.includes"> <include name="org/jboss/test/web/test/SingleSignOnUnitTestCase.class"/> @@ -515,6 +522,7 @@ <patternset refid="cluster.excludes"/> <patternset refid="security.excludes"/> <patternset refid="securitymgr.excludes"/> + <patternset refid="jacc.excludes"/> <patternset refid="tc-sso.excludes"/> <patternset refid="tc-sso-clustered.excludes"/> <patternset refid="tc-ssl.excludes"/> @@ -1358,8 +1366,7 @@ fork="true"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/> - <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/> + <patternset refid="jacc.includes"/> </fileset> </batchtest> </junit> |
From: Thomas D. <tdi...@us...> - 2004-12-02 10:52:27
|
User: tdiesler Date: 04/12/02 02:52:17 Modified: . Tag: Branch_3_2 build.xml Log: Remove duplicate instance of xerces from thirdparty Revision Changes Path No revision No revision 1.165.2.173 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.172 retrieving revision 1.165.2.173 diff -u -r1.165.2.172 -r1.165.2.173 --- build.xml 12 Nov 2004 03:27:39 -0000 1.165.2.172 +++ build.xml 2 Dec 2004 10:52:14 -0000 1.165.2.173 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.172 2004/11/12 03:27:39 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.173 2004/12/02 10:52:14 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -73,7 +73,7 @@ <path refid="sun.javamail.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="apache.avalon.classpath"/> - <path refid="apache.xalan.classpath"/> + <path refid="apache.xerces.classpath"/> <path refid="apache.commons.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="oswego.concurrent.classpath"/> |
From: Thomas D. <tdi...@us...> - 2004-12-17 10:41:31
|
User: tdiesler Date: 04/12/17 02:41:23 Modified: . Tag: Branch_3_2 build.xml Log: Remove dependency of one-test on maybejars Revision Changes Path No revision No revision 1.165.2.174 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.173 retrieving revision 1.165.2.174 diff -u -r1.165.2.173 -r1.165.2.174 --- build.xml 2 Dec 2004 10:52:14 -0000 1.165.2.173 +++ build.xml 17 Dec 2004 10:41:21 -0000 1.165.2.174 @@ -1639,7 +1639,7 @@ | of the unit test using the test property, -Dtest=org.jboss.test.... | Here you specify the testcase class, not the directory --> - <target name="one-test" depends="maybejars" if="test" + <target name="one-test" if="test" description="Execute a single test."> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
From: Scott M S. <st...@us...> - 2004-12-20 17:56:24
|
User: starksm Date: 04/12/20 09:56:13 Modified: . Tag: Branch_4_0 build.xml Log: Include org/jboss/test/jmx/invoker/BadListener.class in the rmic patternset Revision Changes Path No revision No revision 1.406.2.28 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.27 retrieving revision 1.406.2.28 diff -u -r1.406.2.27 -r1.406.2.28 --- build.xml 1 Dec 2004 03:08:34 -0000 1.406.2.27 +++ build.xml 20 Dec 2004 17:56:11 -0000 1.406.2.28 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.27 2004/12/01 03:08:34 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.28 2004/12/20 17:56:11 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -149,6 +149,7 @@ <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/jmx/invoker/BadListener.class"/> <include name="org/jboss/test/jmx/invoker/Listener.class"/> </patternset> |
From: Scott M S. <st...@us...> - 2004-12-20 17:57:00
|
User: starksm Date: 04/12/20 09:56:52 Modified: . build.xml Log: Include org/jboss/test/jmx/invoker/BadListener.class in the rmic patternset Revision Changes Path 1.431 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.430 retrieving revision 1.431 diff -u -r1.430 -r1.431 --- build.xml 1 Dec 2004 01:29:52 -0000 1.430 +++ build.xml 20 Dec 2004 17:56:51 -0000 1.431 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.430 2004/12/01 01:29:52 starksm Exp $ --> +<!-- $Id: build.xml,v 1.431 2004/12/20 17:56:51 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -148,6 +148,7 @@ <include name="org/jboss/test/cluster/test/DistributedStateTestCase$TestListener.class"/> <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/jmx/invoker/BadListener.class"/> <include name="org/jboss/test/jmx/invoker/Listener.class"/> </patternset> |
From: Scott M S. <st...@us...> - 2004-12-21 02:26:00
|
User: starksm Date: 04/12/20 18:25:51 Modified: . Tag: Branch_4_0 build.xml Log: Use the server java.endorsed.dirs lib in the one-test target. Revision Changes Path No revision No revision 1.406.2.29 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.28 retrieving revision 1.406.2.29 diff -u -r1.406.2.28 -r1.406.2.29 --- build.xml 20 Dec 2004 17:56:11 -0000 1.406.2.28 +++ build.xml 21 Dec 2004 02:25:48 -0000 1.406.2.29 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.28 2004/12/20 17:56:11 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.29 2004/12/21 02:25:48 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2253,6 +2253,7 @@ jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> |