Author: ron.sigal(a)jboss.com Date: 2008-04-24 04:13:33 -0400 (Thu, 24 Apr 2008) New Revision: 4063 Modified: remoting2/branches/2.x/build.xml Log: JBREM-967: (1) Replaced 2.2.2.SP5 version test with 2.2.2.SP7 test; (2) removed security manager parameters from versioning tests. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2008-04-24 08:10:12 UTC (rev 4062) +++ remoting2/branches/2.x/build.xml 2008-04-24 08:13:33 UTC (rev 4063) @@ -1637,10 +1637,10 @@ </antcall> <!-- ******************************************************************************** --> - <!-- Current <- -> 2.2.2.SP5 --> + <!-- 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_SP5-client"/> - <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP5/jboss-remoting.jar"/> + <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.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -1649,8 +1649,8 @@ <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_SP5-server"/> - <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP5/jboss-remoting.jar"/> + <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="client.pre_2_0_compatible" value=""/> <param name="server.pre_2_0_compatible" value=""/> @@ -2040,12 +2040,12 @@ <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.key}" value="${java.security.manager}"/> + <!--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}"/> <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> - <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> + <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/--> <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" @@ -2079,13 +2079,13 @@ <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.key}" value="${java.security.manager}"/> + <!--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}"/> <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> - <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> + <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -2119,13 +2119,13 @@ <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.key}" value="${java.security.manager}"/> + <!--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}"/> <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> - <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> + <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -2160,13 +2160,13 @@ <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.key}" value="${java.security.manager}"/> + <!--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}"/> <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> - <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> + <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> <batchtest fork="yes" todir="${output.tests.results}" @@ -2284,13 +2284,13 @@ <jvmarg value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/> <jvmarg value="-Dclient.check_connection=${client.check_connection}"/> <jvmarg value="-Dserver.check_connection=${server.check_connection}"/> - <sysproperty key="${java.security.manager.key}" value="${java.security.manager}"/> + <!--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}"/> <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> - <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> + <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/>