[jboss-cvs] JBossRemoting ...
Tom Elrod
tom.elrod at jboss.com
Tue Jul 25 15:52:22 EDT 2006
User: telrod
Date: 06/07/25 15:52:22
Modified: JBossRemoting build.xml
Log:
JBREM-556 - fixed some problems with remoting versioning.
Revision Changes Path
1.67 +97 -18 JBossRemoting/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- build.xml 22 Jul 2006 03:26:01 -0000 1.66
+++ build.xml 25 Jul 2006 19:52:22 -0000 1.67
@@ -9,7 +9,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.66 2006/07/22 03:26:01 telrod Exp $ -->
+<!-- $Id: build.xml,v 1.67 2006/07/25 19:52:22 telrod Exp $ -->
<project default="most" name="JBossRemoting">
@@ -94,9 +94,9 @@
<pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
</path>
- <path id="remoting.version_1_4.classpath">
- <pathelement path="${etc.dir}/lib/remoting_1_4_0/jboss-remoting.jar"/>
- </path>
+ <!--<path id="remoting.version_1_4.classpath">-->
+ <!--<pathelement path="${etc.dir}/lib/remoting_1_4_0/jboss-remoting.jar"/>-->
+ <!--</path>-->
<path id="tests.version.classpath">
<pathelement path="${ant.library.dir}/ant.jar"/>
@@ -494,6 +494,12 @@
<antcall target="tests.report.quick" inheritrefs="true"/>
</target>
+ <target name="tests.versioning.all.quick" description="Runs remoting functional and performance tests."
+ depends="jars, tests.jars">
+ <antcall target="tests.versioning.all" inheritrefs="true"/>
+ <antcall target="tests.report.quick" inheritrefs="true"/>
+ </target>
+
<target name="tests.report.quick" depends="configure">
<junitreport todir="${output.tests.results}">
<fileset dir="${output.tests.results}">
@@ -752,10 +758,54 @@
</junit>
</target>
+ <target name="tests.versioning.beta2.client" depends="jars, tests.jars">
+ <!--<antcall target="tests.versioning.all_transports" inheritrefs="true">-->
+ <antcall target="tests.versioning.no_multiplex" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_0_0_beta2-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_2_0_0_beta2/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ </antcall>
+ </target>
<target name="tests.versioning"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
+ <antcall target="tests.versioning.core" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${module.version.extension}"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ </antcall>
+ <antcall target="tests.versioning.core" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_4-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
+ </antcall>
+ <antcall target="tests.versioning.core" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_4-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
+ </antcall>
+
+ <antcall target="tests.versioning.core" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_3-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
+ </antcall>
+ <antcall target="tests.versioning.core" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_3-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
+ </antcall>
+ </target>
+
+ <!-- This runs all the versioning tests -->
+ <target name="tests.versioning.all"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
<antcall target="tests.versioning.all_transports" inheritrefs="true">
<param name="jboss-junit-configuration" value="${module.version.extension}"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
@@ -771,36 +821,33 @@
<param name="server.classpath" value="${etc.dir}/lib/remoting_2_0_0_beta2/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
</antcall>
+
<antcall target="tests.versioning.all_transports" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_4_4-client"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
</antcall>
<antcall target="tests.versioning.all_transports" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_4_4-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
</antcall>
+
<antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_0-client"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_0/jboss-remoting.jar"/>
+ <param name="jboss-junit-configuration" value="1_4_3-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
</antcall>
<antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_0-server"/>
- <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_0/jboss-remoting.jar"/>
+ <param name="jboss-junit-configuration" value="1_4_3-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="jboss.remoting.pre_2_0_compatible" value="true"/>
</antcall>
- <!--<antcall target="tests.versioning.no_multiplex" inheritrefs="true">-->
- <!--<param name="jboss-junit-configuration" value="1_2_1-client"/>-->
- <!--<param name="client.classpath" value="${etc.dir}/lib/remoting_1_2_1/jboss-remoting.jar"/>-->
- <!--<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>-->
- <!--</antcall>-->
- <!--<antcall target="tests.versioning.all_transports" inheritrefs="true">-->
- <!--<param name="jboss-junit-configuration" value="1_2_1-server"/>-->
- <!--<param name="server.classpath" value="${etc.dir}/lib/remoting_1_2_1/jboss-remoting.jar"/>-->
- <!--<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>-->
- <!--</antcall>-->
+
</target>
<target name="tests.versioning.all_transports"
@@ -814,6 +861,8 @@
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
<jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
@@ -836,6 +885,34 @@
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
<jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-${jboss-junit-configuration}.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}"
+ haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/versioning/transport/**/*TestCase.class"/>
+ <exclude name="**/remoting/versioning/transport/multiplex/**"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <target name="tests.versioning.core"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <classpath>
+ <path refid="third_party.classpath"/>
+ <path refid="tests.version.classpath"/>
+ </classpath>
+ <jvmarg value="-Dclient.path=${client.classpath}"/>
+ <jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
@@ -843,6 +920,8 @@
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
<exclude name="**/remoting/versioning/transport/multiplex/**"/>
+ <exclude name="**/remoting/versioning/transport/rmi/**"/>
+ <exclude name="**/remoting/versioning/transport/socket/**"/>
</fileset>
</batchtest>
</junit>
More information about the jboss-cvs-commits
mailing list