[jboss-remoting-commits] JBoss Remoting SVN: r3670 - remoting2/branches/2.x.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Thu Mar 20 01:50:46 EDT 2008
Author: ron.sigal at jboss.com
Date: 2008-03-20 01:50:46 -0400 (Thu, 20 Mar 2008)
New Revision: 3670
Modified:
remoting2/branches/2.x/build.xml
Log:
(1) JBREM-935: Changed version to 2.4.0.CR1; (2) JBREM-167, JBREM-923: elaborated RMI version tests; (3) JBREM-920: disabled security manager for version tests.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-03-20 05:44:12 UTC (rev 3669)
+++ remoting2/branches/2.x/build.xml 2008-03-20 05:50:46 UTC (rev 3670)
@@ -215,9 +215,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.Beta2"/>
+ <property name="module.version" value="2.4.0.CR1"/>
<!-- extension is for the file suffix to use for dtribution build -->
- <property name="module.version.extension" value="2_4_0_Beta2"/>
+ <property name="module.version.extension" value="2_4_0_CR1"/>
<property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -1405,7 +1405,7 @@
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP5 -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
<param name="jboss-junit-configuration" value="2_2_2_SP5-client"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP5/jboss-remoting.jar"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
@@ -1415,7 +1415,7 @@
<param name="server.version" value="2"/>
<param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
<param name="jboss-junit-configuration" value="2_2_2_SP5-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP5/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
@@ -1429,7 +1429,7 @@
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP4 -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1439,7 +1439,7 @@
<param name="server.version" value="2"/>
<param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1453,7 +1453,7 @@
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP2 -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1463,7 +1463,7 @@
<param name="server.version" value="2"/>
<param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1477,7 +1477,7 @@
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP1 -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1487,7 +1487,7 @@
<param name="server.version" value="2"/>
<param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1501,7 +1501,7 @@
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.GA -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1511,7 +1511,7 @@
<param name="server.version" value="2"/>
<param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <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"/>
@@ -1700,9 +1700,9 @@
</antcall-->
<!-- 1.4.0.final does not allow turning off socket connection check -->
- <antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
+ <!--antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
<param name="version" value="1_4_0_final"/>
- </antcall>
+ </antcall-->
<!-- ******************************************************************************** -->
<!-- Current <- -> 1.2.1.final -->
@@ -1802,8 +1802,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}"/>
- <sysproperty key="java.security.manager" value=""/>
- <sysproperty key="java.security.policy" value="${java.security.policy}"/>
+ <!--sysproperty key="java.security.manager" value=""/>
+ <sysproperty key="java.security.policy" value="${java.security.policy}"/-->
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -1817,6 +1817,41 @@
</junit>
</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">
+ <mkdir dir="${output.tests.results}"/>
+ <mkdir dir="${output.tests.tmp}"/>
+ <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="tests.version.classpath"/>
+ </classpath>
+ <jvmarg value="-Dclient.path=${client.classpath}"/>
+ <jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Dclient.version=${client.version}"/>
+ <jvmarg value="-Dserver.version=${server.version}"/>
+ <jvmarg value="-Dclient.pre_2_0_compatible=${client.pre_2_0_compatible}"/>
+ <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}"/>
+ <!--sysproperty key="java.security.manager" value=""/>
+ <sysproperty key="java.security.policy" value="${java.security.policy}"/-->
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-${jboss-junit-configuration}.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}"
+ haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/versioning/transport/**/*TestCase.class"/>
+ <exclude name="**/VersionRMISerializableMarshallerTestCase.class"/>
+ <exclude name="**/multiplex/**"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </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">
@@ -1836,8 +1871,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}"/>
- <sysproperty key="java.security.manager" value=""/>
- <sysproperty key="java.security.policy" value="${java.security.policy}"/>
+ <!--sysproperty key="java.security.manager" value=""/>
+ <sysproperty key="java.security.policy" value="${java.security.policy}"/-->
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
@@ -1846,6 +1881,7 @@
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
<exclude name="**/bisocket/**"/>
+ <exclude name="**/VersionRMISerializableMarshallerTestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
@@ -1871,8 +1907,8 @@
<jvmarg value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
<jvmarg value="-Dcheck_content_type=${check_content_type}"/>
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
- <sysproperty key="java.security.manager" value=""/>
- <sysproperty key="java.security.policy" value="${java.security.policy}"/>
+ <!--sysproperty key="java.security.manager" value=""/>
+ <sysproperty key="java.security.policy" value="${java.security.policy}"/-->
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
@@ -1881,6 +1917,7 @@
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
<exclude name="**/bisocket/**"/>
<exclude name="**/socket/**"/>
+ <exclude name="**/VersionRMISerializableMarshallerTestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
More information about the jboss-remoting-commits
mailing list