[jboss-remoting-commits] JBoss Remoting SVN: r4560 - remoting2/branches/2.x.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Tue Sep 9 03:13:46 EDT 2008
Author: ron.sigal at jboss.com
Date: 2008-09-09 03:13:45 -0400 (Tue, 09 Sep 2008)
New Revision: 4560
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1033: Updated to run versioning tests with older jars; JBREM-1030: Updated version to 2.5.0.GA.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-09-09 07:11:11 UTC (rev 4559)
+++ remoting2/branches/2.x/build.xml 2008-09-09 07:13:45 UTC (rev 4560)
@@ -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.4.0.SP2"/>
+ <property name="module.version" value="2.5.0.GA"/>
<!-- extension is for the file suffix to use for dtribution build -->
- <property name="module.version.extension" value="2_4_0_SP2"/>
+ <property name="module.version.extension" value="2_5_0_GA"/>
<property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -275,19 +275,19 @@
<!--exclude name="apache-tomcat/*.jar" unless="isJDK4"/-->
<exclude name="**/jdk14/*.jar" unless="isJDK4"/>
<include name="**/jdk14/*.jar" if="isJDK4"/>
- <exclude name="apache-log4j/lib/log4j.jar" if="isJDK4"/>
- <exclude name="jboss/jboss-j2se.jar" if="isJDK4"/>
- <exclude name="jboss/jboss-common-core.jar" if="isJDK4"/>
- <exclude name="jboss/jboss-jmx.jar" if="isJDK4"/>
- <exclude name="jboss/jboss-logging-log4j.jar" if="isJDK4"/>
- <exclude name="jboss/jboss-logging-spi.jar" if="isJDK4"/>
+ <exclude name="apache-log4j/lib/log4j.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-j2se.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-common-core.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-jmx.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-logging-log4j.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-logging-spi.jar" if="isJDK4"/>
<exclude name="jboss/jnpserver.jar" if="isJDK4"/>
<exclude name="jbossweb/*.jar" if="isJDK4"/>
<exclude name="oswego-concurrent/lib/concurrent.jar" if="isJDK4"/>
- <exclude name="sun-servlet/lib/servlet-api.ja" if="isJDK4"/>
+ <exclude name="sun-servlet/lib/servlet-api.ja" if="isJDK4"/>
</fileset>
</path>
-
+
<!-- The combined library classpath -->
<path id="library.classpath">
<pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
@@ -414,7 +414,7 @@
optimize="off"
includes="**/*.java"
failonerror="true"
- sourcepath="">
+ sourcepath="">
<src path="${src.dir}"/>
<include name="**/*.java"/>
<exclude name="org/jboss/remoting/transport/coyote/**" if="isJDK4"/>
@@ -505,7 +505,7 @@
optimize="off"
includes="**/*.java"
failonerror="true"
- sourcepath="">
+ sourcepath="">
<src path="${tests.src.dir}"/>
<include name="**/*.java"/>
<exclude name="org/jboss/test/remoting/**/http/**" if="isJDK4"/>
@@ -1670,17 +1670,54 @@
<!--</antcall>-->
</target>
+ <target name="configure.versioning">
+
+ <path id="basic.third_party.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ <exclude name="**/jdk14/*.jar"/>
+ <exclude name="jboss/jboss-j2se.jar"/>
+ <exclude name="jboss/jboss-common-core.jar"/>
+ <exclude name="jboss/jboss-jmx.jar"/>
+ <exclude name="jboss/jboss-logging-log4j.jar"/>
+ <exclude name="jboss/jboss-logging-spi.jar"/>
+ <exclude name="jboss/jnpserver.jar"/>
+ <exclude name="sun-servlet/lib/servlet-api.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Versioning classpath for versions 2.5.0.GA and beyond -->
+ <property name="jboss.dir" value="${lib.dir}${file.separator}jboss${file.separator}"/>
+ <property name="ec1" value="${jboss.dir}jboss-j2se.jar${path.separator}"/>
+ <property name="ec2" value="${jboss.dir}jboss-common-core.jar${path.separator}"/>
+ <property name="ec3" value="${jboss.dir}jboss-jmx.jar${path.separator}"/>
+ <property name="ec4" value="${jboss.dir}jboss-logging-log4j.jar${path.separator}"/>
+ <property name="ec5" value="${jboss.dir}jboss-logging-spi.jar${path.separator}"/>
+ <property name="ec6" value="${jboss.dir}jnpserver.jar${path.separator}"/>
+ <property name="ec7" value="${lib.dir}${file.separator}sun-servlet${file.separator}lib${file.separator}servlet-api.jar"/>
+ <property name="extended.classpath" value="${path.separator}${ec1}${ec2}${ec3}${ec4}${ec5}${ec6}${ec7}"/>
+
+ <!-- Versioning classpath for versions prior to 2.5.0.GA -->
+ <property name="jdk14.dir" value="${lib.dir}${file.separator}jdk14${file.separator}"/>
+ <property name="oec1" value="${jdk14.dir}jboss-common.jar${path.separator}"/>
+ <property name="oec2" value="${jdk14.dir}jboss-jmx.jar${path.separator}"/>
+ <property name="oec3" value="${jdk14.dir}jnpserver.jar${path.separator}"/>
+ <property name="oec4" value="${jdk14.dir}servlet-api.jar"/>
+ <property name="old.extended.classpath" value="${path.separator}${oec1}${oec2}${oec3}${oec4}"/>
+
+ </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">
-
+ depends="tests.jars,configure.versioning">
+
<!-- ******************************************************************************** -->
<!-- Current <- -> Current -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/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>
@@ -1688,23 +1725,47 @@
<!-- Current <- -> 2.4.0.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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.SP9 -->
+ <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="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_SP9-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP9/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.SP7 -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1713,8 +1774,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value="2"/>
@@ -1727,8 +1788,8 @@
<!-- Current <- -> 2.2.2.SP4 -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_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=""/>
<param name="client.version" value=""/>
@@ -1737,8 +1798,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_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=""/>
<param name="client.version" value="2"/>
@@ -1751,8 +1812,8 @@
<!-- Current <- -> 2.2.2.SP2 -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1761,8 +1822,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value="2"/>
@@ -1775,8 +1836,8 @@
<!-- Current <- -> 2.2.2.SP1 -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1785,8 +1846,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value="2"/>
@@ -1799,8 +1860,8 @@
<!-- Current <- -> 2.2.2.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_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=""/>
<param name="client.version" value=""/>
@@ -1809,8 +1870,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_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=""/>
<param name="client.version" value="2"/>
@@ -1823,8 +1884,8 @@
<!-- Current <- -> 2.2.1.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1833,8 +1894,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value="2"/>
@@ -1847,8 +1908,8 @@
<!-- Current <- -> 2.2.0.SP4 -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1857,8 +1918,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value="2"/>
@@ -1871,8 +1932,8 @@
<!-- Current <- -> 2.0.0.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1881,8 +1942,8 @@
</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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value="2"/>
@@ -1895,8 +1956,8 @@
<!-- Current <- -> 1.4.6.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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"/>
<param name="client.version" value=""/>
@@ -1905,8 +1966,8 @@
<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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1922,8 +1983,8 @@
<!-- Current <- -> 1.4.4.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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"/>
<param name="client.version" value=""/>
@@ -1932,8 +1993,8 @@
<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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -1949,8 +2010,8 @@
<!-- Current <- -> 1.4.3.GA -->
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_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"/>
<param name="client.version" value=""/>
@@ -1959,8 +2020,8 @@
<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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_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=""/>
<param name="client.version" value=""/>
@@ -2092,7 +2153,7 @@
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
- <path refid="third_party.classpath"/>
+ <path refid="basic.third_party.classpath"/>
<path refid="tests.version.classpath"/>
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
@@ -2132,7 +2193,7 @@
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
- <path refid="third_party.classpath"/>
+ <path refid="basic.third_party.classpath"/>
<path refid="tests.version.classpath"/>
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
@@ -2173,7 +2234,7 @@
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
- <path refid="third_party.classpath"/>
+ <path refid="basic.third_party.classpath"/>
<path refid="tests.version.classpath"/>
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
@@ -2215,7 +2276,7 @@
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
- <path refid="third_party.classpath"/>
+ <path refid="basic.third_party.classpath"/>
<path refid="tests.version.classpath"/>
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
@@ -2257,8 +2318,8 @@
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_${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"/>
<param name="client.version" value=""/>
@@ -2269,8 +2330,8 @@
<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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_${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=""/>
<param name="client.version" value=""/>
@@ -2285,8 +2346,8 @@
depends="jars, tests.jars">
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_${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"/>
<param name="client.version" value=""/>
@@ -2297,8 +2358,8 @@
<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"/>
- <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_${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"/>
<param name="client.version" value=""/>
@@ -2309,8 +2370,8 @@
<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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_${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=""/>
<param name="client.version" value=""/>
@@ -2321,8 +2382,8 @@
<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"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_${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=""/>
<param name="client.version" value=""/>
@@ -2340,7 +2401,7 @@
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
- <path refid="third_party.classpath"/>
+ <path refid="basic.third_party.classpath"/>
<path refid="tests.version.classpath"/>
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
@@ -3664,7 +3725,7 @@
<include name="**/*.pdf"/>
</fileset>
</copy>
-
+
<copy todir="${dist.dir}/docs/guide/html">
<fileset dir="${basedir}/docs/guide/build/en/html">
<include name="**"/>
@@ -3675,7 +3736,7 @@
<include name="**"/>
</fileset>
</copy>
-
+
<copy todir="${dist.dir}" filtering="no">
<fileset dir="${basedir}/docs">
<include name="README.txt"/>
More information about the jboss-remoting-commits
mailing list