JBoss Remoting SVN: r5642 - remoting2/branches/2.x.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-12-26 16:14:33 -0500 (Sat, 26 Dec 2009)
New Revision: 5642
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1173: Added release 2.5.2 to versioning test suite.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2009-12-26 21:09:28 UTC (rev 5641)
+++ remoting2/branches/2.x/build.xml 2009-12-26 21:14:33 UTC (rev 5642)
@@ -703,19 +703,19 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/bisocket/**"/>
<include name="org/jboss/remoting/transport/sslbisocket/**"/>
- <include name="org/jboss/remoting/transport/bisocket/**"/>
- <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/bisocket/**"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
<include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
<include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
<include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
- <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
- <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
<include name="org/jboss/remoting/transport/socket/ServerThread*"/>
<include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
- <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
- <include name="org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean*"/>
+ <include name="org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean*"/>
</fileset>
</jar>
@@ -727,15 +727,15 @@
<include name="org/jboss/remoting/transport/bisocket/BisocketServerInvoker*"/>
<include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
<include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
- <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
- <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
- <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
- <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
- <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
- <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
- <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
</fileset>
</jar>
@@ -1831,7 +1831,7 @@
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/>
<sleep seconds="4"/>
</target>
-
+
<target name="tests.servlet.marshal">
<copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
@@ -1862,7 +1862,7 @@
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/>
<sleep seconds="4"/>
</target>
-
+
<target name="tests.servlet.marshal.config">
<copy file="${servlet.tests.dir}/marshal/config/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
@@ -1893,7 +1893,7 @@
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/>
<sleep seconds="4"/>
</target>
-
+
<target name="tests.servlet.marshal.noconfig">
<copy file="${servlet.tests.dir}/marshal/noconfig/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
@@ -2260,9 +2260,26 @@
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.5.2 -->
+ <antcall target="download.version">
+ <param name="version" value="2.5.2"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_5_2-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/2.5.2/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_2-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/2.5.2/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.5.1 -->
<antcall target="download.version">
<param name="version" value="2.5.1"/>
@@ -2279,7 +2296,7 @@
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.5.0.SP2 -->
<antcall target="download.version">
@@ -2297,7 +2314,7 @@
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.5.0.SP1 -->
<antcall target="download.version">
@@ -2315,7 +2332,7 @@
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.5.0.GA -->
<antcall target="download.version">
@@ -2396,7 +2413,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.3 -->
<antcall target="download.version">
@@ -2423,7 +2440,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP11 -->
<antcall target="download.version">
@@ -2450,7 +2467,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP10 -->
<antcall target="download.version">
@@ -2868,7 +2885,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."