[jboss-cvs] JBossAS SVN: r61777 - branches/Branch_4_2/testsuite/imports/sections.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 28 09:00:01 EDT 2007
Author: dimitris at jboss.org
Date: 2007-03-28 09:00:01 -0400 (Wed, 28 Mar 2007)
New Revision: 61777
Modified:
branches/Branch_4_2/testsuite/imports/sections/cmp.xml
Log:
JBAS-4144, remove remaining uses of the legacy ejbunit class (i.e. cmp2 tests)
Modified: branches/Branch_4_2/testsuite/imports/sections/cmp.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/cmp.xml 2007-03-28 12:58:24 UTC (rev 61776)
+++ branches/Branch_4_2/testsuite/imports/sections/cmp.xml 2007-03-28 13:00:01 UTC (rev 61777)
@@ -8,12 +8,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/batchcascadedelete/ejb/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/batchcascadedelete">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -23,12 +22,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/relationship/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/relationship">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -71,12 +69,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/readonly/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/readonly">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -87,12 +84,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/ejbselect/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/ejbselect">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -106,12 +102,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/ejbselect/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/ejbselect">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -132,14 +127,13 @@
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/ageout/**"/>
<include name="org/jboss/test/cmp2/ejbselect/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
<exclude
name="org/jboss/test/cmp2/ejbselect/**/*TestCase.class"/>
</fileset>
<fileset dir="${build.resources}/cmp2/ageout">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -173,12 +167,11 @@
<jar destfile="${build.lib}/cmp2-commerce.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/commerce/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/commerce">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -188,12 +181,11 @@
<jar destfile="${build.lib}/cmp2-lob.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/lob/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/lob">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -203,12 +195,11 @@
<jar destfile="${build.lib}/cmp2-optimisticlock.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/optimisticlock/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/optimisticlock">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -218,12 +209,11 @@
<jar destfile="${build.lib}/cmp2-passivation.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/passivation/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/passivation">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -233,12 +223,11 @@
<jar destfile="${build.lib}/cmp2-fkmapping.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/fkmapping/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/fkmapping">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -248,12 +237,11 @@
<jar destfile="${build.lib}/cmp2-fkstackoverflow.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/fkstackoverflow/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/fkstackoverflow">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -273,12 +261,11 @@
<jar destfile="${build.lib}/cmp2-cmrstress.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/cmrstress/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/cmrstress">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -344,12 +331,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/jbas3541/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/jbas3541">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -396,15 +382,12 @@
<jar destfile="${build.lib}/cmp2-dbschema.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/dbschema/**"/>
- </fileset>
- <fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/relationship/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/relationship">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -413,6 +396,7 @@
<jar destfile="${build.lib}/cmp2-idxandusersql.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/idxandusersql/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<!--
<fileset dir="${build.resources}/cmp2/idxandusersql">
@@ -422,8 +406,6 @@
<metainf
dir="${source.java}/org/jboss/test/cmp2/idxandusersql/META-INF"/>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -433,12 +415,11 @@
<jar destfile="${build.lib}/cmp2-enum.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/enums/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/enums">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
@@ -453,12 +434,11 @@
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/enums/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/enums">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -481,12 +461,11 @@
<jar destfile="${build.lib}/cmp2-cmrtree.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cmp2/cmrtree/**"/>
+ <include name="org/jboss/test/util/ejb/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/cmrtree">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar">
<patternset refid="ejbrunner.set"/>
</zipfileset>
More information about the jboss-cvs-commits
mailing list