Author: ron.sigal(a)jboss.com Date: 2008-04-20 00:52:55 -0400 (Sun, 20 Apr 2008) New Revision: 4029 Modified: remoting2/branches/2.x/build.xml Log: JBREM-920: Will run with security manager if jdk is 1.6; otherwise, will run without security manager. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2008-04-20 04:48:36 UTC (rev 4028) +++ remoting2/branches/2.x/build.xml 2008-04-20 04:52:55 UTC (rev 4029) @@ -302,7 +302,7 @@ <!-- The combined library classpath --> <path id="library.classpath.tomcat"> <!--pathelement location="${compile.dir}"/--> - <pathelement path="${output.lib.dir}/jboss-remoting.jar"/> + <pathelement path="${output.lib.dir}/jboss-remoting.jar"/> <pathelement location="${etc.dir}"/> <path refid="third_party.classpath.tomcat"/> </path> @@ -349,14 +349,25 @@ <property name="perf.seq.dojboss" value="yes"/> <!-- set the security manager information for unit tests --> + <condition property="java.security.manager.key" value="java.security.manager"> + <isset property="isJDK6"/> + </condition> + + <condition property="java.security.manager.key" value="no.java.security.manager"> + <or> + <isset property="isJDK4"/> + <isset property="isJDK5"/> + </or> + </condition> + <property name="java.security.policy" value="${etc.dir}/remoting.security.policy"/> <property name="java.security.policy.marshal" value="${etc.dir}/remoting.security.policy.marshal"/> <property name="java.security.policy.strict" value="${etc.dir}/remoting.security.policy.strict"/> - <property name="java.security.manager" value=""/> + <property name="${java.security.manager.key}" 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}" @@ -370,7 +381,7 @@ files="remoting.security.policy.core, remoting.security.policy.tests.minimal"/> </concat> - + <!-- Create security policy file for tests.marshall --> <concat destfile="${etc.dir}/remoting.security.policy.marshal"> <filelist dir="${etc.dir}" @@ -1025,7 +1036,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1079,7 +1090,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1141,7 +1152,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" value="${java.security.manager}"/> + <sysproperty key="${java.security.manager.key}" 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}"/> @@ -1181,7 +1192,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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="ant.library.dir" value="${ant.library.dir}"/> @@ -1212,7 +1223,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1251,7 +1262,7 @@ <classpath> <path refid="${classpath}"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1290,7 +1301,7 @@ <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> + <echo>ant.library.dir: ${ant.library.dir}</echo> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}" maxmemory="1024m"> @@ -1299,7 +1310,7 @@ <classpath> <path refid="${classpath}"/> </classpath> - <sysproperty key="java.security.manager" value="${java.security.manager}"/> + <sysproperty key="${java.security.manager.key}" 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}"/> @@ -1338,7 +1349,7 @@ <classpath> <path refid="${classpath}"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1391,7 +1402,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1424,7 +1435,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1492,7 +1503,7 @@ <classpath> <path refid="tests.classpath"/> </classpath> - <sysproperty key="java.security.manager" 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}"/> @@ -1526,7 +1537,7 @@ <path refid="tests.marshall.classpath"/> <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/> </classpath> - <sysproperty key="java.security.manager" value="${java.security.manager}"/> + <sysproperty key="${java.security.manager.key}" value="${java.security.manager}"/> <sysproperty key="java.security.policy" value="${java.security.policy.marshal}"/> <sysproperty key="java.security.debug" value="${java.security.debug}"/> <sysproperty key="build.home" value="${basedir}"/> @@ -1616,7 +1627,7 @@ <target name="tests.versioning.all" description="Runs remoting fuctional tests with different remoting versions for client and server." depends="jars, tests.jars"> - + <!-- ******************************************************************************** --> <!-- Current <- -> Current --> <antcall target="tests.versioning.all_transports" inheritrefs="true"> @@ -1992,7 +2003,7 @@ <jvmarg value="-Dclient.path=${client.classpath}"/> <jvmarg value="-Dserver.path=${server.classpath}"/> <!--<jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/>--> - <sysproperty key="java.security.manager" 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}"/> @@ -2030,7 +2041,7 @@ <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="${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}"/> @@ -2069,7 +2080,7 @@ <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="${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}"/> @@ -2109,7 +2120,7 @@ <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="${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}"/> @@ -2150,7 +2161,7 @@ <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="${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}"/> @@ -2274,7 +2285,7 @@ <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" 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}"/> @@ -2306,7 +2317,7 @@ <jvmarg value="-Dclient.path=${client.classpath}"/> <jvmarg value="-Dserver.path=${server.classpath}"/> <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/> - <sysproperty key="java.security.manager" 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}"/> @@ -2340,7 +2351,7 @@ <jvmarg value="-Dclient.path=${client.classpath}"/> <jvmarg value="-Dserver.path=${server.classpath}"/> <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/> - <sysproperty key="java.security.manager" 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}"/>