[jboss-cvs] JBossAS SVN: r64227 - trunk/testsuite/imports/sections.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 23 22:44:24 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-07-23 22:44:24 -0400 (Mon, 23 Jul 2007)
New Revision: 64227
Modified:
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/imports/sections/jmx.xml
trunk/testsuite/imports/sections/testbean.xml
Log:
[JBAS-4552] Move cluster tests into cluster package
[JBAS-4553] Reorg cluster tests to prevent unnecessary repetition
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2007-07-24 02:43:10 UTC (rev 64226)
+++ trunk/testsuite/imports/sections/cluster.xml 2007-07-24 02:44:24 UTC (rev 64227)
@@ -15,8 +15,8 @@
<include name="jboss-service.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/ds/*"/>
- <include name="org/jboss/test/cluster/test/*_Stub.class"/>
+ <include name="org/jboss/test/cluster/hapartition/ds/*"/>
+ <include name="org/jboss/test/cluster/multicfg/test/*_Stub.class"/>
</fileset>
</jar>
@@ -25,8 +25,8 @@
<include name="jboss-service.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/drm/*"/>
- <include name="org/jboss/test/cluster/test/*_Stub.class"/>
+ <include name="org/jboss/test/cluster/hapartition/drm/*"/>
+ <include name="org/jboss/test/cluster/multicfg/test/*_Stub.class"/>
</fileset>
</jar>
@@ -35,7 +35,7 @@
<include name="jboss-service.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/rpc/*"/>
+ <include name="org/jboss/test/cluster/hapartition/rpc/*"/>
</fileset>
</jar>
@@ -44,7 +44,7 @@
<include name="jboss-service.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/rpc/*"/>
+ <include name="org/jboss/test/cluster/hapartition/rpc/*"/>
</fileset>
</jar>
@@ -53,7 +53,7 @@
<include name="jboss-beans.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/partition/*"/>
+ <include name="org/jboss/test/cluster/hapartition/state/*"/>
</fileset>
</jar>
@@ -67,10 +67,9 @@
<fileset dir="${build.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/**"/>
- <include name="org/jboss/test/testbeancluster/bean/**"/>
- <include name="org/jboss/test/testbeancluster/proxy/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
<include name="org/somepackage/**"/>
</fileset>
<fileset dir="${build.resources}/cluster/partition">
@@ -79,9 +78,28 @@
</jar>
<!--beans for testing HASingletonElectionPolicy -->
- <copy todir="${build.lib}"
- file="${build.resources}/ha/electionpolicy/ha-electionpolicy-beans.xml"
+ <copy todir="${build.lib}"
+ file="${build.resources}/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml"
overwrite="true"/>
+
+ <!-- ha-invoker adaptor sar -->
+ <jar destfile="${build.lib}/ha-invoker.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/invokerha/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/cluster/invokerha/">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- The cross-server.jar ejb jar -->
+ <zip destfile="${build.lib}/cross-server.jar">
+ <zipfileset dir="${build.resources}/cluster/cross-server"
+ prefix="META-INF"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/ejb2/crossserver/*"/>
+ </fileset>
+ </zip>
<!-- Remote interface to JBoss Cache -->
<jar destfile="${build.lib}/jbosscache-helper.sar">
@@ -100,8 +118,7 @@
<include name="*.jsp"/>
</fileset>
<classes dir="${build.classes}">
- <include
- name="org/jboss/test/cluster/web/BindingListener.class"/>
+ <include name="org/jboss/test/cluster/web/BindingListener.class"/>
<include name="org/jboss/test/cluster/web/CacheHelper*"/>
</classes>
</war>
@@ -420,13 +437,93 @@
</fileset>
</ear>
- <!-- The cross-server.jar ejb jar -->
- <zip destfile="${build.lib}/cross-server.jar">
- <zipfileset dir="${build.resources}/cluster/cross-server"
- prefix="META-INF"/>
+ </target>
+
+ <!-- testbeancluster test -->
+ <target name="_jars-testbeancluster" depends="_jars-testbean">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build testbeancluster.jar -->
+ <jar destfile="${build.lib}/testbeancluster.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/ejb/*"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/testbean/interfaces/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
+ <include name="org/jboss/test/testbean/bean/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/proxy/**"/>
+ <include name="org/somepackage/**"/>
</fileset>
- </zip>
- </target>
+ <fileset dir="${build.resources}/cluster/ejb2/basic">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <jar destfile="${build.lib}/test-cif.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/testbean/interfaces/AComplexPK.class"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
+ </fileset>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/ejb-jar.xml" includes="cif-ejb-jar.xml"/>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/jboss.xml" includes="cif-jboss.xml"/>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/jbosscmp-jdbc.xml" includes="jbosscmp-jdbc.xml"/>
+ </jar>
+ <ear destfile="${build.lib}/test-cif.ear"
+ appxml="${build.resources}/cluster/ejb2/basic/application.xml">
+ <metainf dir="${build.resources}/cluster/ejb2/basic">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="test-cif.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/cluster/ejb2/basic">
+ <include name="cif-ds.xml"/>
+ </fileset>
+ </ear>
+
+ <jar destfile="${build.lib}/test-retry.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/testbean/interfaces/AComplexPK.class"/>
+ <include name="org/jboss/test/testbean/interfaces/**"/>
+ <include name="org/jboss/test/testbean/bean/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
+ </fileset>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/ejb-jar.xml" includes="retry-ejb-jar.xml"/>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/jboss.xml" includes="retry-jboss.xml"/>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/jbosscmp-jdbc.xml" includes="retry-jbosscmp-jdbc.xml"/>
+ </jar>
+ <ear destfile="${build.lib}/test-retry.ear"
+ appxml="${build.resources}/cluster/ejb2/basic/retry-application.xml">
+ <metainf dir="${build.resources}/cluster/ejb2/basic">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="test-retry.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/cluster/ejb2/basic">
+ <include name="cif-ds.xml"/>
+ </fileset>
+ </ear>
+
+ <jar destfile="${build.lib}/pooledha.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/testbean/interfaces/**"/>
+ <include name="org/jboss/test/testbean/bean/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/interfaces/**"/>
+ <include name="org/jboss/test/cluster/ejb2/basic/bean/**"/>
+ </fileset>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/ejb-jar.xml" includes="pooledha-ejb-jar.xml"/>
+ <zipfileset dir="${build.resources}/cluster/ejb2/basic"
+ fullpath="META-INF/jboss.xml" includes="pooledha-jboss.xml"/>
+ </jar>
+ </target>
</project>
Modified: trunk/testsuite/imports/sections/jmx.xml
===================================================================
--- trunk/testsuite/imports/sections/jmx.xml 2007-07-24 02:43:10 UTC (rev 64226)
+++ trunk/testsuite/imports/sections/jmx.xml 2007-07-24 02:44:24 UTC (rev 64227)
@@ -668,16 +668,6 @@
</metainf>
</jar>
- <!-- ha-invoker adaptor sar -->
- <jar destfile="${build.lib}/ha-invoker.sar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/jmx/ha/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/jmx/ha/">
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
-
<!-- invoker adaptor test sar -->
<jar destfile="${build.lib}/invoker-adaptor-test.sar">
<fileset dir="${build.classes}">
Modified: trunk/testsuite/imports/sections/testbean.xml
===================================================================
--- trunk/testsuite/imports/sections/testbean.xml 2007-07-24 02:43:10 UTC (rev 64226)
+++ trunk/testsuite/imports/sections/testbean.xml 2007-07-24 02:44:24 UTC (rev 64227)
@@ -45,92 +45,4 @@
</fileset>
</jar>
</target>
-
- <!-- testbeancluster test -->
- <target name="_jars-testbeancluster" depends="_jars-testbean">
- <mkdir dir="${build.lib}"/>
-
- <!-- build testbeancluster.jar -->
- <jar destfile="${build.lib}/testbeancluster.jar">
- <fileset dir="${build.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/**"/>
- <include name="org/jboss/test/testbeancluster/bean/**"/>
- <include name="org/jboss/test/testbeancluster/proxy/**"/>
- <include name="org/somepackage/**"/>
- </fileset>
- <fileset dir="${build.resources}/testbeancluster">
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/test-cif.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/testbean/interfaces/AComplexPK.class"/>
- <include name="org/jboss/test/testbeancluster/interfaces/**"/>
- <include name="org/jboss/test/testbeancluster/bean/**"/>
- </fileset>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/ejb-jar.xml" includes="cif-ejb-jar.xml"/>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/jboss.xml" includes="cif-jboss.xml"/>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/jbosscmp-jdbc.xml" includes="jbosscmp-jdbc.xml"/>
- </jar>
- <ear destfile="${build.lib}/test-cif.ear"
- appxml="${build.resources}/testbeancluster/application.xml">
- <metainf dir="${build.resources}/testbeancluster">
- <include name="jboss-app.xml"/>
- </metainf>
- <fileset dir="${build.lib}">
- <include name="test-cif.jar"/>
- </fileset>
- <fileset dir="${build.resources}/testbeancluster">
- <include name="cif-ds.xml"/>
- </fileset>
- </ear>
-
- <jar destfile="${build.lib}/test-retry.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/testbean/interfaces/AComplexPK.class"/>
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/testbeancluster/interfaces/**"/>
- <include name="org/jboss/test/testbeancluster/bean/**"/>
- </fileset>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/ejb-jar.xml" includes="retry-ejb-jar.xml"/>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/jboss.xml" includes="retry-jboss.xml"/>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/jbosscmp-jdbc.xml" includes="retry-jbosscmp-jdbc.xml"/>
- </jar>
- <ear destfile="${build.lib}/test-retry.ear"
- appxml="${build.resources}/testbeancluster/retry-application.xml">
- <metainf dir="${build.resources}/testbeancluster">
- <include name="jboss-app.xml"/>
- </metainf>
- <fileset dir="${build.lib}">
- <include name="test-retry.jar"/>
- </fileset>
- <fileset dir="${build.resources}/testbeancluster">
- <include name="cif-ds.xml"/>
- </fileset>
- </ear>
-
- <jar destfile="${build.lib}/pooledha.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/testbeancluster/interfaces/**"/>
- <include name="org/jboss/test/testbeancluster/bean/**"/>
- </fileset>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/ejb-jar.xml" includes="pooledha-ejb-jar.xml"/>
- <zipfileset dir="${build.resources}/testbeancluster"
- fullpath="META-INF/jboss.xml" includes="pooledha-jboss.xml"/>
- </jar>
- </target>
</project>
More information about the jboss-cvs-commits
mailing list