Author: peter_firmstone Date: Mon Jul 23 12:49:12 2012 New Revision: 1364614
URL: http://svn.apache.org/viewvc?rev=1364614&view=rev Log: Changes to make SubPoliciesTest platform independent. File path was "Live Free or Die" UNIX specific. Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.1.policy river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy?rev=1364614&r1=1364613&r2=1364614&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy Mon Jul 23 12:49:12 2012 @@ -55,30 +55,14 @@ grant { permission java.util.PropertyPermission "*", "read"; }; -grant codeBase "file:/foo/*" { +grant codeBase "file:${com.sun.jini.jsk.home}/foo/*" { permission java.lang.RuntimePermission "B0"; }; -grant codeBase "file:/foo/-" { +grant codeBase "file:${com.sun.jini.jsk.home}/foo/-" { permission java.lang.RuntimePermission "C0"; }; -grant codeBase "file:/bar.jar" { +grant codeBase "file:${com.sun.jini.jsk.home}/bar.jar" { permission java.lang.RuntimePermission "D0"; }; - -/* For Microsoft Platform URI grants, URL prepends /C: while URI doesn't - * this is only required for pseudo URI strings. - */ - -grant codeBase "file:/C:/foo/*" { - permission java.lang.RuntimePermission "B0"; -}; - -grant codeBase "file:/C:/foo/-" { - permission java.lang.RuntimePermission "C0"; -}; - -grant codeBase "file:/C:/bar.jar" { - permission java.lang.RuntimePermission "D0"; -}; \ No newline at end of file Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.1.policy URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.1.policy?rev=1364614&r1=1364613&r2=1364614&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.1.policy (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.1.policy Mon Jul 23 12:49:12 2012 @@ -6,30 +6,14 @@ grant { permission java.lang.RuntimePermission "A1"; }; -grant codeBase "file:///foo/*" { +grant codeBase "file:${com.sun.jini.jsk.home}/foo/*" { permission java.lang.RuntimePermission "B1"; }; -grant codeBase "file:///foo/-" { +grant codeBase "file:${com.sun.jini.jsk.home}/foo/-" { permission java.lang.RuntimePermission "C1"; }; -grant codeBase "file:///bar.jar" { +grant codeBase "file:${com.sun.jini.jsk.home}/bar.jar" { permission java.lang.RuntimePermission "D1"; }; - -/* For Microsoft Platform URI grants, URL prepends /C: while URI doesn't - * this is only required for pseudo URI strings. - */ - -grant codeBase "file:///C:/foo/*" { - permission java.lang.RuntimePermission "B1"; -}; - -grant codeBase "file:///C:/foo/-" { - permission java.lang.RuntimePermission "C1"; -}; - -grant codeBase "file:///C:/bar.jar" { - permission java.lang.RuntimePermission "D1"; -}; \ No newline at end of file Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java?rev=1364614&r1=1364613&r2=1364614&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java Mon Jul 23 12:49:12 2012 @@ -35,6 +35,7 @@ import org.apache.river.api.security.Con public class SubPoliciesTest extends QATest { private String policy0File; private String policy1File; + private static String jsk_home = System.getProperty("com.sun.jini.jsk.home"); public void setup(QAConfig sysConfig) throws Exception { super.setup(sysConfig); @@ -51,9 +52,9 @@ public class SubPoliciesTest extends QAT System.setSecurityManager(new SecurityManager()); } ClassLoader ldr1 = new URLClassLoader( - new URL[]{ new URL("file:/foo") }); + new URL[]{ new URL("file:" + jsk_home +"/foo") }); ClassLoader ldr2 = new URLClassLoader( - new URL[]{ new URL("file:/bar") }, ldr1); + new URL[]{ new URL("file:" + jsk_home + "/bar") }, ldr1); Thread thr = Thread.currentThread(); AggregatePolicyProvider policy = new AggregatePolicyProvider(); @@ -127,7 +128,7 @@ public class SubPoliciesTest extends QAT } static void checkPolicy0Permissions(Policy policy) throws Exception { - checkPermissions(policy, "file:/foo/bar", + checkPermissions(policy, "file:"+ jsk_home + "/foo/bar", new Permission[]{ new RuntimePermission("A0"), new RuntimePermission("B0"), @@ -137,7 +138,7 @@ public class SubPoliciesTest extends QAT new RuntimePermission("D0"), new RuntimePermission("A1") }); - checkPermissions(policy, "file:/foo/bar/baz", + checkPermissions(policy, "file:" + jsk_home + "/foo/bar/baz", new Permission[]{ new RuntimePermission("A0"), new RuntimePermission("C0") @@ -147,7 +148,7 @@ public class SubPoliciesTest extends QAT new RuntimePermission("D0"), new RuntimePermission("A1") }); - checkPermissions(policy, "file:/bar.jar", + checkPermissions(policy, "file:" + jsk_home + "/bar.jar", new Permission[]{ new RuntimePermission("A0"), new RuntimePermission("D0") @@ -157,7 +158,7 @@ public class SubPoliciesTest extends QAT new RuntimePermission("C0"), new RuntimePermission("A1") }); - checkPermissions(policy, "file:/other", + checkPermissions(policy, "file:" + jsk_home + "/other", new Permission[]{ new RuntimePermission("A0"), }, @@ -170,7 +171,7 @@ public class SubPoliciesTest extends QAT } static void checkPolicy1Permissions(Policy policy) throws Exception { - checkPermissions(policy, "file:/foo/bar", + checkPermissions(policy, "file:" +jsk_home + "/foo/bar", new Permission[]{ new RuntimePermission("A1"), new RuntimePermission("B1"), @@ -180,7 +181,7 @@ public class SubPoliciesTest extends QAT new RuntimePermission("D1"), new RuntimePermission("A0") }); - checkPermissions(policy, "file:/foo/bar/baz", + checkPermissions(policy, "file:" + jsk_home + "/foo/bar/baz", new Permission[]{ new RuntimePermission("A1"), new RuntimePermission("C1") @@ -190,7 +191,7 @@ public class SubPoliciesTest extends QAT new RuntimePermission("D1"), new RuntimePermission("A0") }); - checkPermissions(policy, "file:/bar.jar", + checkPermissions(policy, "file:" + jsk_home + "/bar.jar", new Permission[]{ new RuntimePermission("A1"), new RuntimePermission("D1") @@ -200,7 +201,7 @@ public class SubPoliciesTest extends QAT new RuntimePermission("C1"), new RuntimePermission("A0") }); - checkPermissions(policy, "file:/other", + checkPermissions(policy, "file:" + jsk_home + "/other", new Permission[]{ new RuntimePermission("A1"), },
