User: starksm
Date: 01/05/05 13:54:05
Modified: src/build build.xml run_tests.xml
Log:
Make the build more modular to allow individual test packages to
be built and run
Revision Changes Path
1.26 +132 -358 jbosstest/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 2001/04/30 14:17:14 1.25
+++ build.xml 2001/05/05 20:54:05 1.26
@@ -1,15 +1,14 @@
<?xml version="1.0"?>
<!-- ======================================================================= -->
-<!-- jBoss build file -->
+<!-- JBossTest master build file -->
<!-- ======================================================================= -->
-<project name="jBossTest" default="main" basedir="../.." >
- <target name="init">
- <property name="Name" value="jBossTest"/>
+<project name="JBossTest" default="main" basedir="../.." >
+
+ <property name="Name" value="JBossTest"/>
<property name="name" value="jbosstest"/>
<property name="version" value="1.0"/>
-
<property name="bin.dir" value="${basedir}/bin"/>
<property name="src.bin.dir" value="${basedir}/src/bin"/>
<property name="src.dir" value="${basedir}/src/main"/>
@@ -28,18 +27,31 @@
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
<property name="dist.dir" value="dist"/>
-
- <property name="classpath"
value="${src.lib.dir}/jaas.jar;${src.lib.dir}/jmxri.jar;${build.classes.dir};${src.lib.dir}/jndi.jar;${src.lib.dir}/jboss-j2ee.jar;${src.lib.dir}/jnp.jar;${src.lib.dir}/junit.jar;${src.lib.dir}/deploy.jar;${src.lib.dir}/jboss-jdbc_ext.jar;${src.lib.dir}/servlet.jar;${src.lib.dir}/jbossmq-client.jar;${src.lib.dir}/log4j.jar;${src.lib.dir}/jbosssx-client.jar"/>
<property name="packages" value="org.*"/>
-
+ <path id="base.path">
+ <pathelement location="${src.lib.dir}/jaas.jar" />
+ <pathelement location="${src.lib.dir}/jmxri.jar" />
+ <pathelement location="${src.lib.dir}/ejb.jar" />
+ <pathelement location="${src.lib.dir}/jndi.jar" />
+ <pathelement location="${src.lib.dir}/jboss-j2ee.jar" />
+ <pathelement location="${src.lib.dir}/jnp.jar" />
+ <pathelement location="${src.lib.dir}/junit.jar" />
+ <pathelement location="${src.lib.dir}/deploy.jar" />
+ <pathelement location="${src.lib.dir}/jboss-jdbc_ext.jar" />
+ <pathelement location="${src.lib.dir}/servlet.jar" />
+ <pathelement location="${src.lib.dir}/jms.jar" />
+ <pathelement location="${src.lib.dir}/jbossmq-client.jar" />
+ <pathelement location="${src.lib.dir}/jbosssx-client.jar" />
+ <pathelement location="${src.lib.dir}/log4j.jar" />
+ <pathelement location="${build.classes.dir}" />
+ </path>
+ <property name="classpath" refid="base.path"/>
<property name="build.compiler" value="classic"/>
-
- </target>
<!-- =================================================================== -->
<!-- Prepares the build directory -->
<!-- =================================================================== -->
- <target name="prepare" depends="init">
+ <target name="prepare">
<mkdir dir="${build.dir}"/>
</target>
@@ -63,345 +75,95 @@
<target name="jar" depends="compile">
<mkdir dir="${build.lib.dir}"/>
<mkdir dir="${build.deploy.dir}"/>
-
- <!-- Bank test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/bank"/>
- </copy>
- <jar jarfile="${build.lib.dir}/banktest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/bank/interfaces/**,org/jboss/test/bank/test/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/bank.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/util/ejb/**,org/jboss/test/bank/interfaces/**,org/jboss/test/bank/ejb/**,**/*.xml"
- />
-
- <!-- Hello test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/hello"/>
- </copy>
- <jar jarfile="${build.lib.dir}/hellotest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/hello/interfaces/**,org/jboss/test/hello/test/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/hello.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/util/ejb/**,org/jboss/test/hello/interfaces/**,org/jboss/test/hello/ejb/**,**/*.xml"
- />
-
- <!-- IdGenerator test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/idgen"/>
- </copy>
- <jar jarfile="${build.lib.dir}/idgentest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/idgen/interfaces/**,org/jboss/test/idgen/test/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/idgen.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/util/ejb/**,org/jboss/test/idgen/interfaces/**,org/jboss/test/idgen/ejb/**,**/*.xml"
- />
-
- <!-- CTS (Compatibility Test Suite) test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/cts"/>
- </copy>
- <jar jarfile="${build.lib.dir}/ctstest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/util/ejb/BeanContextInfo.class,org/jboss/test/cts/jms/**,org/jboss/test/cts/keys/**,org/jboss/test/cts/interfaces/**,org/jboss/test/cts/test/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/cts.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/util/**,org/jboss/test/cts/jms/**,org/jboss/test/cts/interfaces/**,org/jboss/test/cts/keys/**,org/jboss/test/cts/ejb/**,**/*.xml"
- />
-
- <!-- Performance test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/perf"/>
- </copy>
- <jar jarfile="${build.lib.dir}/perftest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/test/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/perf.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/ejb/**,**/*.xml"
- />
-
- <!-- TestBean test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/testbean"/>
- </copy>
- <jar jarfile="${build.lib.dir}/testbeantest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean/test/**,org/jboss/test/testbean2/interfaces/**,*.*,org/somepackage/**,org/jboss/test/bmp/interfaces/**"
- />
-
- <jar jarfile="${build.deploy.dir}/testbean.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean2/interfaces/**,org/jboss/test/testbean/bean/**,**/*.xml,org/somepackage/**"
- />
-
- <!-- TestBean2 test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/testbean2"/>
- </copy>
- <jar jarfile="${build.deploy.dir}/testbean2.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/testbean2/interfaces/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean2/bean/**,**/*.xml"
- />
-
- <!-- dbtest -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/dbtest"/>
- </copy>
- <jar jarfile="${build.lib.dir}/dbtestclient.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/test/**"
- />
-
- <jar jarfile="${build.deploy.dir}/dbtest.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/bean/**,**/*.xml"
- />
-
- <!-- locktest -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/lock"/>
- </copy>
- <jar jarfile="${build.lib.dir}/locktestclient.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/lock/interfaces/**,org/jboss/test/lock/test/**"
- />
-
- <jar jarfile="${build.deploy.dir}/locktest.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/lock/interfaces/**,org/jboss/test/lock/bean/**,**/*.xml"
- />
-
-
- <!-- load test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <jar jarfile="${build.lib.dir}/load.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/load/test/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/bmp/interfaces/**"
- />
- <!-- xa test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <jar jarfile="${build.deploy.dir}/xatest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
-
includes="org/jboss/test/xa/test/**,org/jboss/xa/bean/**,org/jboss/test/xa/interfaces/**"
- />
-
- <!-- bmp test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/bmp"/>
- </copy>
- <jar jarfile="${build.lib.dir}/bmptest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/test/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/bmp.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/beans/**,**/*.xml"
- />
-
- <!-- benchmark test -->
- <mkdir dir="${build.dir}/bench"/>
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/bench/ejb"/>
- </copy>
- <jar jarfile="${build.dir}/bench/bench.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/bench/interfaces/**,org/jboss/test/bench/ejb/**,**/*.xml"
- />
-
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.dir}/web">
- <fileset dir="${src.resources}/bench/web"/>
- </copy>
- <copy todir="${build.dir}/web/WEB-INF/classes/org/jboss/test/bench/servlet">
- <fileset dir="${build.classes.dir}/org/jboss/test/bench/servlet"/>
- </copy>
- <jar jarfile="${build.dir}/bench/bench.war"
- basedir="${build.dir}/web"
- manifest="${src.resources}/bench/web.mf"
- includes="**"
- />
-
- <delete dir="${build.classes.dir}/META-INF"/>
- <delete dir="${build.classes.dir}/WEB-INF"/>
- <copy todir="${build.dir}/bench">
- <fileset dir="${src.resources}/bench/ear"/>
- </copy>
- <jar jarfile="${build.deploy.dir}/bench.ear"
- basedir="${build.dir}/bench"
- includes="bench.jar,bench.war,META-INF/**"
- />
-
- <!-- MDB test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/mdb"/>
- </copy>
- <jar jarfile="${build.lib.dir}/mdbtest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/mdb/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/mdb.jar"
- basedir="${build.classes.dir}"
- includes="org/jboss/test/mdb/bean/**,**/*.xml"
- />
-
- <!-- spyderMQ test -->
- <jar jarfile="${build.lib.dir}/spydermqtest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/spydermq/**,*.*"
- />
-
- <!-- JRMP custom socket tests -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/jrmp" />
- </copy>
- <jar jarfile="${build.lib.dir}/jrmp-comp-client.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf" >
- <include name="org/jboss/test/jrmp/interfaces/**" />
- </jar>
- <jar jarfile="${build.lib.dir}/comp-sockets.jar"
- basedir="${build.classes.dir}" >
- <include name="org/jboss/test/jrmp/ejb/Compression*.class" />
- </jar>
- <jar jarfile="${build.deploy.dir}/jrmp-comp.jar"
- basedir="${build.classes.dir}" >
- <include name="org/jboss/test/jrmp/ejb/**" />
- <include name="org/jboss/test/jrmp/interfaces/**" />
- <include name="**/ejb-jar.xml" />
- <include name="**/jboss.xml" />
- <exclude name="org/jboss/test/jrmp/ejb/Compression*.class" />
- </jar>
-
- <!-- Naming ENC Tests -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${src.resources}/naming/META-INF/ejb-jar.xml"
- todir="${build.classes.dir}/META-INF" />
- <copy file="${src.resources}/naming/META-INF/jboss.xml"
- todir="${build.classes.dir}/META-INF" />
- <jar jarfile="${build.deploy.dir}/naming.jar"
- basedir="${build.classes.dir}" >
- <include name="org/jboss/test/naming/ejb/**" />
- <include name="org/jboss/test/naming/interfaces/**" />
- <include name="**/ejb-jar.xml" />
- <include name="**/jboss.xml" />
- </jar>
- <copy file="${src.resources}/naming/META-INF/remote-ejb-jar.xml"
- tofile="${build.classes.dir}/META-INF/ejb-jar.xml" overwrite="yes" />
- <copy file="${src.resources}/naming/META-INF/remote-jboss.xml"
- tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="yes" />
- <jar jarfile="${build.deploy.dir}/remote-naming.jar"
- basedir="${build.classes.dir}" >
- <include name="org/jboss/test/naming/ejb/**" />
- <include name="org/jboss/test/naming/interfaces/**" />
- <include name="**/ejb-jar.xml" />
- <include name="**/jboss.xml" />
- </jar>
-
- <!-- JBossSX/Security tests -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/security" />
- </copy>
- <jar jarfile="${build.lib.dir}/security-client.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf" >
- <include name="org/jboss/test/security/interfaces/**" />
- </jar>
- <jar jarfile="${build.deploy.dir}/security.jar"
- basedir="${build.classes.dir}" >
- <include name="org/jboss/test/security/ejb/**" />
- <include name="org/jboss/test/security/interfaces/**" />
- <include name="org/jboss/test/security/proxy/*" />
- <include name="org/jboss/test/security/test/Namespace*" />
- <include name="org/jboss/test/security/test/PermissionName*.class" />
- <include name="**/ejb-jar.xml" />
- <include name="**/jboss.xml" />
- <include name="users.properties" />
- <include name="roles.properties" />
- </jar>
-
- <move file="${build.classes.dir}/META-INF/jboss-spec.xml"
tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="true" />
- <jar jarfile="${build.deploy.dir}/security-spec.jar"
- basedir="${build.classes.dir}" >
- <include name="org/jboss/test/security/ejb/**" />
- <include name="org/jboss/test/security/interfaces/**" />
- <include name="org/jboss/test/security/proxy/*" />
- <include name="org/jboss/test/security/test/Namespace*" />
- <include name="org/jboss/test/security/test/PermissionName*.class" />
- <include name="**/ejb-jar.xml" />
- <include name="**/jboss.xml" />
- <include name="users.properties" />
- <include name="roles.properties" />
- </jar>
- <!-- Create a separate jar that contains the security proxy classes.
- These need to be segregated so that they can be assigned a minimal
- Java2 permission set.
- <jar jarfile="${build.lib.dir}/security-proxy.jar"
- basedir="${build.classes.dir}"
- includes="org/jboss/test/security/proxy/*"
- />
- -->
-
- <!-- JMS ra test -->
- <delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/jmsra"/>
- </copy>
- <jar jarfile="${build.lib.dir}/jmsratest.jar"
- basedir="${build.classes.dir}"
- manifest="${etc.dir}/manifest.mf"
- includes="org/jboss/test/jmsra/**,*.*"
- />
-
- <jar jarfile="${build.deploy.dir}/jmsra.jar"
- basedir="${build.classes.dir}"
- includes="org/jboss/test/util/ejb/**,org/jboss/test/jmsra/bean/**,**/*.xml"
- />
- </target>
+ <antcall target="bank-subproject" />
+ <antcall target="hello-subproject" />
+ <antcall target="idgen-subproject" />
+ <antcall target="cts-subproject" />
+ <antcall target="perf-subproject" />
+ <antcall target="bench-subproject" />
+ <antcall target="testbean-subproject" />
+ <antcall target="dbtest-subproject" />
+ <antcall target="lock-subproject" />
+ <antcall target="load-subproject" />
+ <antcall target="xa-subproject" />
+ <antcall target="bmp-subproject" />
+ <antcall target="mdb-subproject" />
+ <antcall target="spydermq-subproject" />
+ <antcall target="jrmp-subproject" />
+ <antcall target="naming-subproject" />
+ <antcall target="security-subproject" />
+ <antcall target="web-subproject" />
+ </target>
+
+ <target name="bank-subproject" depends="prepare">
+ <!-- Bank EJB tests -->
+ <ant antfile="src/build/subprojects/build-bank.xml" />
+ </target>
+ <target name="hello-subproject" depends="prepare">
+ <!-- Hello EJB tests -->
+ <ant antfile="src/build/subprojects/build-hello.xml" />
+ </target>
+ <target name="idgen-subproject" depends="prepare">
+ <!-- IdGenerator EJB tests -->
+ <ant antfile="src/build/subprojects/build-idgen.xml" />
+ </target>
+ <target name="cts-subproject" depends="prepare">
+ <!-- CTS (Compatibility Test Suite) tests -->
+ <ant antfile="src/build/subprojects/build-cts.xml" />
+ </target>
+ <target name="perf-subproject" depends="prepare">
+ <!-- Performance tests -->
+ <ant antfile="src/build/subprojects/build-perf.xml" />
+ </target>
+ <target name="bench-subproject" depends="prepare">
+ <!-- benchmark tests -->
+ <ant antfile="src/build/subprojects/build-bench.xml" />
+ </target>
+ <target name="testbean-subproject" depends="prepare">
+ <!-- Testbean/testbean2 tests -->
+ <ant antfile="src/build/subprojects/build-testbean.xml" />
+ </target>
+ <target name="dbtest-subproject" depends="prepare">
+ <!-- DB tests -->
+ <ant antfile="src/build/subprojects/build-dbtest.xml" />
+ </target>
+ <target name="lock-subproject" depends="prepare">
+ <!-- Lock tests -->
+ <ant antfile="src/build/subprojects/build-lock.xml" />
+ </target>
+ <target name="load-subproject" depends="prepare">
+ <!-- Load tests -->
+ <ant antfile="src/build/subprojects/build-load.xml" />
+ </target>
+ <target name="xa-subproject" depends="prepare">
+ <ant antfile="src/build/subprojects/build-xa.xml" />
+ </target>
+ <target name="bmp-subproject" depends="prepare">
+ <ant antfile="src/build/subprojects/build-bmp.xml" />
+ </target>
+ <target name="mdb-subproject" depends="prepare">
+ <ant antfile="src/build/subprojects/build-mdb.xml" />
+ </target>
+ <target name="spydermq-subproject" depends="prepare">
+ <ant antfile="src/build/subprojects/build-spydermq.xml" />
+ </target>
+ <target name="jrmp-subproject" depends="prepare">
+ <!-- JRMP custom socket tests -->
+ <ant antfile="src/build/subprojects/build-jrmp.xml" />
+ </target>
+ <target name="naming-subproject" depends="prepare">
+ <!-- JNDI Naming/ENC tests -->
+ <ant antfile="src/build/subprojects/build-naming.xml" />
+ </target>
+ <target name="security-subproject" depends="prepare">
+ <!-- JBossSX/Security tests -->
+ <ant antfile="src/build/subprojects/build-security.xml" />
+ </target>
+ <target name="web-subproject" depends="prepare">
+ <!-- Build the web integration testsuite -->
+ <ant antfile="src/build/subprojects/build-web.xml" />
+ </target>
<!-- =================================================================== -->
<!-- Creates the binary structure -->
@@ -412,10 +174,16 @@
<mkdir dir="${dist.dir}/lib"/>
<mkdir dir="${dist.dir}/deploy"/>
- <copydir src="${src.bin.dir}" dest="${dist.dir}/bin"/>
- <copydir src="${src.lib.dir}" dest="${dist.dir}/lib"/>
- <copydir src="${build.deploy.dir}" dest="${dist.dir}/deploy"/>
- <copydir src="${build.lib.dir}" dest="${dist.dir}/lib"/>
+ <copy todir="${dist.dir}/bin">
+ <fileset dir="${src.bin.dir}" />
+ </copy>
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="${src.lib.dir}" />
+ <fileset dir="${build.lib.dir}" />
+ </copy>
+ <copy todir="${dist.dir}/deploy">
+ <fileset dir="${build.deploy.dir}" />
+ </copy>
</target>
<!-- =================================================================== -->
@@ -431,7 +199,7 @@
windowtitle="${Name} API"
doctitle="${Name}"
extdirs="${src.lib.dir}"
- bottom="Copyright © 2000 The jBoss Organization. All Rights
Reserved."
+ bottom="Copyright © 2000 The JBoss Organization. All Rights
Reserved."
/>
</target>
@@ -441,11 +209,17 @@
<target name="dist" depends="main,jar,javadocs">
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/api"/>
- <copydir src="${docs.dir}" dest="${dist.dir}/docs"/>
- <copydir src="${build.javadocs.dir}" dest="${dist.dir}/docs/api"/>
+ <copy todir="${dist.dir}/docs">
+ <fileset dir="${docs.dir}"/>
+ </copy>
+ <copy todir="${dist.dir}/docs/api">
+ <fileset dir="${build.javadocs.dir}"/>
+ </copy>
<mkdir dir="${dist.dir}/src"/>
- <copydir src="${src.dir}" dest="${dist.dir}/src"/>
+ <copy todir="${dist.dir}/src">
+ <fileset dir="${src.dir}"/>
+ </copy>
</target>
<!-- =================================================================== -->
@@ -466,7 +240,7 @@
<!-- =================================================================== -->
<!-- Cleans up generated stuff -->
<!-- =================================================================== -->
- <target name="clean" depends="init">
+ <target name="clean">
<deltree dir="${build.dir}"/>
<deltree dir="${dist.dir}"/>
</target>
1.6 +63 -10 jbosstest/src/build/run_tests.xml
Index: run_tests.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/run_tests.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- run_tests.xml 2001/04/18 18:22:25 1.5
+++ run_tests.xml 2001/05/05 20:54:05 1.6
@@ -2,6 +2,7 @@
<!-- An ant build file for running the test code against a
JBoss server dist
+$Revision: 1.6 $
-->
<project name="JBossUnitTests" default="run-tests" basedir="../../">
@@ -14,7 +15,12 @@
<property name="version" value="1.0"/>
<!-- Default location is based on jboss and jbosstest cvs
- dirs having the same parent dir -->
+ dirs having the same parent dir, e.g.,
+ /local/cvsroot/
+ /local/cvsroot/jboss
+ /local/cvsroot/jboss/dist
+ /local/cvsroot/jbosstest
+ -->
<property name="jboss.home" value="${basedir}/../jboss/dist" />
<property name="jboss.lib" value="${jboss.home}/lib" />
<property name="jboss.lib.ext" value="${jboss.home}/lib/ext" />
@@ -69,12 +75,20 @@
<target name="run-tests" depends="build" if="junit.present">
<antcall target="standard-tests" />
- <!-- Run security tests seperately. Not ready yet.
+
+ <!-- Check if the security setup steps have been performed -->
+ <available property="security.configured"
file="${jboss.home}/bin/SRPVerifierStore.ser" />
+ <!-- Run security tests seperately due to their need for a
+ non-default JBoss server dist. If the security-setup task
+ steps have not been completed these tests will fail.
+ -->
<antcall target="security-tests" />
--->
</target>
- <!-- Look for test/Main.java or test/Test*.java junit tests -->
+ <!-- Standard tests that should run successfully against a default JBoss
+ server distribution build. This target looks for candidate JUnit tests
+ by looking for **/test/Main.java or **/test/Test*.java patterns.
+ -->
<target name="standard-tests">
<junit printsummary="yes" haltonfailure="no" fork="true"
dir="${build.classes.dir}" timeout="120000"
@@ -97,16 +111,32 @@
</junit>
</target>
- <!-- Run security tests with different vm setup.
- The following needs to be configured in the JBoss server dist before
- these tests will run correctly:
- 1. Uncomment all mbeans in the jboss.jcml security section
+ <!-- Setup a JBoss dist with a config suitable for the
+ security-tests task. The config steps consist of:
+ 1. Patch the jboss.jcml security section to enable all mbeans
2. Copy server.policy and sample_policy.xml from resources/security to
the jboss conf/default directory
3. Copy the SRPVerifierStore.ser file from resources/security to the
jboss bin directory
-->
- <target name="security-tests">
+ <target name="security-setup">
+ <patch patchfile="${src.resources}/security/jboss.jcml.patch"
+ originalfile="${jboss.home}/conf/default/jboss.jcml" />
+ <copy file="${src.resources}/security/server.policy"
+ tofile="${jboss.home}/conf/default/server.policy" overwrite="yes" />
+ <copy file="${src.resources}/security/sample_policy.xml"
+ tofile="${jboss.home}/conf/default/sample_policy.xml" />
+ <copy file="${src.resources}/security/SRPVerifierStore.ser"
+ tofile="${jboss.home}/bin/SRPVerifierStore.ser" />
+ </target>
+
+ <!-- Run security tests with different vm setup.
+ The steps performed by the secrity-setup task need to have
+ been executed either manually or by running the security-setup
+ task once on the JBoss dist in order for these tests to
+ complete successfully.
+ -->
+ <target name="security-tests" if="security.configured">
<!-- We need to jar this test up so that the Main2.SecurityDelegate
class is in a speparate jar so that it has a codesource distinct from
the rest of the code. This allows us to remove all the Java2
@@ -161,10 +191,33 @@
</junit>
</target>
+ <!-- Run all tests in the 'testcase' package. For example to run all the tests
+ in the org/jboss/test/cts/test package one would use:
+ ant -buildfile run_tests.xml -Dtestcase=cts run-testcase
+ -->
+ <target name="run-testcase" if="testcase">
+ <junit printsummary="no" haltonfailure="no" fork="true">
+ <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
+ <classpath>
+ <path refid="test.classpath" />
+ <pathelement path="${jboss.lib}/jboss-jaas.jar" />
+ </classpath>
+ <formatter type="plain" usefile="false" />
+ <batchtest>
+ <fileset dir="${src.dir}">
+ <include name="org/jboss/test/${testcase}/test/Test*.java" />
+ <include name="org/jboss/test/${testcase}/test/Main.java" />
+ <include
name="org/jboss/test/${testcase}/test/AllJUnitTests.java" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="test1">
<junit printsummary="yes" haltonfailure="no" fork="true"
dir="${build.classes.dir}" timeout="1200000"
>
+ <jvmarg value="-Dno-deploy=true" />
<jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
<jvmarg value="-Djava.security.manager" />
<jvmarg
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
@@ -176,7 +229,7 @@
</classpath>
<formatter type="plain" usefile="false" />
- <test name="org.jboss.test.security.test.TestNamespacePermissions" />
+ <test name="org.jboss.test.naming.test.TestENC" />
</junit>
</target>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
