From: Scott M S. <st...@us...> - 2003-09-19 20:13:01
|
User: starksm Date: 03/09/18 23:20:31 Modified: . Tag: Branch_3_2 build.xml Log: Update the cmp2-simple.jar build Revision Changes Path No revision No revision 1.165.2.100 +43 -44 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.99 retrieving revision 1.165.2.100 diff -u -r1.165.2.99 -r1.165.2.100 --- build.xml 18 Sep 2003 04:48:29 -0000 1.165.2.99 +++ build.xml 19 Sep 2003 06:20:30 -0000 1.165.2.100 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.165.2.99 2003/09/18 04:48:29 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.100 2003/09/19 06:20:30 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -1037,7 +1037,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> @@ -1061,7 +1061,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/**"/> @@ -1074,7 +1074,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/**"/> @@ -1105,7 +1105,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/**"/> @@ -1136,7 +1136,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/**"/> @@ -1167,7 +1167,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/**"/> @@ -1221,7 +1221,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/**"/> @@ -1240,7 +1240,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/**"/> @@ -1281,7 +1281,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> @@ -1345,7 +1345,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> @@ -1397,7 +1397,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> @@ -1428,7 +1428,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> @@ -1456,7 +1456,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> @@ -1484,7 +1484,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> @@ -1512,7 +1512,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> @@ -1539,7 +1539,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/**"/> @@ -1570,7 +1570,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/**"/> @@ -1601,7 +1601,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/**"/> @@ -1632,7 +1632,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"> @@ -1661,7 +1661,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> @@ -1691,7 +1691,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> @@ -1721,7 +1721,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> @@ -2301,7 +2301,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"/> @@ -2317,7 +2317,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"/> @@ -2330,7 +2330,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"/> @@ -2343,7 +2343,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"/> @@ -2517,7 +2517,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> @@ -2548,7 +2548,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/**"/> @@ -2581,7 +2581,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/**"/> @@ -2616,7 +2616,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/**"/--> @@ -2630,7 +2630,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/**"/> @@ -2648,7 +2648,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/**"/> @@ -2681,7 +2681,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> @@ -2692,7 +2692,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*"/> @@ -2707,7 +2707,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> @@ -2766,7 +2766,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> @@ -2955,7 +2955,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> @@ -3259,15 +3259,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 --> @@ -3500,7 +3499,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> @@ -3508,7 +3507,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> @@ -3516,7 +3515,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> |