Author: ron.sigal(a)jboss.com Date: 2008-04-22 22:59:30 -0400 (Tue, 22 Apr 2008) New Revision: 4043 Modified: remoting2/branches/2.x/build.xml Log: JBREM-920: Replaced if="isJDK5" with unless="isJDK4". Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2008-04-23 01:42:10 UTC (rev 4042) +++ remoting2/branches/2.x/build.xml 2008-04-23 02:59:30 UTC (rev 4043) @@ -270,7 +270,7 @@ <path id="third_party.classpath"> <fileset dir="${lib.dir}"> <include name="**/*.jar"/> - <exclude name="apache-tomcat/*.jar" if="isJDK5"/> + <exclude name="apache-tomcat/*.jar" unless="isJDK4"/> <exclude name="jbossweb/*.jar" if="isJDK4"/> </fileset> </path> @@ -873,7 +873,7 @@ </target> <!-- runs functional tests with jboss serialization if using jdk 1.5 --> - <target name="tests.functional.serialization.jboss" if="isJDK5"> + <target name="tests.functional.serialization.jboss" unless="isJDK4"> <antcall target="tests.functional.main" inheritrefs="true"> <param name="remoting.metadata.key" value="remoting.metadata"/> <param name="metadata" value="serializationtype=jboss"/> @@ -894,7 +894,7 @@ <antcall target="tests.functional.main.serialization.jboss" inheritrefs="true"/> </target> - <target name="tests.functional.serialization.jboss.core" if="isJDK5"> + <target name="tests.functional.serialization.jboss.core" unless="isJDK4"> <antcall target="tests.functional.main.core" inheritrefs="true"> <param name="remoting.metadata.key" value="remoting.metadata"/> <param name="metadata" value="serializationtype=jboss"/> @@ -924,7 +924,7 @@ </antcall> </target> - <target name="tests.functional.serialization.jboss.http" if="isJDK5"> + <target name="tests.functional.serialization.jboss.http" unless="isJDK4"> <antcall target="tests.functional.http.jbossweb"> <param name="serialization" value="jboss"/> </antcall> @@ -933,7 +933,7 @@ </antcall> </target> - <target name="tests.functional.http.jbossweb" if="isJDK5"> + <target name="tests.functional.http.jbossweb" unless="isJDK4"> <antcall target="tests.functional.main.http" inheritrefs="true"> <param name="remoting.metadata.key" value="remoting.metadata"/> <param name="metadata" value="serializationtype=${serialization}"/> @@ -981,7 +981,7 @@ </antcall> </target> - <target name="tests.functional.serialization.jboss.http.core" if="isJDK5"> + <target name="tests.functional.serialization.jboss.http.core" unless="isJDK4"> <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true"> <param name="serialization" value="jboss"/> </antcall> @@ -990,7 +990,7 @@ </antcall> </target> - <target name="tests.functional.http.jbossweb.core" if="isJDK5"> + <target name="tests.functional.http.jbossweb.core" unless="isJDK4"> <antcall target="tests.functional.main.http.core" inheritrefs="true"> <param name="remoting.metadata.key" value="remoting.metadata"/> <param name="metadata" value="serializationtype=${serialization}"/> @@ -1183,7 +1183,7 @@ </junit> </target> - <target name="tests.functional.main.isJDK5" depends="tests.jars" if="isJDK5"> + <target name="tests.functional.main.isJDK5" depends="tests.jars" unless="isJDK4"> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}"> @@ -1214,7 +1214,7 @@ </junit> </target> - <target name="tests.functional.main.isJDK5.core" depends="tests.jars" if="isJDK5"> + <target name="tests.functional.main.isJDK5.core" depends="tests.jars" unless="isJDK4"> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}"> @@ -1301,7 +1301,6 @@ <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> <echo>http (strict security) with ${version}: ${metadata}</echo> - <echo>ant.library.dir: ${ant.library.dir}</echo> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}" maxmemory="1024m"> @@ -1487,7 +1486,7 @@ <param name="metadata" value="serializationtype=java"/> </antcall> </target> - <target name="test.socket.serialization.jboss" if="isJDK5"> + <target name="test.socket.serialization.jboss" unless="isJDK4"> <antcall target="tests.socket" inheritrefs="true"> <param name="metadata" value="serializationtype=jboss"/> </antcall> @@ -2477,7 +2476,7 @@ </target> - <target name="tests.performance.serialization.jboss" depends="configure" if="isJDK5"> + <target name="tests.performance.serialization.jboss" depends="configure" unless="isJDK4"> <antcall target="tests.performance.rmi" inheritrefs="true"> <param name="remoting.metadata.key" value="remoting.metadata"/> @@ -2957,6 +2956,15 @@ <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/> <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <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="ant.library.dir" value="${ant.library.dir}"/> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> <!-- <batchtest fork="yes" todir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"--> @@ -3358,7 +3366,7 @@ </antcall> </target> - <target name="tests.stress.serialization.jboss" depends="configure" if="isJDK5"> + <target name="tests.stress.serialization.jboss" depends="configure" unless="isJDK4"> <antcall target="tests.stress.run" inheritrefs="true"> <param name="transport" value="rmi"/> </antcall>