[jboss-remoting-commits] JBoss Remoting SVN: r3674 - remoting2/branches/2.x.

Author: david.lloyd(a)jboss.com Date: 2008-03-20 11:41:51 -0400 (Thu, 20 Mar 2008) New Revision: 3674 Modified: remoting2/branches/2.x/build.xml remoting2/branches/2.x/test.policy Log: JBREM-920 - get it to work with codeBases (yay) - enough problems ironed out so I will commit - expect another commit as more tests are updated. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2008-03-20 06:03:36 UTC (rev 3673) +++ remoting2/branches/2.x/build.xml 2008-03-20 15:41:51 UTC (rev 3674) @@ -278,7 +278,7 @@ <pathelement path="${ant.library.dir}/ant-junit.jar"/> <pathelement location="${tests.compile.dir}"/> <path refid="library.classpath"/> - <pathelement path="${output.lib.dir}/jboss-remoting.jar"/> + <!--<pathelement path="${output.lib.dir}/jboss-remoting.jar"/>--> <pathelement path="${jdbc-driver-jar}"/> </path> @@ -936,6 +936,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <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}"/> @@ -982,8 +984,10 @@ <path refid="tests.classpath"/> <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/> </classpath> - <!--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="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}"/> @@ -1038,6 +1042,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <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}"/> @@ -1068,6 +1074,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <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}"/> @@ -1102,6 +1110,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <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}"/> @@ -1142,8 +1152,10 @@ <path refid="${classpath}"/> <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/> </classpath> - <!--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="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}"/> @@ -1192,6 +1204,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <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}"/> @@ -1220,6 +1234,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> + <sysproperty key="ant.library.dir" value="${ant.library.dir}"/> <sysproperty key="jrunit.bind_addr" value="${bind.address}"/> <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/> <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/> @@ -1283,6 +1299,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> + <sysproperty key="ant.library.dir" value="${ant.library.dir}"/> <!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer --> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <formatter type="xml"/> @@ -1311,6 +1329,8 @@ </classpath> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> + <sysproperty key="ant.library.dir" value="${ant.library.dir}"/> <sysproperty key="jrunit.bind_addr" value="${bind.address}"/> <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/> <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/> @@ -1771,6 +1791,7 @@ <!--<jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/>--> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -1802,8 +1823,9 @@ <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="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -1836,8 +1858,9 @@ <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="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -1871,8 +1894,9 @@ <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="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -1907,8 +1931,9 @@ <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}"/> + <sysproperty key="build.home" value="${basedir}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> <batchtest fork="yes" todir="${output.tests.results}" @@ -2028,6 +2053,7 @@ <jvmarg value="-Dserver.check_connection=${server.check_connection}"/> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -2055,6 +2081,7 @@ <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -2084,6 +2111,7 @@ <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/> <sysproperty key="java.security.manager" value=""/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> Modified: remoting2/branches/2.x/test.policy =================================================================== --- remoting2/branches/2.x/test.policy 2008-03-20 06:03:36 UTC (rev 3673) +++ remoting2/branches/2.x/test.policy 2008-03-20 15:41:51 UTC (rev 3674) @@ -1,6 +1,6 @@ // Permissions to run Remoting itself -grant { +grant codeBase "file:${build.home}/output/classes/-" { // Used by remote class loading system permission java.lang.RuntimePermission "createClassLoader"; @@ -13,41 +13,38 @@ // Permission to create an MBean server permission javax.management.MBeanServerPermission "createMBeanServer, releaseMBeanServer"; -}; -// Permissions for JBoss Serialization -grant { + // System properties accessed by Remoting + permission java.util.PropertyPermission "jboss.remoting.pre_2_0_compatible", "read"; + permission java.util.PropertyPermission "jboss.remoting.version", "read, write"; + permission java.util.PropertyPermission "legacyParsing", "read"; + permission java.util.PropertyPermission "jboss.bind.address", "read"; + permission java.util.PropertyPermission "remoting.bind_by_host", "read"; + permission java.util.PropertyPermission "javax.net.ssl.trustStoreType", "read"; + + // Permission to read the test keystore + permission java.io.FilePermission "${build.home}/output/tests/classes/-", "read"; + + // TODO - JBoss Serialization SHOULD be doing these operations in a privileged block - JBSER-105 permission java.lang.RuntimePermission "accessDeclaredMembers"; - permission java.io.SerializablePermission "enableSubstitution"; - permission java.io.SerializablePermission "enableSubclassImplementation"; + permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect"; permission java.lang.RuntimePermission "reflectionFactoryAccess"; + permission java.io.SerializablePermission "enableSubstitution"; // <- this one is a "maybe" :-) }; -// Permissions for JGroups -grant { - // todo - need to find out exactly what jgroups is trying to do here in order to narrow this down - permission java.io.FilePermission "-", "read, write, delete"; - permission java.io.FilePermission "/tmp/-", "read, write, delete"; +grant codeBase "file:${build.home}/lib/-" { + permission java.security.AllPermission; }; -// Permissions to run the test suite -grant { - // Used by at least one test case - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "setContextClassLoader"; +grant codeBase "file:${build.home}/src/etc/-" { + permission java.security.AllPermission; }; -// Permissions for JUnit itself to function -grant { - permission java.io.FilePermission "output/tests/-", "read, write, delete"; - permission java.io.FilePermission "<<ALL FILES>>", "execute"; - permission java.util.PropertyPermission "*", "read, write"; // todo - narrow this down a tad? - permission java.lang.RuntimePermission "setIO"; +grant codeBase "file:${build.home}/output/tests/classes/-" { + permission java.security.AllPermission; }; -// Uncomment for testing only -grant { -// permission java.io.FilePermission "<<ALL FILES>>", "read, write, delete"; -// permission java.security.AllPermission; -}; \ No newline at end of file +grant codeBase "file:${ant.library.dir}/-" { + permission java.security.AllPermission; +};