Author: ron.sigal(a)jboss.com Date: 2008-10-30 00:53:12 -0400 (Thu, 30 Oct 2008) New Revision: 4640 Modified: remoting2/branches/2.x/build.xml Log: JBREM-1048: Updated version to 2.5.0.SP1; JBREM-1049: updated versioning tests to download old versions of jboss-remoting.jar. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2008-10-30 04:44:35 UTC (rev 4639) +++ remoting2/branches/2.x/build.xml 2008-10-30 04:53:12 UTC (rev 4640) @@ -224,9 +224,9 @@ <!-- Module name(s) & version --> <property name="module.name" value="remoting"/> <property name="module.Name" value="JBoss Remoting"/> - <property name="module.version" value="2.5.0.GA"/> + <property name="module.version" value="2.5.0.SP1"/> <!-- extension is for the file suffix to use for dtribution build --> - <property name="module.version.extension" value="2_5_0_GA"/> + <property name="module.version.extension" value="2_5_0_SP1"/> <property name="implementation.url" value="http://www.jboss.org/products/remoting"/> <property name="root.dir" value="${basedir}"/> @@ -1705,8 +1705,16 @@ <property name="oec4" value="${jdk14.dir}servlet-api.jar"/> <property name="old.extended.classpath" value="${path.separator}${oec1}${oec2}${oec3}${oec4}"/> + <property name="versioning.repository" value="http://repository.jboss.com/jboss/remoting"/> + <property name="versioning.dir" value="${basedir}${file.separator}src${file.separator}etc${file.separator}lib"/> </target> + <target name="download.version"> + <mkdir dir="${versioning.dir}${file.separator}${version}"/> + <get src="${versioning.repository}/${version}/lib/jboss-remoting.jar" + dest="${versioning.dir}${file.separator}${version}${file.separator}jboss-remoting.jar" usetimestamp="true" verbose="true"/> + </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." @@ -1722,25 +1730,94 @@ </antcall> <!-- ******************************************************************************** --> + <!-- Current <- -> 2.5.0.GA --> + <antcall target="download.version"> + <param name="version" value="2.5.0.GA"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_0_GA-client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.5.0.GA/jboss-remoting.jar${extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_0_GA-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.5.0.GA/jboss-remoting.jar${extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + </antcall> + + <!-- ******************************************************************************** --> + <!-- Current <- -> 2.4.0.SP1 --> + <antcall target="download.version"> + <param name="version" value="2.4.0.SP1"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_4_0_SP1-client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.4.0.SP1/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_4_0_SP1-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.4.0.SP1/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + </antcall> + + <!-- ******************************************************************************** --> <!-- Current <- -> 2.4.0.GA --> + <antcall target="download.version"> + <param name="version" value="2.4.0.GA"/> + </antcall> <antcall target="tests.versioning.all_transports" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_4_0_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_4_0_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.4.0.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="check_content_type" value="true"/> </antcall> <antcall target="tests.versioning.all_transports" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_4_0_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_4_0_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.4.0.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="check_content_type" value="true"/> </antcall> <!-- ******************************************************************************** --> + <!-- Current <- -> 2.2.2.SP10 --> + <antcall target="download.version"> + <param name="version" value="2.2.2.SP10"/> + </antcall> + <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_2_SP10-client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP10/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="client.pre_2_0_compatible" value=""/> + <param name="server.pre_2_0_compatible" value=""/> + <param name="client.version" value=""/> + <param name="server.version" value="2"/> + <param name="check_connection" value="false"/> + </antcall> + <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_2_SP10-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP10/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="client.pre_2_0_compatible" value=""/> + <param name="server.pre_2_0_compatible" value=""/> + <param name="client.version" value="2"/> + <param name="server.version" value=""/> + <param name="check_connection" value="false"/> + <param name="check_content_type" value="true"/> + </antcall> + + <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.2.SP9 --> + <antcall target="download.version"> + <param name="version" value="2.2.2.SP9-brew"/> + </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP9-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP9/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP9-brew/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1750,7 +1827,7 @@ </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP9-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP9/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP9-brew/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1762,9 +1839,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.2.SP7 --> + <antcall target="download.version"> + <param name="version" value="2.2.2.SP7"/> + </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP7-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP7/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP7/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1774,7 +1854,7 @@ </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP7-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP7/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP7/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1786,9 +1866,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.2.SP4 --> + <antcall target="download.version"> + <param name="version" value="2.2.2.SP4-brew"/> + </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP4-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP4/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP4-brew/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1798,7 +1881,7 @@ </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP4-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP4/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP4-brew/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1810,9 +1893,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.2.SP2 --> + <antcall target="download.version"> + <param name="version" value="2.2.2.SP2"/> + </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP2-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP2/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP2/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1822,7 +1908,7 @@ </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP2-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP2/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP2/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1834,9 +1920,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.2.SP1 --> + <antcall target="download.version"> + <param name="version" value="2.2.2.SP1"/> + </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP1-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP1/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.SP1/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1846,7 +1935,7 @@ </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_SP1-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP1/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.SP1/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1858,9 +1947,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.2.GA --> + <antcall target="download.version"> + <param name="version" value="2.2.2.GA-brew"/> + </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.2.GA-brew/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1870,7 +1962,7 @@ </antcall> <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_2_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.2.GA-brew/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1882,9 +1974,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.1.GA --> + <antcall target="download.version"> + <param name="version" value="2.2.1.GA"/> + </antcall> <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_1_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_1_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.1.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1894,7 +1989,7 @@ </antcall> <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_1_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_1_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.1.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1906,9 +2001,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.0.SP4 --> + <antcall target="download.version"> + <param name="version" value="2.2.0.SP4"/> + </antcall> <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_0_SP4-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_0_SP4/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.0.SP4/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1918,7 +2016,7 @@ </antcall> <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_0_SP4-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_0_SP4/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.0.SP4/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1930,9 +2028,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 2.0.0.GA --> + <antcall target="download.version"> + <param name="version" value="2.0.0.GA"/> + </antcall> <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_0_0_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_0_0_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/2.0.0.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1942,7 +2043,7 @@ </antcall> <antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_0_0_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_0_0_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/2.0.0.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1954,9 +2055,12 @@ <!-- ******************************************************************************** --> <!-- Current <- -> 1.4.6.GA --> + <antcall target="download.version"> + <param name="version" value="1.4.6.GA"/> + </antcall> <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="1_4_6_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/1.4.6.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value="true"/> @@ -1966,7 +2070,7 @@ <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="1_4_6_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/1.4.6.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value="true"/> <param name="server.pre_2_0_compatible" value=""/> @@ -1976,14 +2080,17 @@ </antcall> <antcall target="tests.versioning.socket" inheritrefs="true"> - <param name="version" value="1_4_6_GA"/> + <param name="version" value="1.4.6.GA"/> </antcall> <!-- ******************************************************************************** --> <!-- Current <- -> 1.4.4.GA --> + <antcall target="download.version"> + <param name="version" value="1.4.4.GA"/> + </antcall> <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="1_4_4_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/1.4.4.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value="true"/> @@ -1993,7 +2100,7 @@ <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="1_4_4_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/1.4.4.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value="true"/> <param name="server.pre_2_0_compatible" value=""/> @@ -2003,14 +2110,17 @@ </antcall> <antcall target="tests.versioning.socket" inheritrefs="true"> - <param name="version" value="1_4_4_GA"/> + <param name="version" value="1.4.4.GA"/> </antcall> <!-- ******************************************************************************** --> <!-- Current <- -> 1.4.3.GA --> + <antcall target="download.version"> + <param name="version" value="1.4.3.GA"/> + </antcall> <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="1_4_3_GA-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/1.4.3.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value="true"/> @@ -2020,7 +2130,7 @@ <antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true"> <param name="jboss-junit-configuration" value="1_4_3_GA-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3_GA/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/1.4.3.GA/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value="true"/> <param name="server.pre_2_0_compatible" value=""/> @@ -2030,7 +2140,7 @@ </antcall> <antcall target="tests.versioning.socket" inheritrefs="true"> - <param name="version" value="1_4_3_GA"/> + <param name="version" value="1.4.3.GA"/> </antcall> <!-- ******************************************************************************** --> @@ -2090,7 +2200,7 @@ </antcall> --> </target> - + <!-- This runs all the versioning tests against 2.x only --> <target name="tests.versioning.2" description="Runs remoting fuctional tests with different remoting 2 versions for client and server." @@ -2146,8 +2256,7 @@ </target> <target name="tests.versioning.all_transports" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <echo>Running: ${jboss-junit-configuration}</echo> @@ -2186,8 +2295,7 @@ </target> <target name="tests.versioning.all_transports_pre_2.4" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <echo>Running: ${jboss-junit-configuration}</echo> @@ -2227,8 +2335,7 @@ </target> <target name="tests.versioning.all_transports_but_bisocket" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <echo>Running: ${jboss-junit-configuration}</echo> @@ -2269,8 +2376,7 @@ </target> <target name="tests.versioning.all_but_socket_and_bisocket" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <echo>Running: ${jboss-junit-configuration}</echo> @@ -2311,14 +2417,13 @@ </target> <target name="tests.versioning.socket" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <antcall target="tests.versioning.socket.1.4.0" inheritrefs="true"/> <antcall target="tests.versioning.socket.sub" inheritrefs="true"> <param name="jboss-junit-configuration" value="${version}-client_nocheck"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value="true"/> @@ -2330,7 +2435,7 @@ <antcall target="tests.versioning.socket.sub" inheritrefs="true"> <param name="jboss-junit-configuration" value="${version}-server_nocheck"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value="true"/> <param name="server.pre_2_0_compatible" value=""/> @@ -2342,11 +2447,10 @@ </target> <target name="tests.versioning.socket.1.4.0" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <antcall target="tests.versioning.socket.sub" inheritrefs="true"> <param name="jboss-junit-configuration" value="${version}-client_check"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value="true"/> @@ -2358,7 +2462,7 @@ <antcall target="tests.versioning.socket.sub" inheritrefs="true"> <param name="jboss-junit-configuration" value="${version}-client_default"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/> <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value="true"/> @@ -2370,7 +2474,7 @@ <antcall target="tests.versioning.socket.sub" inheritrefs="true"> <param name="jboss-junit-configuration" value="${version}-server_check"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value="true"/> <param name="server.pre_2_0_compatible" value=""/> @@ -2382,7 +2486,7 @@ <antcall target="tests.versioning.socket.sub" inheritrefs="true"> <param name="jboss-junit-configuration" value="${version}-server_default"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${etc.dir}/lib/${version}/jboss-remoting.jar${old.extended.classpath}"/> <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="client.pre_2_0_compatible" value="true"/> <param name="server.pre_2_0_compatible" value=""/> @@ -2394,8 +2498,7 @@ </target> <target name="tests.versioning.socket.sub" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <echo>Running: ${jboss-junit-configuration}</echo> @@ -2433,8 +2536,7 @@ </target> <target name="tests.versioning.no_multiplex" - description="Runs remoting fuctional tests with different remoting versions for client and server." - depends="jars, tests.jars"> + description="Runs remoting fuctional tests with different remoting versions for client and server."> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}"> @@ -3668,6 +3770,7 @@ <target name="clean" depends="configure"> <delete dir="${output.dir}" quiet="true"/> <delete dir="test_logs"/> + <delete dir="src${file.separator}etc${file.separator}lib"/> </target> <target name="most" depends="clean,jars"/>