Author: ron.sigal(a)jboss.com
Date: 2010-12-15 18:19:09 -0500 (Wed, 15 Dec 2010)
New Revision: 6167
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1144: Added server identity versioning tests for versions that have a
ConnectionValidator.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2010-12-15 23:10:41 UTC (rev 6166)
+++ remoting2/branches/2.x/build.xml 2010-12-15 23:19:09 UTC (rev 6167)
@@ -2364,6 +2364,8 @@
<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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="true"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2376,12 +2378,16 @@
<param name="client.classpath"
value="${etc.dir}/lib/2.5.2.SP2/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"/>
+ <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_5_2_SP2-server"/>
<param name="server.classpath"
value="${etc.dir}/lib/2.5.2.SP2/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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2394,12 +2400,16 @@
<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"/>
+ <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_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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2412,12 +2422,16 @@
<param name="client.classpath"
value="${etc.dir}/lib/2.5.1/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"/>
+ <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_5_1-server"/>
<param name="server.classpath"
value="${etc.dir}/lib/2.5.1/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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2430,12 +2444,16 @@
<param name="client.classpath"
value="${etc.dir}/lib/2.5.0.SP2/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"/>
+ <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_5_0_SP2-server"/>
<param name="server.classpath"
value="${etc.dir}/lib/2.5.0.SP2/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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2448,12 +2466,16 @@
<param name="client.classpath"
value="${etc.dir}/lib/2.5.0.SP1/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"/>
+ <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_5_0_SP1-server"/>
<param name="server.classpath"
value="${etc.dir}/lib/2.5.0.SP1/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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2466,12 +2488,16 @@
<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"/>
+ <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_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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2484,12 +2510,16 @@
<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"/>
+ <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_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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2502,12 +2532,16 @@
<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"/>
+ <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_4_0_GA-server"/>
<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"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2524,6 +2558,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_3_SP2-server"/>
@@ -2535,6 +2571,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2551,6 +2589,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_3_SP1-server"/>
@@ -2562,6 +2602,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2578,6 +2620,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_3-server"/>
@@ -2589,6 +2633,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2605,6 +2651,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP11-server"/>
@@ -2616,6 +2664,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2632,6 +2682,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP10-server"/>
@@ -2643,6 +2695,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2659,6 +2713,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP9-server"/>
@@ -2670,6 +2726,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2686,6 +2744,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP7-server"/>
@@ -2697,6 +2757,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2713,6 +2775,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP4-server"/>
@@ -2724,6 +2788,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2740,6 +2806,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP2-server"/>
@@ -2751,6 +2819,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2767,6 +2837,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_SP1-server"/>
@@ -2778,6 +2850,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -2794,6 +2868,8 @@
<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_pre_2.4"
inheritrefs="true">
<param name="jboss-junit-configuration"
value="2_2_2_GA-server"/>
@@ -2805,6 +2881,8 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
<param name="check_content_type" value="false"/>
+ <param name="clientImplementsServerIdentity"
value="true"/>
+ <param name="serverImplementsServerIdentity"
value="false"/>
</antcall>
<!--
******************************************************************************** -->
@@ -3095,6 +3173,8 @@
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
+ <echo>clientImplementsServerIdentity:
${clientImplementsServerIdentity}</echo>
+ <echo>serverImplementsServerIdentity:
${serverImplementsServerIdentity}</echo>
<junit printsummary="true" fork="yes"
includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="basic.third_party.classpath"/>
@@ -3108,6 +3188,8 @@
<jvmarg
value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
<jvmarg
value="-Dremoting.metadata=check_connection=${check_connection}"/>
<jvmarg value="-Dcheck_content_type=${check_content_type}"/>
+ <jvmarg
value="-DclientImplementsServerIdentity=${clientImplementsServerIdentity}"/>
+ <jvmarg
value="-DserverImplementsServerIdentity=${serverImplementsServerIdentity}"/>
<!--sysproperty key="${java.security.manager.key}"
value="${java.security.manager}"/>
<sysproperty key="java.security.policy"
value="${java.security.policy}"/>
<sysproperty key="java.security.debug"
value="${java.security.debug}"/>
@@ -3124,6 +3206,7 @@
<fileset dir="${tests.compile.dir}">
<include
name="**/remoting/versioning/transport/**/*TestCase.class"/>
<include
name="**/remoting/versioning/lease/**/*TestCase.class"/>
+ <include
name="**/remoting/versioning/identity/*TestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
@@ -3135,6 +3218,8 @@
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
+ <echo>clientImplementsServerIdentity:
${clientImplementsServerIdentity}</echo>
+ <echo>serverImplementsServerIdentity:
${serverImplementsServerIdentity}</echo>
<junit printsummary="true" fork="yes"
includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="basic.third_party.classpath"/>
@@ -3148,6 +3233,8 @@
<jvmarg
value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
<jvmarg
value="-Dremoting.metadata=check_connection=${check_connection}"/>
<jvmarg value="-Dcheck_content_type=${check_content_type}"/>
+ <jvmarg
value="-DclientImplementsServerIdentity=${clientImplementsServerIdentity}"/>
+ <jvmarg
value="-DserverImplementsServerIdentity=${serverImplementsServerIdentity}"/>
<!--sysproperty key="${java.security.manager.key}"
value="${java.security.manager}"/>
<sysproperty key="java.security.policy"
value="${java.security.policy}"/>
<sysproperty key="java.security.debug"
value="${java.security.debug}"/>
@@ -3164,6 +3251,7 @@
<fileset dir="${tests.compile.dir}">
<include
name="**/remoting/versioning/transport/**/*TestCase.class"/>
<include
name="**/remoting/versioning/lease/**/*TestCase.class"/>
+ <include
name="**/remoting/versioning/identity/*TestCase.class"/>
<exclude
name="**/VersionRMISerializableMarshallerTestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>