Author: ron.sigal(a)jboss.com Date: 2011-03-22 22:12:42 -0400 (Tue, 22 Mar 2011) New Revision: 6302 Modified: remoting2/branches/2.2/build.xml Log: JBREM-1264: Updated version and added release 2.2.3.SP3 to versioning tests. Modified: remoting2/branches/2.2/build.xml =================================================================== --- remoting2/branches/2.2/build.xml 2011-03-23 02:09:19 UTC (rev 6301) +++ remoting2/branches/2.2/build.xml 2011-03-23 02:12:42 UTC (rev 6302) @@ -83,9 +83,9 @@ <!-- Module name(s) & version --> <property name="module.name" value="remoting"/> <property name="module.Name" value="JBoss Remoting"/> - <property name="module.version" value="2.2.3.SP3"/> + <property name="module.version" value="2.2.4"/> <!-- extension is for the file suffix to use for distribution build --> - <property name="module.version.extension" value="2_2_3_SP3"/> + <property name="module.version.extension" value="2_2_4"/> <property name="implementation.url" value="http://www.jboss.org/products/remoting"/> <property name="root.dir" value="${basedir}"/> @@ -682,7 +682,7 @@ </target> <target name="tests.functional.core" depends="configure"> - <antcall target="tests.functional.serialization.java.core" inheritrefs="true"/> + <!--antcall target="tests.functional.serialization.java.core" inheritrefs="true"/--> <antcall target="tests.functional.serialization.jboss.core" inheritrefs="true"/> </target> @@ -1040,7 +1040,10 @@ <!-- check to see if running jdk1.5 --> <target name="get-jvm"> <condition property="isJDK5"> - <equals arg1="${ant.java.version}" arg2="1.5"/> + <or> + <equals arg1="${ant.java.version}" arg2="1.5"/> + <equals arg1="${ant.java.version}" arg2="1.6"/> + </or> </condition> </target> @@ -1672,8 +1675,35 @@ <param name="clientImplementsServerIdentity" value="true"/> <param name="serverImplementsServerIdentity" value="true"/> </antcall> - + <!-- ******************************************************************************** --> + <!-- Current <- -> 2.2.3.SP3 --> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_3_SP3-client"/> + <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_3_SP3/jboss-remoting.jar"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/> + <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"/> + <param name="clientImplementsServerIdentity" value="false"/> + <param name="serverImplementsServerIdentity" value="true"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_3_SP3-server"/> + <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_3_SP3/jboss-remoting.jar"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/> + <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="clientImplementsServerIdentity" value="true"/> + <param name="serverImplementsServerIdentity" value="false"/> + </antcall> + + <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.3.SP2 --> <antcall target="tests.versioning.all_transports" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_3_SP2-client"/>