[jboss-cvs] JBossAS SVN: r60031 - in trunk/testsuite: src/main/org/jboss/test/cmp2/ageout/test and 31 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 26 18:06:05 EST 2007
Author: alex.loubyansky at jboss.com
Date: 2007-01-26 18:06:05 -0500 (Fri, 26 Jan 2007)
New Revision: 60031
Modified:
trunk/testsuite/imports/sections/cmp.xml
trunk/testsuite/src/main/org/jboss/test/cmp2/ageout/test/JDBC2PmAgeOutUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/test/CascadeDeleteUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CascadeDeleteTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CommerceTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LazyResultSetLoadingTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToManyBiTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToOneUniTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToManyBiTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToOneUniTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/TxTesterTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserLocalTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/dbschema/util/AbstractDBSchemaTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/enums/test/EnumUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/test/FKMappingUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/META-INF/ejb-jar.xml
trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/lob/LOBUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/test/EntityPassivationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/util/ejb/EJBTestCase.java
trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/batchcascadedelete/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/enums/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/lob/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/optimisticlock/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/readonly/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/relationship/META-INF/ejb-jar.xml
Log:
switch to org.jboss.test.util.ejb from net.sourceforge stuff
Modified: trunk/testsuite/imports/sections/cmp.xml
===================================================================
--- trunk/testsuite/imports/sections/cmp.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/imports/sections/cmp.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -12,8 +12,8 @@
<fileset dir="${build.resources}/cmp2/batchcascadedelete">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -27,8 +27,8 @@
<fileset dir="${build.resources}/cmp2/relationship">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -74,8 +74,8 @@
<fileset dir="${build.resources}/cmp2/readonly">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -89,8 +89,8 @@
<fileset dir="${build.resources}/cmp2/ejbselect">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -107,8 +107,8 @@
<fileset dir="${build.resources}/cmp2/ejbselect">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -118,12 +118,6 @@
overwrite="true"/>
<!-- build cmp2-jdbc2pm-ageout.jar -->
- <copy file="${build.resources}/cmp2/ejbselect/META-INF/ejb-jar.xml"
- tofile="${build.resources}/cmp2/ageout/META-INF/ejb-jar.xml"
- overwrite="true"/>
- <copy file="${build.resources}/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml"
- tofile="${build.resources}/cmp2/ageout/META-INF/jbosscmp-jdbc.xml"
- overwrite="true"/>
<jar destfile="${build.lib}/cmp2-jdbc2pm-ageout.jar">
<fileset dir="${build.classes}">
<patternset refid="common.test.client.classes"/>
@@ -135,8 +129,8 @@
<fileset dir="${build.resources}/cmp2/ageout">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -144,6 +138,7 @@
<!-- build cmr-postcreateswritten.jar -->
<jar destfile="${build.lib}/cmr-postcreateswritten.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/cmr/ejb/*"/>
<include name="org/jboss/test/cmp2/cmr/interfaces/*"/>
</fileset>
@@ -155,26 +150,29 @@
<!-- build cmp2-simple.jar -->
<jar destfile="${build.lib}/cmp2-simple.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/simple/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/simple">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/framework/*.*"/>
+ includes="junit/**/*.*"/>
</jar>
<!-- build cmp2-commerce.jar -->
<jar destfile="${build.lib}/cmp2-commerce.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/commerce/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/commerce">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -182,13 +180,14 @@
<!-- build cmp2-lob.jar -->
<jar destfile="${build.lib}/cmp2-lob.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/lob/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/lob">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -196,13 +195,14 @@
<!-- build cmp2-optimisticlock.jar -->
<jar destfile="${build.lib}/cmp2-optimisticlock.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/optimisticlock/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/optimisticlock">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -210,13 +210,14 @@
<!-- build cmp2-passivation.jar -->
<jar destfile="${build.lib}/cmp2-passivation.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/passivation/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/passivation">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -224,13 +225,14 @@
<!-- build cmp2-fkmapping.jar -->
<jar destfile="${build.lib}/cmp2-fkmapping.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/fkmapping/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/fkmapping">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -238,13 +240,14 @@
<!-- build cmp2-fkstackoverflow.jar -->
<jar destfile="${build.lib}/cmp2-fkstackoverflow.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/fkstackoverflow/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/fkstackoverflow">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -252,6 +255,7 @@
<!-- build cmp2-audit.jar -->
<jar destfile="${build.lib}/cmp2-audit.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/audit/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/audit">
@@ -262,13 +266,14 @@
<!-- build cmp2-cmrstress.jar -->
<jar destfile="${build.lib}/cmp2-cmrstress.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/cmrstress/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/cmrstress">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -276,12 +281,14 @@
<!-- build cmp2-distinct.jar -->
<jar destfile="${build.lib}/cmp2-distinct.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/distinct/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/distinct">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -289,12 +296,14 @@
<!-- build cmp2-jbas1361.jar -->
<jar destfile="${build.lib}/cmp2-jbas1361.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/jbas1361/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/jbas1361">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -302,12 +311,14 @@
<!-- build cmp2-jbas1665.jar -->
<jar destfile="${build.lib}/cmp2-jbas1665.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/jbas1665/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/jbas1665">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -315,12 +326,14 @@
<!-- build cmp2-jbas3541.jar -->
<jar destfile="${build.lib}/cmp2-jbas3541.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/jbas3541/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/jbas3541">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -337,8 +350,8 @@
<fileset dir="${build.resources}/cmp2/jbas3541">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -350,12 +363,14 @@
<!-- build cmp2-jbas979.jar -->
<jar destfile="${build.lib}/cmp2-jbas979.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/jbas979/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/jbas979">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -363,18 +378,21 @@
<!-- build cmp2-keygen.jar -->
<jar destfile="${build.lib}/cmp2-keygen.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/keygen/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/keygen">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
<jar destfile="${build.lib}/cmp2-perf.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/perf/**"/>
</fileset>
<metainf dir="${build.resources}/cmp2/perf"/>
@@ -383,6 +401,7 @@
<!-- build cmp2-dbschema.jar -->
<jar destfile="${build.lib}/cmp2-dbschema.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/dbschema/**"/>
</fileset>
<fileset dir="${build.classes}">
@@ -391,14 +410,15 @@
<fileset dir="${build.resources}/cmp2/relationship">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
<jar destfile="${build.lib}/cmp2-idxandusersql.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/idxandusersql/**"/>
</fileset>
<!--
@@ -409,8 +429,8 @@
<metainf
dir="${source.java}/org/jboss/test/cmp2/idxandusersql/META-INF"/>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -418,13 +438,14 @@
<!-- build cmp2-enum.jar -->
<jar destfile="${build.lib}/cmp2-enum.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/enums/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/enums">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -441,8 +462,8 @@
<fileset dir="${build.resources}/cmp2/enums">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -454,6 +475,7 @@
<!-- build cmp2-cmrtansaction.jar -->
<jar destfile="${build.lib}/cmp2-cmrtransaction.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/cmrtransaction/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/cmrtransaction">
@@ -464,13 +486,14 @@
<!-- build cmr-cmrtree.jar -->
<jar destfile="${build.lib}/cmp2-cmrtree.jar">
<fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/cmrtree/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/cmrtree">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
- includes="net/**/*.*"/>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
@@ -478,12 +501,14 @@
<!-- build cmp2-jbas3717.jar -->
<jar destfile="${build.lib}/cmp2-jbas3717.jar">
<fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
+ <patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/cmp2/jbas3717/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/jbas3717/ejb">
<include name="**/*.*"/>
</fileset>
+ <zipfileset src="${jboss.test.lib}/jboss-test.jar"
+ includes="org/jboss/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar" includes="junit/**/*.*"/>
</jar>
<jar destfile="${build.lib}/cmp2-jbas3717.ear">
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/ageout/test/JDBC2PmAgeOutUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ageout/test/JDBC2PmAgeOutUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ageout/test/JDBC2PmAgeOutUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,6 +23,7 @@
import java.sql.Connection;
import java.sql.Statement;
+import java.util.Properties;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
@@ -33,12 +34,12 @@
import org.jboss.ejb.plugins.cmp.jdbc.JDBCUtil;
import org.jboss.ejb.plugins.cmp.jdbc2.schema.Cache;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import org.jboss.test.cmp2.ejbselect.ALocal;
import org.jboss.test.cmp2.ejbselect.ALocalHome;
import org.jboss.test.cmp2.ejbselect.AUtil;
import org.jboss.mx.util.MBeanServerLocator;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -63,7 +64,7 @@
return JBossTestCase.getDeploySetup(JDBC2PmAgeOutUnitTestCase.class, "cmp2-jdbc2pm-ageout.jar");
}
- public void setUpEJB() throws Exception
+ public void setUpEJB(Properties props) throws Exception
{
MBeanServer server = MBeanServerLocator.locateJBoss();
cacheListener = new CacheListener();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/test/CascadeDeleteUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/test/CascadeDeleteUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/test/CascadeDeleteUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,9 +23,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import org.jboss.test.cmp2.cmrtree.ejb.Facade;
import org.jboss.test.cmp2.cmrtree.ejb.FacadeUtil;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CascadeDeleteTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CascadeDeleteTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CascadeDeleteTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -22,13 +22,15 @@
package org.jboss.test.cmp2.commerce;
import java.util.Iterator;
+import java.util.Properties;
import javax.ejb.ObjectNotFoundException;
import javax.naming.InitialContext;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
+
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class CascadeDeleteTest extends EJBTestCase
{
@@ -343,7 +345,7 @@
}
}
- public void tearDownEJB() throws Exception
+ public void tearDownEJB(Properties props) throws Exception
{
deleteAllOrders(getOrderHome());
deleteAllLineItems(getLineItemHome());
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CommerceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CommerceTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/CommerceTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -25,11 +25,12 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class CommerceTest extends EJBTestCase {
public static Test suite() throws Exception {
@@ -323,14 +324,14 @@
getAddressHome().selectAddresses("");
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
deleteAllOrders(getOrderHome());
deleteAllLineItems(getLineItemHome());
deleteAllProducts(getProductHome());
deleteAllAddresses(getAddressHome());
}
- public void tearDownEJB() throws Exception {
+ public void tearDownEJB(Properties props) throws Exception {
deleteAllOrders(getOrderHome());
deleteAllLineItems(getLineItemHome());
deleteAllProducts(getProductHome());
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LazyResultSetLoadingTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LazyResultSetLoadingTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LazyResultSetLoadingTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,14 +21,15 @@
*/
package org.jboss.test.cmp2.commerce;
-import net.sourceforge.junitejb.EJBTestCase;
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import javax.naming.InitialContext;
import java.util.Collection;
import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Properties;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -76,7 +77,7 @@
return null;
}
- public void setUpEJB() throws Exception
+ public void setUpEJB(Properties props) throws Exception
{
OrderHome oh = getOrderHome();
Order o = oh.create(new Long(1));
@@ -92,7 +93,7 @@
o.getLineItems().add(li);
}
- public void tearDownEJB() throws Exception
+ public void tearDownEJB(Properties props) throws Exception
{
getOrderHome().remove(new Long(1));
}
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -25,6 +25,7 @@
import java.util.Set;
import java.util.Iterator;
import java.util.HashSet;
+import java.util.Properties;
import java.lang.reflect.Method;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -42,9 +43,10 @@
import org.jboss.mx.server.registry.MBeanEntry;
import org.jboss.mx.server.registry.MBeanRegistry;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import org.jboss.mx.util.MBeanProxyExt;
-public class LimitOffsetTest extends net.sourceforge.junitejb.EJBTestCase {
+public class LimitOffsetTest extends EJBTestCase {
private JDBCEJBQLCompiler compiler;
private Class[] params = { int.class, int.class };
private JDBCQueryMetaData queryMetaData;
@@ -59,7 +61,7 @@
super(name);
}
- public void setUpEJB() throws Exception
+ public void setUpEJB(Properties props) throws Exception
{
MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
ObjectName name = new ObjectName("jboss.j2ee:jndiName=commerce/Order,service=EJB");
@@ -115,7 +117,7 @@
}
}
- public void tearDownEJB() throws Exception
+ public void tearDownEJB(Properties props) throws Exception
{
for (Iterator i = orderHome.findAll().iterator(); i.hasNext(); )
{
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToManyBiTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToManyBiTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToManyBiTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.cmp2.commerce;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ManyToManyBiTest extends EJBTestCase {
@@ -70,7 +69,7 @@
private ProductCategory b4;
private ProductCategory b5;
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
ProductHome productHome = getProductHome();
ProductCategoryHome productCategoryHome = getProductCategoryHome();
@@ -281,7 +280,7 @@
assertTrue(b5.getProducts().contains(a5));
}
- public void tearDownEJB() throws Exception {
+ public void tearDownEJB(Properties props) throws Exception {
}
public void deleteAllProducts(ProductHome productHome) throws Exception {
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToOneUniTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToOneUniTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/ManyToOneUniTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.cmp2.commerce;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ManyToOneUniTest extends EJBTestCase {
@@ -63,7 +62,7 @@
private LineItem[] b1x = new LineItem[20];
private LineItem[] b2x = new LineItem[30];
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
ProductHome productHome = getProductHome();
LineItemHome lineItemHome = getLineItemHome();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToManyBiTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToManyBiTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToManyBiTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,9 +23,9 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class OneToManyBiTest extends EJBTestCase {
@@ -66,7 +66,7 @@
private LineItem[] b1x = new LineItem[20];
private LineItem[] b2x = new LineItem[30];
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
OrderHome orderHome = getOrderHome();
LineItemHome lineItemHome = getLineItemHome();
@@ -284,7 +284,7 @@
assertTrue(!(b1.contains(b1x[b1x.length-1])));
}
- public void tearDownEJB() throws Exception {
+ public void tearDownEJB(Properties props) throws Exception {
OrderHome orderHome = getOrderHome();
LineItemHome lineItemHome = getLineItemHome();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToOneUniTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToOneUniTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/OneToOneUniTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.cmp2.commerce;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class OneToOneUniTest extends EJBTestCase {
@@ -63,7 +62,7 @@
private Address b1;
private Address b2;
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
OrderHome orderHome = getOrderHome();
AddressHome addressHome = getAddressHome();
@@ -104,9 +103,6 @@
assertTrue(a2.getShippingAddress() == null);
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllOrders(OrderHome orderHome) throws Exception {
// delete all Orders
Iterator currentOrders = orderHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.Set;
+import java.util.Properties;
import java.lang.reflect.Method;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -38,10 +39,11 @@
import org.jboss.mx.server.registry.MBeanEntry;
import org.jboss.mx.server.registry.MBeanRegistry;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.util.UnreachableStatementException;
-public class QueryTest extends net.sourceforge.junitejb.EJBTestCase
+public class QueryTest extends EJBTestCase
{
private JDBCEJBQLCompiler compiler;
private static final String javaVersion = System.getProperty("java.specification.version");
@@ -57,7 +59,7 @@
super(name);
}
- public void setUpEJB() throws Exception
+ public void setUpEJB(Properties props) throws Exception
{
MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
ObjectName name = new ObjectName("jboss.j2ee:jndiName=commerce/Order,service=EJB");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/TxTesterTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/TxTesterTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/TxTesterTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,18 +21,11 @@
*/
package org.jboss.test.cmp2.commerce;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Iterator;
import javax.naming.InitialContext;
-import javax.ejb.EJBLocalObject;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
-import net.sourceforge.junitejb.EJBTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class TxTesterTest extends EJBTestCase {
public static Test suite() {
@@ -45,7 +38,6 @@
super(name);
}
- private Category log = Category.getInstance(getClass());
private TxTesterHome txTesterHome;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserLocalTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserLocalTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserLocalTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,9 +23,9 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class UserLocalTest extends EJBTestCase {
@@ -46,13 +46,9 @@
}
public void testDeclaredSql() {
- System.out.println("In testDeclaredSql");
-
- System.out.println("getUserLocalHome");
UserLocalHome userLocalHome = getUserLocalHome();
try {
- System.out.println("creatingUsers");
UserLocal main = userLocalHome.create("main");
UserLocal tody1 = userLocalHome.create("tody1");
UserLocal tody2 = userLocalHome.create("tody2");
@@ -61,7 +57,6 @@
Collection userIds = main.getUserIds();
- System.out.println("test it");
assertTrue(userIds.size() == 5);
Iterator i = userIds.iterator();
assertTrue(i.next().equals("main"));
@@ -70,8 +65,6 @@
assertTrue(i.next().equals("tody3"));
assertTrue(i.next().equals("tody4"));
- System.out.println("done testDeclaredSql");
-
} catch(Exception e) {
e.printStackTrace();
fail("Error in testDeclaredSql");
@@ -79,13 +72,11 @@
}
- public void setUpEJB() throws Exception {
- System.out.println("delete all users");
+ public void setUpEJB(Properties props) throws Exception {
deleteAllUsers(getUserLocalHome());
- System.out.println("done delete all users");
}
- public void tearDownEJB() throws Exception {
+ public void tearDownEJB(Properties props) throws Exception {
}
public void deleteAllUsers(UserLocalHome userLocalHome) throws Exception {
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/UserTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,9 +21,7 @@
*/
package org.jboss.test.cmp2.commerce;
-import java.util.*;
import junit.framework.*;
-import javax.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/dbschema/util/AbstractDBSchemaTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/dbschema/util/AbstractDBSchemaTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/dbschema/util/AbstractDBSchemaTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,13 +21,12 @@
*/
package org.jboss.test.cmp2.dbschema.util;
-import net.sourceforge.junitejb.EJBTestCase;
-
import javax.sql.DataSource;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.sql.Connection;
import java.sql.SQLException;
+import org.jboss.test.util.ejb.EJBTestCase;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,12 +23,13 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.ejb.FinderException;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
/**
* @author others + <a href="mailto:alex at jboss.org">Alex Loubyansky</a>
@@ -55,7 +56,7 @@
private BLocal b3;
private BLocal b4;
- public void setUpEJB() throws Exception
+ public void setUpEJB(Properties props) throws Exception
{
ALocalHome ahome = AUtil.getLocalHome();
BLocalHome bhome = BUtil.getLocalHome();
@@ -76,7 +77,7 @@
a2.setIntField(9);
}
- public void tearDownEJB() throws Exception
+ public void tearDownEJB(Properties props) throws Exception
{
a1.remove();
a2.remove();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/test/EnumUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/test/EnumUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/test/EnumUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -22,9 +22,9 @@
package org.jboss.test.cmp2.enums.test;
import java.util.List;
-import net.sourceforge.junitejb.EJBTestCase;
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import org.jboss.test.cmp2.enums.ejb.Facade;
import org.jboss.test.cmp2.enums.ejb.FacadeUtil;
import org.jboss.test.cmp2.enums.ejb.ColorEnum;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/test/FKMappingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/test/FKMappingUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/test/FKMappingUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -30,8 +30,8 @@
import javax.transaction.UserTransaction;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
import org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal;
import org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocalHome;
import org.jboss.test.cmp2.fkmapping.ejb.DepartmentUtil;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -12,9 +12,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -29,9 +29,9 @@
import javax.sql.DataSource;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
/**
* Test the <dbindex> and <post-table-create> features
@@ -64,11 +64,6 @@
}
}
- public void setUpEJB() throws Exception
- {
- super.setUpEJB();
- }
-
/**
* Check if we use the HSQL Database, as the way how the column
* names are stored in the database (upper vs lower case) is probably
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/lob/LOBUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/lob/LOBUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/lob/LOBUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -28,16 +28,17 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Properties;
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
import junit.framework.Test;
import junit.framework.TestSuite;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
/**
* A test suite to check JBoss data mapping to/from Large Binary Objects (LOBs).
@@ -105,7 +106,6 @@
// Constructors --------------------------------------------------
public LOBUnitTestCase(String name)
- throws java.io.IOException
{
super(name);
}
@@ -471,7 +471,7 @@
* Lookup the LOB lobHome and cache it.
* Load the test data.
*/
- public void setUpEJB()
+ public void setUpEJB(Properties props)
throws Exception
{
log.debug("setupEJB");
@@ -495,7 +495,7 @@
/**
* Remove data references so that they can be garbage collected if needed.
*/
- public void tearDownEJB()
+ public void tearDownEJB(Properties props)
throws Exception
{
log.debug("tearDownEJB");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/test/EntityPassivationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/test/EntityPassivationUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/test/EntityPassivationUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -52,7 +52,7 @@
static final int ENTITY_PASSIVATION_TIMEOUT = 15 * 1000;
// Attributes ----------------------------------------------------
- List mEntities = new ArrayList(getBeanCount());
+ List mEntities;
// Static --------------------------------------------------------
@@ -132,6 +132,7 @@
homeObject,
RapidlyPassivatedEntityHome.class);
+ mEntities = new ArrayList(getBeanCount());
for (int i = 0, n = getBeanCount(); i < n; ++i)
mEntities.add(home.create("nothing to see here"));
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -27,11 +27,12 @@
import java.sql.Statement;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Properties;
import javax.naming.InitialContext;
import javax.sql.DataSource;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ReadonlyUnitTestCase extends EJBTestCase {
@@ -200,7 +201,7 @@
}
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
cleanDB();
Connection con = null;
@@ -292,7 +293,7 @@
}
}
- public void tearDownEJB() throws Exception {
+ public void tearDownEJB(Properties props) throws Exception {
cleanDB();
}
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,13 +21,12 @@
*/
package org.jboss.test.cmp2.relationship.manyToManyBidirectional;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
@@ -378,13 +377,10 @@
assertTrue(b5.getA().contains(a5));
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
deleteAllAsAndBs(getAHome(), getBHome());
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,13 +21,12 @@
*/
package org.jboss.test.cmp2.relationship.manyToManyUnidirectional;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
static org.jboss.logging.Logger log =
@@ -275,13 +274,10 @@
assertTrue(a5.getB().contains(b5));
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
deleteAllAsAndBs(getAHome(), getBHome());
}
-
- public void tearDownEJB() throws Exception {
- }
-
+
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,13 +21,12 @@
*/
package org.jboss.test.cmp2.relationship.manyToOneUnidirectional;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
static org.jboss.logging.Logger log =
@@ -165,7 +164,7 @@
}
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
AHome aHome;
BHome bHome;
@@ -178,9 +177,6 @@
deleteAllAsAndBs(aHome, bHome);
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,10 +23,11 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
static org.jboss.logging.Logger log =
@@ -432,7 +433,7 @@
assertTrue(!(b1.contains(b1x[b1x.length-1])));
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
AHome aHome;
BHome bHome;
@@ -445,9 +446,6 @@
deleteAllAsAndBs(aHome, bHome);
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -23,11 +23,11 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
static org.jboss.logging.Logger log =
@@ -307,7 +307,7 @@
assertTrue(!(b1.contains(b1x[b1x.length-1])));
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
AHome aHome;
BHome bHome;
@@ -320,9 +320,6 @@
deleteAllAsAndBs(aHome, bHome);
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,13 +21,12 @@
*/
package org.jboss.test.cmp2.relationship.oneToOneBidirectional;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
static org.jboss.logging.Logger log =
@@ -147,7 +146,7 @@
assertTrue(a1.isIdentical(b2.getA()));
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
AHome aHome;
BHome bHome;
@@ -160,9 +159,6 @@
deleteAllAsAndBs(aHome, bHome);
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -21,13 +21,12 @@
*/
package org.jboss.test.cmp2.relationship.oneToOneUnidirectional;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestCase;
-import net.sourceforge.junitejb.EJBTestCase;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.ejb.EJBTestCase;
public class ABTest extends EJBTestCase {
static org.jboss.logging.Logger log =
@@ -141,7 +140,7 @@
assertNull(a2.getB());
}
- public void setUpEJB() throws Exception {
+ public void setUpEJB(Properties props) throws Exception {
AHome aHome;
BHome bHome;
@@ -154,9 +153,6 @@
deleteAllAsAndBs(aHome, bHome);
}
- public void tearDownEJB() throws Exception {
- }
-
public void deleteAllAsAndBs(AHome aHome, BHome bHome) throws Exception {
// delete all As
Iterator currentAs = aHome.findAll().iterator();
Modified: trunk/testsuite/src/main/org/jboss/test/util/ejb/EJBTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/ejb/EJBTestCase.java 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/main/org/jboss/test/util/ejb/EJBTestCase.java 2007-01-26 23:06:05 UTC (rev 60031)
@@ -26,8 +26,8 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
+import org.jboss.test.JBossTestCase;
import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
import junit.framework.TestResult;
/**
@@ -65,7 +65,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class EJBTestCase extends TestCase
+public class EJBTestCase extends JBossTestCase
{
private boolean serverSide = false;
protected Properties props;
Modified: trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -12,9 +12,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/batchcascadedelete/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/batchcascadedelete/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/batchcascadedelete/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -11,9 +11,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -25,9 +25,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -16,9 +16,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -12,9 +12,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/enums/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/enums/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/enums/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -19,9 +19,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -25,9 +25,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -25,9 +25,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/lob/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/lob/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/lob/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -9,9 +9,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/optimisticlock/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/optimisticlock/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/optimisticlock/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -11,9 +11,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/readonly/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/readonly/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/readonly/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -9,9 +9,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cmp2/relationship/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/relationship/META-INF/ejb-jar.xml 2007-01-26 21:58:09 UTC (rev 60030)
+++ trunk/testsuite/src/resources/cmp2/relationship/META-INF/ejb-jar.xml 2007-01-26 23:06:05 UTC (rev 60031)
@@ -9,9 +9,9 @@
<session>
<description>JUnit Session Bean Test Runner</description>
<ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
</session>
More information about the jboss-cvs-commits
mailing list