[jboss-remoting-commits] JBoss Remoting SVN: r3902 - remoting2/branches/2.x.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Fri Apr 4 18:58:55 EDT 2008
Author: ron.sigal at jboss.com
Date: 2008-04-04 18:58:55 -0400 (Fri, 04 Apr 2008)
New Revision: 3902
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-920, JBREM-934: (1) Creates security policy files; (2) created strict security suite.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-04-04 22:47:48 UTC (rev 3901)
+++ remoting2/branches/2.x/build.xml 2008-04-04 22:58:55 UTC (rev 3902)
@@ -29,13 +29,6 @@
<property name="compile.source" value="${ant.java.version}"/>
<property name="compile.target" value="${ant.java.version}"/>
- <!-- set the security manager information for unit tests -->
- <property name="java.security.policy" value="${basedir}/test.policy"/>
- <property name="java.security.manager" value=""/>
- <!--<property name="java.security.manager" value="org.jboss.test.security.LoggingSecurityManager"/>-->
- <!--<property name="java.security.debug" value="access,failure"/>-->
- <property name="java.security.debug" value=""/>
-
<!-- ================================================================== -->
<!-- Sets bind address and port used by jrunit/jgroups multicast socket -->
<!-- ================================================================== -->
@@ -161,7 +154,7 @@
<property name="receiveOnAllInterfaces" value="false"/>
<echo>receiveOnAllInterfaces: ${receiveOnAllInterfaces}</echo>
</target>
-
+
<target name="setSendOnAllInterfaces"
depends="setSendOnAllInterfaces.sub,
setSendOnAllInterfaces.isset.true,
@@ -253,7 +246,7 @@
<property name="output.tests.classes" value="${output.dir}/tests/classes"/>
<property name="output.tests.results" value="${output.dir}/tests/results"/>
<property name="output.tests.performance" value="${output.dir}/tests/performance"/>
- <property name="output.tests.tmp" value="${output.dir}/tests/tmp"/>
+ <property name="output.tests.tmp" value="${output.dir}/tests/tmp"/>
<property name="manifest.file" value="${output.etc.dir}/default.mf"/>
@@ -305,7 +298,7 @@
<pathelement path="${ant.library.dir}/ant-junit.jar"/>
<pathelement location="${tests.compile.dir}"/>
<path refid="library.classpath.tomcat"/>
- <pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
+ <!--pathelement path="${output.lib.dir}/jboss-remoting.jar"/-->
<pathelement path="${jdbc-driver-jar}"/>
</path>
@@ -340,6 +333,28 @@
<property name="perf.seq.payloadsize" value="1024"/>
<property name="perf.seq.dojava" value="yes"/>
<property name="perf.seq.dojboss" value="yes"/>
+
+ <!-- set the security manager information for unit tests -->
+ <property name="java.security.policy" value="${etc.dir}/remoting.security.policy"/>
+ <property name="java.security.policy.strict" value="${etc.dir}/remoting.security.policy.strict"/>
+ <property name="java.security.manager" value=""/>
+ <!--<property name="java.security.manager" value="org.jboss.test.security.LoggingSecurityManager"/>-->
+ <!--<property name="java.security.debug" value="access,failure"/>-->
+ <property name="java.security.debug" value=""/>
+
+ <!-- Create security policy file -->
+ <concat destfile="${etc.dir}/remoting.security.policy">
+ <filelist dir="${etc.dir}"
+ files="remoting.security.policy.core,
+ remoting.security.policy.tests"/>
+ </concat>
+
+ <!-- Create strict security policy file -->
+ <concat destfile="${etc.dir}/remoting.security.policy.strict">
+ <filelist dir="${etc.dir}"
+ files="remoting.security.policy.core,
+ remoting.security.policy.tests.minimal"/>
+ </concat>
</target>
<!-- ================================================================== -->
@@ -495,7 +510,7 @@
<include name="connector.xsd"/>
</fileset>
</jar>
-
+
<jar jarfile="${output.lib.dir}/jboss-remoting-src.jar"
manifest="${manifest.file}">
<fileset dir="${src.dir}">
@@ -717,7 +732,7 @@
<!-- ================================================================== -->
<target name="one-test" if="test" description="Execute a single test." depends="jars, tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="tests.classpath"/>
@@ -793,6 +808,17 @@
<param name="metadata" value="serializationtype=java"/>
<param name="jboss-junit-configuration" value="java_serialization"/>
</antcall>
+ <antcall target="tests.functional.main.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=java"/>
+ <param name="jboss-junit-configuration" value="java_serialization_security"/>
+ </antcall>
+ <!-- there are a few tests that will only run under jdk 1.5 (with/without jboss serialization -->
+ <antcall target="tests.functional.main.isJDK5" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=java"/>
+ <param name="jboss-junit-configuration" value="java_serialization"/>
+ </antcall>
<antcall target="tests.marshall" inheritrefs="true">
</antcall>
</target>
@@ -803,6 +829,11 @@
<param name="metadata" value="serializationtype=java"/>
<param name="jboss-junit-configuration" value="java_serialization"/>
</antcall>
+ <antcall target="tests.functional.main.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=java"/>
+ <param name="jboss-junit-configuration" value="java_serialization_security"/>
+ </antcall>
<antcall target="tests.marshall" inheritrefs="true">
</antcall>
</target>
@@ -814,17 +845,17 @@
<param name="metadata" value="serializationtype=jboss"/>
<param name="jboss-junit-configuration" value="jboss_serialization"/>
</antcall>
+ <antcall target="tests.functional.main.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=jboss"/>
+ <param name="jboss-junit-configuration" value="jboss_serialization_security"/>
+ </antcall>
<!-- there are a few tests that will only run under jdk 1.5 (with/without jboss serialization -->
<antcall target="tests.functional.main.isJDK5" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
<param name="metadata" value="serializationtype=jboss"/>
<param name="jboss-junit-configuration" value="jboss_serialization"/>
</antcall>
- <antcall target="tests.functional.main.isJDK5" inheritrefs="true">
- <param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=java"/>
- <param name="jboss-junit-configuration" value="java_serialization"/>
- </antcall>
<antcall target="tests.nonserializable" inheritrefs="true"/>
<antcall target="tests.functional.main.serialization.jboss" inheritrefs="true"/>
</target>
@@ -835,6 +866,11 @@
<param name="metadata" value="serializationtype=jboss"/>
<param name="jboss-junit-configuration" value="jboss_serialization"/>
</antcall>
+ <antcall target="tests.functional.main.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=jboss"/>
+ <param name="jboss-junit-configuration" value="jboss_serialization_security"/>
+ </antcall>
<antcall target="tests.nonserializable" inheritrefs="true"/>
<antcall target="tests.functional.main.serialization.jboss" inheritrefs="true"/>
</target>
@@ -871,6 +907,13 @@
<param name="classpath" value="tests.classpath"/>
<param name="version" value="jbossweb"/>
</antcall>
+ <antcall target="tests.functional.main.http.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="${serialization}_serialization_jbossweb_security"/>
+ <param name="classpath" value="tests.classpath"/>
+ <param name="version" value="jbossweb"/>
+ </antcall>
</target>
<target name="tests.functional.http.tomcat">
@@ -881,6 +924,13 @@
<param name="classpath" value="tests.classpath.tomcat"/>
<param name="version" value="tomcat"/>
</antcall>
+ <antcall target="tests.functional.main.http.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="${serialization}_serialization_tomcat_security"/>
+ <param name="classpath" value="tests.classpath.tomcat"/>
+ <param name="version" value="tomcat"/>
+ </antcall>
</target>
<target name="tests.functional.http.core" depends="configure">
@@ -914,6 +964,13 @@
<param name="classpath" value="tests.classpath"/>
<param name="version" value="jbossweb"/>
</antcall>
+ <antcall target="tests.functional.main.http.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="${serialization}_serialization_jbossweb_security"/>
+ <param name="classpath" value="tests.classpath"/>
+ <param name="version" value="jbossweb"/>
+ </antcall>
</target>
<target name="tests.functional.http.tomcat.core">
@@ -924,11 +981,19 @@
<param name="classpath" value="tests.classpath.tomcat"/>
<param name="version" value="tomcat"/>
</antcall>
+ <antcall target="tests.functional.main.http.security" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="${serialization}_serialization_tomcat_security"/>
+ <param name="classpath" value="tests.classpath.tomcat"/>
+ <param name="version" value="tomcat"/>
+ </antcall>
</target>
<target name="tests.functional.main" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
+ <echo>bisocket/rmi/socket: ${metadata}</echo>
<junit
printsummary="true" fork="yes" includeantruntime="true"
tempdir="${output.tests.tmp}" maxmemory="1024m">
@@ -978,7 +1043,7 @@
<target name="tests.functional.main.core" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit
printsummary="true" fork="yes" includeantruntime="true"
tempdir="${output.tests.tmp}" maxmemory="1024m">
@@ -1033,10 +1098,50 @@
</batchtest>
</junit>
</target>
+
+ <target name="tests.functional.main.security" depends="tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <mkdir dir="${output.tests.tmp}"/>
+ <echo>bisocket/rmi/socket (strict security): ${metadata}</echo>
+ <junit
+ printsummary="true" fork="yes" includeantruntime="true"
+ tempdir="${output.tests.tmp}" maxmemory="1024m">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ </classpath>
+ <sysproperty key="java.security.manager" value="${java.security.manager}"/>
+ <sysproperty key="java.security.policy" value="${java.security.policy.strict}"/>
+ <sysproperty key="java.security.debug" value="${java.security.debug}"/>
+ <sysproperty key="build.home" value="${basedir}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
+ <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
+ <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
+ <sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/>
+ <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/>
+ <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/>
+ <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/transport/bisocket/BisocketInvokerTestCase.class"/>
+ <include name="**/remoting/transport/bisocket/ssl/custom/SSLBisocketInvokerTestCase.class"/>
+ <include name="**/remoting/transport/rmi/RMIInvokerSerializableMarshallerTestCase.class"/>
+ <include name="**/remoting/transport/rmi/ssl/custom/RMIInvokerTestCase.class"/>
+ <include name="**/remoting/transport/socket/SocketInvokerTestCase.class"/>
+ <include name="**/remoting/transport/socket/ssl/custom/InvokerTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
<target name="tests.functional.main.isJDK5" depends="tests.jars" if="isJDK5">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1054,7 +1159,7 @@
<sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/>
<sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/>
<sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
@@ -1067,7 +1172,7 @@
<target name="tests.functional.main.isJDK5.core" depends="tests.jars" if="isJDK5">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1087,7 +1192,7 @@
<sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/>
<sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
@@ -1100,11 +1205,11 @@
<target name="tests.functional.main.http" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
- <echo>http with ${version}</echo>
+ <mkdir dir="${output.tests.tmp}"/>
+ <echo>http with ${version}: ${metadata}</echo>
<junit
printsummary="true" fork="yes" includeantruntime="true"
- tempdir="${output.tests.tmp}" maxmemory="1024m">
+ tempdir="${output.tests.tmp}" maxmemory="1024m">
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
<classpath>
@@ -1142,9 +1247,45 @@
</junit>
</target>
+ <target name="tests.functional.main.http.security" depends="tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <mkdir dir="${output.tests.tmp}"/>
+ <echo>http (strict security) with ${version}: ${metadata}</echo>
+ <junit
+ printsummary="true" fork="yes" includeantruntime="true"
+ tempdir="${output.tests.tmp}" maxmemory="1024m">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="${classpath}"/>
+ </classpath>
+ <sysproperty key="java.security.manager" value="${java.security.manager}"/>
+ <sysproperty key="java.security.policy" value="${java.security.policy.strict}}"/>
+ <sysproperty key="java.security.debug" value="${java.security.debug}"/>
+ <sysproperty key="build.home" value="${basedir}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <sysproperty key="jrunit.bind_addr" value="${bind.address}"/>
+ <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
+ <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
+ <sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/>
+ <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/>
+ <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/>
+ <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/transport/http/HTTPInvokerTestCase.class"/>
+ <include name="**/remoting/transport/http/ssl/custom/HTTPSInvokerTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="tests.functional.main.http.core" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>http with ${version}</echo>
<junit
printsummary="true" fork="yes" includeantruntime="true"
@@ -1197,7 +1338,7 @@
<!-- tests for sending of non-serializable payloads. -->
<target name="tests.nonserializable" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1229,7 +1370,7 @@
<target name="tests.functional.main.serialization.jboss" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="tests.classpath"/>
@@ -1291,7 +1432,7 @@
<target name="tests.socket" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.metadata=${metadata}"/>
@@ -1322,7 +1463,7 @@
<!-- Tests dynamic, remote loading of marshaller/unmarshaller -->
<target name="tests.marshall" depends="tests.jars" if="os.windows">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<!-- THIS IS IMPORTANT THAT USE MARSHALL SPECIFIC CLASSPATH -->
@@ -1426,7 +1567,7 @@
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP5 -->
<antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
@@ -1450,7 +1591,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP4 -->
<antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
@@ -1474,7 +1615,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP2 -->
<antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
@@ -1522,7 +1663,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.GA -->
<antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true">
@@ -1570,7 +1711,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="false"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.0.SP4 -->
<antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
@@ -1594,7 +1735,7 @@
<param name="check_connection" value="false"/>
<param name="check_content_type" value="false"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.0.0.GA -->
<antcall target="tests.versioning.all_transports_but_bisocket" inheritrefs="true">
@@ -1630,7 +1771,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<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"/>
@@ -1641,9 +1782,9 @@
<param name="server.version" value=""/>
<param name="check_content_type" value="false"/>
</antcall>
-
+
<antcall target="tests.versioning.socket" inheritrefs="true">
- <param name="version" value="1_4_6_GA"/>
+ <param name="version" value="1_4_6_GA"/>
</antcall>
<!-- ******************************************************************************** -->
@@ -1657,7 +1798,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<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"/>
@@ -1668,7 +1809,7 @@
<param name="server.version" value=""/>
<param name="check_content_type" value="false"/>
</antcall>
-
+
<antcall target="tests.versioning.socket" inheritrefs="true">
<param name="version" value="1_4_4_GA"/>
</antcall>
@@ -1684,7 +1825,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<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"/>
@@ -1695,11 +1836,11 @@
<param name="server.version" value=""/>
<param name="check_content_type" value="false"/>
</antcall>
-
+
<antcall target="tests.versioning.socket" inheritrefs="true">
<param name="version" value="1_4_3_GA"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 1.4.0.final -->
<!--antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
@@ -1711,7 +1852,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_4_0_final-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_0_final/jboss-remoting.jar"/>
@@ -1722,16 +1863,16 @@
<param name="server.version" value=""/>
<param name="check_content_type" value="false"/>
</antcall-->
-
- <!-- 1.4.0.final does not allow turning off socket connection check -->
+
+ <!-- 1.4.0.final does not allow turning off socket connection check -->
<!--antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
<param name="version" value="1_4_0_final"/>
</antcall-->
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 1.2.1.final -->
<!-- Compatibility is not guaranteed with 1.2.1.final
-
+
<antcall target="tests.versioning.all_but_socket" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_2_1_final-client"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_1_2_1_final/jboss-remoting.jar"/>
@@ -1741,7 +1882,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<antcall target="tests.versioning.all_but_socket" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_2_1_final-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_1_2_1_final/jboss-remoting.jar"/>
@@ -1751,9 +1892,9 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
- <param name="version" value="1_2_1_final"/>
+ <param name="version" value="1_2_1_final"/>
</antcall>
-->
</target>
@@ -1784,7 +1925,7 @@
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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="third_party.classpath"/>
@@ -1813,7 +1954,7 @@
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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
@@ -1844,12 +1985,12 @@
</batchtest>
</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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
@@ -1881,12 +2022,12 @@
</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">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
@@ -1906,7 +2047,7 @@
<sysproperty key="java.security.debug" value="${java.security.debug}"/>
<sysproperty key="build.home" value="${basedir}"/>
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
@@ -1919,12 +2060,12 @@
</batchtest>
</junit>
</target>
-
+
<target name="tests.versioning.all_but_socket_and_bisocket"
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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
@@ -1943,27 +2084,27 @@
<sysproperty key="java.security.policy" value="${java.security.policy}"/>
<sysproperty key="java.security.debug" value="${java.security.debug}"/>
<sysproperty key="build.home" value="${basedir}"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <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="**/bisocket/**"/>
- <exclude name="**/socket/**"/>
+ <exclude name="**/bisocket/**"/>
+ <exclude name="**/socket/**"/>
<exclude name="**/VersionRMISerializableMarshallerTestCase.class"/>
- <exclude name="**/multiplex/**"/>
+ <exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
</junit>
</target>
-
+
<target name="tests.versioning.socket"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
-
+
<antcall target="tests.versioning.socket.1.4.0" inheritrefs="true"/>
-
+
<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"/>
@@ -1975,7 +2116,7 @@
<param name="client.check_connection" value="false"/>
<param name="server.check_connection" value="false"/>
</antcall>
-
+
<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"/>
@@ -1988,7 +2129,7 @@
<param name="server.check_connection" value="false"/>
</antcall>
</target>
-
+
<target name="tests.versioning.socket.1.4.0"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
@@ -2003,7 +2144,7 @@
<param name="client.check_connection" value="true"/>
<param name="server.check_connection" value="true"/>
</antcall>
-
+
<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"/>
@@ -2027,7 +2168,7 @@
<param name="client.check_connection" value="true"/>
<param name="server.check_connection" value="true"/>
</antcall>
-
+
<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"/>
@@ -2040,12 +2181,12 @@
<param name="server.check_connection" value=""/>
</antcall>
</target>
-
+
<target name="tests.versioning.socket.sub"
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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>Running: ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
@@ -2080,7 +2221,7 @@
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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="third_party.classpath"/>
@@ -2111,7 +2252,7 @@
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}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<classpath>
<path refid="third_party.classpath"/>
@@ -2143,7 +2284,7 @@
<!-- Tests only the multiplex transport -->
<target name="tests.multiplex" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Djvm.mx=256"/>
<classpath>
@@ -2456,7 +2597,7 @@
<target name="tests.performance.one" depends="tests.jars">
<!-- <mkdir dir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"/>-->
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=socket"/>
@@ -2484,7 +2625,7 @@
<target name="tests.stress.one" depends="tests.jars">
<!-- <mkdir dir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"/>-->
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=socket"/>
@@ -2546,7 +2687,7 @@
<param name="jboss-junit-configuration" value="socket_100000_3_2048_${serialization}"/>
</antcall>
</target>
-
+
<target name="tests.performance.bisocket">
<antcall target="tests.performance.run" inheritrefs="true">
<param name="transport" value="bisocket"/>
@@ -2696,7 +2837,7 @@
${payloadsize}, number of calls: ${numofcalls}</echo>
<!-- <mkdir dir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"/>-->
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2754,7 +2895,7 @@
${payloadsize}, number of calls: ${numofcalls}</echo>
<!-- <mkdir dir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"/>-->
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2794,7 +2935,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2825,7 +2966,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2856,7 +2997,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2887,7 +3028,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2918,7 +3059,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2949,7 +3090,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -2981,7 +3122,7 @@
<echo>Running performance tests for protocol: ${transport}
number of clients: ${numofclients}, payload size: ${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -3156,7 +3297,7 @@
${payloadsize}, number of calls: ${numofcalls}</echo>
<!-- <mkdir dir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"/>-->
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -3196,7 +3337,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
@@ -3228,7 +3369,7 @@
<echo>Running performance tests for protocol: ${transport}, number of clients: ${numofclients}, payload size:
${payloadsize}, number of calls: ${numofcalls}</echo>
<mkdir dir="${output.tests.performance}"/>
- <mkdir dir="${output.tests.tmp}"/>
+ <mkdir dir="${output.tests.tmp}"/>
<echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}">
<jvmarg value="-Dremoting.transport=${transport}"/>
More information about the jboss-remoting-commits
mailing list