Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Scott M S. <st...@us...> - 2003-09-19 19:34:38
|
User: starksm
Date: 03/09/18 23:35:47
Modified: . build.xml
Log:
Merge tests from 3.2
Revision Changes Path
1.292 +55 -46 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- build.xml 13 Sep 2003 07:12:35 -0000 1.291
+++ build.xml 19 Sep 2003 06:35:46 -0000 1.292
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.291 2003/09/13 07:12:35 bwang00 Exp $ -->
+<!-- $Id: build.xml,v 1.292 2003/09/19 06:35:46 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1143,7 +1143,7 @@
<include name="org/jboss/test/util/**"/>
</patternset>
- <patternset id="common.test.application.classes">
+ <patternset id="jboss.test.util.ejb.set">
<include name="org/jboss/test/util/ejb/**"/>
</patternset>
@@ -1167,7 +1167,7 @@
<!-- build bank.jar -->
<jar jarfile="${build.lib}/bank.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bank/interfaces/**"/>
<include name="org/jboss/test/bank/ejb/**"/>
<include name="org/jboss/test/bank/beans/**"/>
@@ -1180,7 +1180,7 @@
<!-- build bank.jar -->
<jar jarfile="${build.lib}/bank-ejb20.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bank/interfaces/**"/>
<include name="org/jboss/test/bank/ejb/**"/>
<include name="org/jboss/test/bank/beans/**"/>
@@ -1211,7 +1211,7 @@
<!-- build banknew.jar -->
<jar jarfile="${build.lib}/banknew.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/banknew/interfaces/**"/>
<include name="org/jboss/test/banknew/ejb/**"/>
<include name="org/jboss/test/banknew/beans/**"/>
@@ -1242,7 +1242,7 @@
<!-- build bankiiop.jar -->
<jar jarfile="${build.lib}/bankiiop.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bankiiop/interfaces/**"/>
<include name="org/jboss/test/bankiiop/ejb/**"/>
<include name="org/jboss/test/bankiiop/beans/**"/>
@@ -1273,7 +1273,7 @@
<!-- build bmp.jar -->
<jar jarfile="${build.lib}/bmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bmp/interfaces/**"/>
<include name="org/jboss/test/bmp/ejb/**"/>
<include name="org/jboss/test/bmp/beans/**"/>
@@ -1327,7 +1327,7 @@
<include name="jboss.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/interfaces/**"/>
<include name="org/jboss/test/cts/ejb/**"/>
<include name="org/jboss/test/cts/beans/**"/>
@@ -1337,8 +1337,7 @@
<include name="org/jboss/test/util/ejb/*"/>
</fileset>
<zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*">
- </zipfileset>
+ includes="junit/**/*.*"/>
</jar>
<!-- build a duplicate cts.jar with new home bindings -->
<jar jarfile="${build.lib}/cts2.jar">
@@ -1347,7 +1346,7 @@
<include name="jboss.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/interfaces/**"/>
<include name="org/jboss/test/cts/ejb/**"/>
<include name="org/jboss/test/cts/beans/**"/>
@@ -1388,7 +1387,7 @@
</jar>
<jar jarfile="${build.lib}/cts-v1cmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
<include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
</fileset>
@@ -1452,7 +1451,7 @@
</jar>
<jar jarfile="${build.lib}/cts-v2cmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
<include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
</fileset>
@@ -1504,7 +1503,7 @@
<!-- build entityexc.jar -->
<jar jarfile="${build.lib}/entityexc.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/entityexc/interfaces/**"/>
<include name="org/jboss/test/entityexc/ejb/**"/>
</fileset>
@@ -1535,7 +1534,7 @@
<jar jarfile="${build.lib}/hello.jar">
<metainf dir="${build.resources}/hello/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hello/interfaces/**"/>
<include name="org/jboss/test/hello/ejb/**"/>
</fileset>
@@ -1563,7 +1562,7 @@
<jar jarfile="${build.lib}/helloiiop.jar">
<metainf dir="${build.resources}/helloiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/helloiiop/interfaces/**"/>
<include name="org/jboss/test/helloiiop/ejb/**"/>
</fileset>
@@ -1591,7 +1590,7 @@
<jar jarfile="${build.lib}/hellojrmpiiop.jar">
<metainf dir="${build.resources}/hellojrmpiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hellojrmpiiop/interfaces/**"/>
<include name="org/jboss/test/hellojrmpiiop/ejb/**"/>
</fileset>
@@ -1619,7 +1618,7 @@
<jar jarfile="${build.lib}/excepiiop.jar">
<metainf dir="${build.resources}/excepiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/excepiiop/interfaces/**"/>
<include name="org/jboss/test/excepiiop/ejb/**"/>
</fileset>
@@ -1646,7 +1645,7 @@
<!-- build idgen.jar -->
<jar jarfile="${build.lib}/idgen.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/idgen/interfaces/**"/>
<include name="org/jboss/test/idgen/ejb/**"/>
<include name="org/jboss/test/idgen/beans/**"/>
@@ -1677,7 +1676,7 @@
<!-- build dbtest.jar -->
<jar jarfile="${build.lib}/dbtest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/dbtest/interfaces/**"/>
<include name="org/jboss/test/dbtest/ejb/**"/>
<include name="org/jboss/test/dbtest/bean/**"/>
@@ -1708,7 +1707,7 @@
<!-- build jmsra.jar -->
<jar jarfile="${build.lib}/jmsra.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jmsra/interfaces/**"/>
<include name="org/jboss/test/jmsra/ejb/**"/>
<include name="org/jboss/test/jmsra/bean/**"/>
@@ -1739,7 +1738,7 @@
<!-- build mdb.jar -->
<jar jarfile="${build.lib}/mdb.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/mdb/bean/**"/>
</fileset>
<fileset dir="${build.resources}/mdb">
@@ -1768,7 +1767,7 @@
<!-- build locktest.jar -->
<jar jarfile="${build.lib}/locktest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/lock/interfaces/**"/>
<include name="org/jboss/test/lock/bean/**"/>
</fileset>
@@ -1798,7 +1797,7 @@
<!-- build readahead.jar -->
<jar jarfile="${build.lib}/readahead.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/readahead/interfaces/**"/>
<include name="org/jboss/test/readahead/ejb/**"/>
</fileset>
@@ -1828,7 +1827,7 @@
<!-- build xatest.jar -->
<jar jarfile="${build.lib}/xatest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/xa/interfaces/**"/>
<include name="org/jboss/test/xa/bean/**"/>
</fileset>
@@ -2387,6 +2386,17 @@
</fileset>
</jar>
+ <pathconvert targetos="unix" property="codebaseURL">
+ <path path="${build.lib}"/>
+ </pathconvert>
+ <echo message="+++ codebase=${codebaseURL}" />
+ <echo message="+++ build.lib=${build.lib}" />
+ <copy todir="${build.lib}" filtering="true" overwrite="true"
+ file="${source.resources}/jmx/archivestest-service.xml">
+ <filterset>
+ <filter token="codebase" value="file:/${codebaseURL}"/>
+ </filterset>
+ </copy>
</target>
<!-- naming test -->
@@ -2397,7 +2407,7 @@
<!-- build naming.jar -->
<jar jarfile="${build.lib}/naming.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2413,7 +2423,7 @@
<!-- build remote-naming.jar -->
<jar jarfile="${build.lib}/remote-naming.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2426,7 +2436,7 @@
<!-- build naminga.jar -->
<jar jarfile="${build.lib}/subdir/naminga.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2439,7 +2449,7 @@
<!-- build namingb.jar -->
<jar jarfile="${build.lib}/namingb.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2613,7 +2623,7 @@
<!-- build threadingBean.jar -->
<jar jarfile="${build.lib}/threadingBean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/threading/interfaces/**"/>
<include name="org/jboss/test/threading/ejb/**"/>
</fileset>
@@ -2644,7 +2654,7 @@
<!-- build deadlock.jar -->
<jar jarfile="${build.lib}/deadlock.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/deadlock/interfaces/**"/>
<include name="org/jboss/test/deadlock/bean/**"/>
<include name="org/somepackage/**"/>
@@ -2677,7 +2687,7 @@
<!-- build pooled.jar -->
<jar jarfile="${build.lib}/pooled.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/pooled/interfaces/**"/>
<include name="org/jboss/test/pooled/bean/**"/>
<include name="org/somepackage/**"/>
@@ -2712,7 +2722,7 @@
<!-- build testbean.jar -->
<jar jarfile="${build.lib}/testbean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
<!--include name="org/jboss/test/testbean2/interfaces/**"/-->
@@ -2726,7 +2736,7 @@
<!-- build testbean2.jar -->
<jar jarfile="${build.lib}/testbean2.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean2/interfaces/**"/>
<include name="org/jboss/test/testbean2/bean/**"/>
@@ -2744,7 +2754,7 @@
<!-- build testbeancluster.jar -->
<jar jarfile="${build.lib}/testbeancluster.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbeancluster/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
@@ -2777,7 +2787,7 @@
<!-- build perf.jar -->
<jar jarfile="${build.lib}/perf.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/**"/>
<include name="org/jboss/test/perf/ejb/**"/>
</fileset>
@@ -2788,7 +2798,7 @@
<!-- build probe.jar -->
<jar jarfile="${build.lib}/probe.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/Perf*"/>
<include name="org/jboss/test/perf/interfaces/Probe*"/>
<include name="org/jboss/test/perf/ejb/Perf*"/>
@@ -2803,7 +2813,7 @@
<!-- build secure-perf.jar -->
<jar jarfile="${build.lib}/secure-perf.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/**"/>
<include name="org/jboss/test/perf/ejb/**"/>
</fileset>
@@ -2862,7 +2872,7 @@
<jar jarfile="${build.lib}/jbosstest-web-ejbs.jar"
manifest="${build.resources}/web/ejb.mf">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/web/interfaces/**"/>
<include name="org/jboss/test/web/ejb/**"/>
</fileset>
@@ -3051,7 +3061,7 @@
<!-- build bench.jar -->
<jar jarfile="${build.lib}/bench.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bench/interfaces/**"/>
<include name="org/jboss/test/bench/ejb/**"/>
</fileset>
@@ -3355,15 +3365,14 @@
<!-- build cmp2-simple.jar -->
<jar jarfile="${build.lib}/cmp2-simple.jar">
<fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set" />
<include name="org/jboss/test/cmp2/simple/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/simple">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
+ includes="junit/framework/*.*"/>
</jar>
<!-- build cmp2-commerce.jar -->
@@ -3596,7 +3605,7 @@
<!-- build compliance.jar -->
<jar jarfile="${build.lib}/jbossmx-compliance.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/compliance/**"/>
</fileset>
</jar>
@@ -3604,7 +3613,7 @@
<!-- build implementation.jar -->
<jar jarfile="${build.lib}/jbossmx-implementation.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/implementation/**"/>
</fileset>
</jar>
@@ -3612,7 +3621,7 @@
<!-- build performance.jar -->
<jar jarfile="${build.lib}/jbossmx-performance.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/performance/**"/>
</fileset>
</jar>
|
