river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1242750 [3/5] - in /river/jtsk/trunk: ./ asm/ qa/ qa/doc/ qa/harness/policy/ qa/harness/trust/ qa/jtreg/certs/ qa/jtreg/certs/keys/ qa/jtreg/net/jini/jeri/ssl/UnitTests/ qa/jtreg/net/jini/jeri/tcp/localHostExposure/ qa/jtreg/net/jini/jeri/...
Date Fri, 10 Feb 2012 11:53:36 GMT
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTest.td Fri Feb 10 11:53:29 2012
@@ -2,8 +2,11 @@ testClass=SecurityTest
 testCategories=start,start_impl
 #testClasspath=${com.sun.jini.qa.home}$/lib$/harness.jar$:${com.sun.jini.qa.home}$/lib$/qa1-start-tests.jar$:${com.sun.jini.qa.home}$/lib$/$qajinidep$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar
 
-testClasspath=<harnessJar>$:<file:lib/qa1-start-tests.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
-
+testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar>
+#testjvmargs=\
+#-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
 
 /*******************************************************************************
  * Test-specific property files
@@ -15,7 +18,8 @@ com.sun.jini.test.impl.start.SecurityTes
 com.sun.jini.test.impl.start.SecurityTest1.codebase=http://${HOST}:${com.sun.jini.test.port}/qa1-start-testservice1-dl.jar
 com.sun.jini.test.impl.start.SecurityTest1.policyfile=<url:securityTest.testservice1.policy>
 com.sun.jini.test.impl.start.SecurityTest1.log=none
-com.sun.jini.test.impl.start.SecurityTest1.serverjvmargs=
+com.sun.jini.test.impl.start.SecurityTest1.serverjvmargs=-Dnet.jini.security.policy.PolicyFileProvider.basePolicyClass=sun.security.provider.PolicyFile,\
+-Dnet.jini.security.policy.DynamicPolicyProvider.basePolicyClass=net.jini.security.policy.PolicyFileProvider
 com.sun.jini.test.impl.start.SecurityTest1.serviceConfiguration=<url:configs/<config>/testservice.config>
 com.sun.jini.test.impl.start.SecurityTest1.starterConfiguration=<url:configs/<config>/testservice.config>
 com.sun.jini.test.impl.start.SecurityTest1.host=master

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.td Fri Feb 10 11:53:29 2012
@@ -3,7 +3,7 @@ testCategories=start,start_impl
 
 #testClasspath=${com.sun.jini.qa.home}$/lib$/harness.jar$:${com.sun.jini.qa.home}$/lib$/qa1-start-tests.jar$:${com.sun.jini.qa.home}$/lib$/$qajinidep$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar
 
-testClasspath=<harnessJar>$:<file:lib/qa1-start-tests.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar>
 
 
 /*******************************************************************************

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadTransientServiceTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadTransientServiceTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadTransientServiceTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadTransientServiceTest.td Fri Feb 10 11:53:29 2012
@@ -1,3 +1,7 @@
 testClass=ServiceStarterCreateBadTransientServiceTest
 testCategories=start,start_impl
 include0=start.properties
+#testjvmargs=\
+#-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
\ No newline at end of file

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/CheckContextAction.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/CheckContextAction.java?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/CheckContextAction.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/CheckContextAction.java Fri Feb 10 11:53:29 2012
@@ -31,9 +31,9 @@ public class CheckContextAction implemen
 	}
 
 	SecurityManager sm = System.getSecurityManager();
-	for (int i = 0; i < GetContextTest.passPermissions.length; i++) {
-	    sm.checkPermission(GetContextTest.passPermissions[i]);
-	}
+        for (int i = 0; i < GetContextTest.passPermissions.length; i++) {
+            sm.checkPermission(GetContextTest.passPermissions[i]);
+        }
 	for (int i = 0; i < GetContextTest.failPermissions.length; i++) {
 	    try {
 		sm.checkPermission(GetContextTest.failPermissions[i]);

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java Fri Feb 10 11:53:29 2012
@@ -43,20 +43,20 @@ import com.sun.jini.qa.harness.QAConfig;
  */
 public class GetContextTest extends QATest {
 
-    public static SecurityContext securityContext;
-    public static Permission[] passPermissions = {
+    public static volatile SecurityContext securityContext;
+    public static final Permission[] passPermissions = {
 	new RuntimePermission("A")
     };
-    public static Permission[] failPermissions = { 
+    public static final Permission[] failPermissions = { 
 	new RuntimePermission("B"),
 	new RuntimePermission("C"),
 	new RuntimePermission("D")
     };
-    public static PrivilegedAction checkContextAction;
-    public static ClassLoader contextClassLoader;
-    private String getContextJarFile;
-    private String restoreContextJarFile;
-    private String checkContextActionJarFile;
+    public static volatile PrivilegedAction checkContextAction;
+    public static volatile ClassLoader contextClassLoader;
+    private volatile String getContextJarFile;
+    private volatile String restoreContextJarFile;
+    private volatile String checkContextActionJarFile;
 
     public void setup(QAConfig sysConfig) throws Exception {
 	super.setup(sysConfig);

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy Fri Feb 10 11:53:29 2012
@@ -25,8 +25,14 @@ grant codebase "file:${com.sun.jini.qa.h
     permission java.security.AllPermission "", "";
 };
 
-grant codeBase "file:${java.home}/lib/ext/*" {
-    permission java.security.AllPermission;
+//grant codeBase "file:${java.home}/lib/ext/*" {
+//    permission java.security.AllPermission;
+//};
+
+// For SecurityManager used from command line
+grant codeBase "file:${com.sun.jini.qa.home}${/}lib${/}qa1-start-tests.jar" {
+    permission java.io.FilePermission "-", "read";
+    permission java.lang.RuntimePermission "getProtectionDomain";
 };
 
 grant {
@@ -39,6 +45,7 @@ grant {
     permission java.util.PropertyPermission "*", "read,write";
     permission java.security.SecurityPermission "getProperty.*";
     permission java.security.SecurityPermission "setPolicy";
+    permission java.security.SecurityPermission "getPolicy";
 };
 
 grant codeBase "file:${com.sun.jini.test.home}${/}lib${/}qa1-start-cb1.jar" {

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.td Fri Feb 10 11:53:29 2012
@@ -2,9 +2,13 @@ testClass=GetContextTest
 testCategories=start,start_impl
 #testClasspath=<harnessJar>$:${com.sun.jini.qa.home}$/lib$/qa1-start-tests.jar$:${com.sun.jini.qa.home}$/lib$/$qajinidep$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar
 
-testClasspath=<harnessJar>$:<file:lib/qa1-start-tests.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar>
 testPolicyfile=GetContextTest.policy
 getContextJarFile=<file:lib/qa1-start-cb1.jar>
 restoreContextJarFile=<file:lib/qa1-start-cb2.jar>
 checkContextActionJarFile=<file:lib/qa1-start-cb3.jar>
 include0=../start.properties
+#testjvmargs=\
+#-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
\ No newline at end of file

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=1242750&r1=1242749&r2=1242750&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 Fri Feb 10 11:53:29 2012
@@ -25,8 +25,15 @@ grant codebase "file:${com.sun.jini.qa.h
     permission java.security.AllPermission "", "";
 };
 
-grant codeBase "file:${java.home}/lib/ext/*" {
-    permission java.security.AllPermission;
+grant codeBase "file:${{java.ext.dirs}}/*" {
+        permission java.security.AllPermission;
+};
+
+
+// For SecurityManager used from command line
+grant codeBase "file:${com.sun.jini.qa.home}${/}lib${/}qa1-start-tests.jar" {
+    //permission java.io.FilePermission "-", "read";
+    permission java.lang.RuntimePermission "getProtectionDomain";
 };
 
 grant {
@@ -39,10 +46,12 @@ grant {
     permission java.lang.RuntimePermission "createClassLoader";
     permission java.lang.RuntimePermission "setContextClassLoader";
     permission java.lang.RuntimePermission "setSecurityManager";
+    permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.util.PropertyPermission
         "java.security.policy", "read,write";
     permission java.security.SecurityPermission "getProperty.*";
     permission java.security.SecurityPermission "setPolicy";
+    permission java.security.SecurityPermission "getPolicy";
     permission java.util.PropertyPermission "*", "read";
 };
 

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td Fri Feb 10 11:53:29 2012
@@ -2,7 +2,7 @@ testClass=SubPoliciesTest
 testCategories=start,start_impl
 #testClasspath=${com.sun.jini.qa.home}$/lib$/harness.jar$:${com.sun.jini.qa.home}$/lib$/qa1-start-tests.jar$:${com.sun.jini.qa.home}$/lib$/$qajinidep$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar
 
-testClasspath=<harnessJar>$:<file:lib/qa1-start-tests.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar>
 testPolicyfile=SubPoliciesTest.0.policy
 
 #!!!! the next two lines are wrong

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java Fri Feb 10 11:53:29 2012
@@ -28,10 +28,12 @@ import net.jini.security.policy.*;
 import java.io.File;
 import java.net.*;
 import java.security.*;
-import java.util.Collections;
 import com.sun.jini.qa.harness.QATest;
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
 
 public class LoaderSplitPolicyProviderTest extends QATest {
     private String ldrPolicyFile;
@@ -146,7 +148,7 @@ public class LoaderSplitPolicyProviderTe
 	    throw new TestException("Does not satisfy implies conditions for "
                     + perm + ".");
 	}
-
+        
 	if (!contains(pol.getPermissions(myPd), perm) ||
 	    contains(pol.getPermissions(fooPd), perm) ||
 	    contains(pol.getPermissions(barPd), perm) ||
@@ -212,7 +214,22 @@ public class LoaderSplitPolicyProviderTe
 	}
     }
 
+    /*
+     * Dynamic policy no longer returns the permission directly, instead
+     * it encapsulates it in a container Permission that implies nothing,
+     * it is useful for debugging only since it delegates toString()
+     * to the encapsulated Permission.
+     * 
+     * Dynamic policy does this to prevent the Permission becoming merged
+     * in the ProtectionDomain.
+     */
     static boolean contains(PermissionCollection pc, Permission p) {
-	return Collections.list(pc.elements()).contains(p);
+//	return Collections.list(pc.elements()).contains(p);
+        Set<String> perms = new HashSet<String>();
+        Enumeration<Permission> e = pc.elements();
+        while (e.hasMoreElements()){
+            perms.add(e.nextElement().toString());
+        }
+        return perms.contains(p.toString());
     }
 }

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=LoaderSplitPolicyProviderTest
 testCategories=start,start_impl
-testClasspath=<harnessJar>$:<file:lib/qa1-start-tests.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar>
 testPolicyfile=<url:harness/policy/defaulttest.policy>
 ldrPolicyfile=<url:LoaderSplitPolicyProviderTest.loader.policy>
 defPolicyfile=<url:/LoaderSplitPolicyProviderTest.default.policy>

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.sharedgroup.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.sharedgroup.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.sharedgroup.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.sharedgroup.policy Fri Feb 10 11:53:29 2012
@@ -1,3 +1,11 @@
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant {
     permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read,write,delete";
     permission java.net.SocketPermission "*:*", "connect,resolve";

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice1.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice1.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice1.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice1.policy Fri Feb 10 11:53:29 2012
@@ -1,3 +1,11 @@
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant {
     permission java.io.FilePermission
     "${java.io.tmpdir}${/}testservice1", "read";

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice2.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice2.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice2.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice2.policy Fri Feb 10 11:53:29 2012
@@ -1,3 +1,11 @@
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant {
     permission java.io.FilePermission "${java.io.tmpdir}${/}testservice2", "read";
     permission java.io.FilePermission

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy Fri Feb 10 11:53:29 2012
@@ -8,10 +8,19 @@ grant codebase "file:${com.sun.jini.test
 };
 
 grant {
+        permission java.util.PropertyPermission "java.system.class.loader", "read";
 	permission java.io.FilePermission "${com.sun.jini.test.home}${/}lib${/}-", "read";
         permission java.util.PropertyPermission "com.sun.jini.reggie.enableImplToStubReplacement", "read";
 };
 
+grant {
+    permission com.sun.jini.phoenix.ExecOptionPermission "*";
+    // for a start test
+    permission com.sun.jini.phoenix.ExecPermission "/bin/javax";
+    permission java.util.PropertyPermission "FILEPOLICY02", "read";
+    permission java.security.SecurityPermission "getPolicy";
+};
+
 grant codebase "file:${com.sun.jini.test.home}${/}lib${/}qa1-start-tests.jar" {
     permission java.security.AllPermission "", "";
 };
@@ -46,6 +55,10 @@ grant codebase "file:${com.sun.jini.test
     permission java.security.AllPermission "", "";
 };
 
+// required for new PolicyFile provider.
+grant codeBase "file:${{java.ext.dirs}}/*" {
+        permission java.security.AllPermission;
+};
 
 grant codebase "file:${com.sun.jini.qa.harness.testJar}" {
     permission net.jini.security.GrantPermission

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy Fri Feb 10 11:53:29 2012
@@ -1,3 +1,12 @@
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
+
 grant {
     permission java.security.SecurityPermission "getDomainCombiner";
     permission java.security.SecurityPermission "createAccessControlContext";

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement_NoContext.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement_NoContext.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement_NoContext.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement_NoContext.td Fri Feb 10 11:53:29 2012
@@ -1,5 +1,5 @@
 testClass=GetServerContextElement_NoContext
 testCategories=export_spec,spec
-testClasspath=<file:lib/qa1-export-servercontext-tests-null.jar>$:<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=<file:lib/qa1-export-servercontext-tests-null.jar>$:${testClasspath}
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.td Fri Feb 10 11:53:29 2012
@@ -1,5 +1,5 @@
 testClass=GetServerContext_NoContext
 testCategories=export_spec,spec
-testClasspath=<file:lib/qa1-export-servercontext-tests-null.jar>$:<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=<file:lib/qa1-export-servercontext-tests-null.jar>$:${testClasspath}
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.td Fri Feb 10 11:53:29 2012
@@ -1,5 +1,5 @@
 testClass=GetServerContext_ProvidersParsing
 testCategories=export_spec,spec
-testClasspath=<file:lib/qa1-export-servercontext-tests-providers-parsing.jar>$:<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=<file:lib/qa1-export-servercontext-tests-providers-parsing.jar>$:${testClasspath}
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.td Fri Feb 10 11:53:29 2012
@@ -1,5 +1,5 @@
 testClass=GetServerContext_Providers_NonNull
 testCategories=export_spec,spec
-testClasspath=<file:lib/qa1-export-servercontext-tests-non-null.jar>$:<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=<file:lib/qa1-export-servercontext-tests-non-null.jar>$:${testClasspath}
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.td Fri Feb 10 11:53:29 2012
@@ -2,3 +2,4 @@ testClass=ConstructorAccessorTest
 testCategories=id,id_spec
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
+#testjvmargs=-Djava.security.manager=com.sun.jini.tool.ProfilingSecurityManager

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=ConstructorAccessorTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 include0=../io.properties

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=LoadClass_ExceptionTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.io.util.FakeRMIClassLoaderSpi
 
 com.sun.jini.test.spec.io.util.fakeArgumentJar=http://${HOST}:${com.sun.jini.test.port}/qa1-io-util-dl.jar

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=LoadClass_NullArgsTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 include0=../io.properties

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=LoadClass_VerifyCodebaseIntegrityTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 
 com.sun.jini.test.spec.io.util.fakeArgumentJar=http://${HOST}:${com.sun.jini.test.port}/qa1-io-util-dl.jar
 com.sun.jini.qa.harness.runkitserver=false 

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Resolve_LoadClassExceptionTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.io.util.FakeRMIClassLoaderSpi
 
 com.sun.jini.test.spec.io.util.fakeArgumentJar=http://${HOST}:${com.sun.jini.test.port}/qa1-io-util-dl.jar

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Resolve_LoadClassTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.io.util.FakeRMIClassLoaderSpi
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Resolve_NullArgsTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 include0=../io.properties

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Resolve_ReadAnnotationExceptionTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Resolve_VerifyCodebaseIntegrityTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalinputstream-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalinputstream-test.jar>
 
 com.sun.jini.test.spec.io.util.fakeArgumentJar=http://${HOST}:${com.sun.jini.test.port}/qa1-io-util-dl.jar
 com.sun.jini.qa.harness.runkitserver=false 

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=ConstructorTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalledinstance-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalledinstance-test.jar>
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 include0=../io.properties

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=ConvertToMarshalledObjectTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalledinstance-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalledinstance-test.jar>
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 include0=../io.properties

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Get_ExceptionTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalledinstance-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalledinstance-test.jar>
 
 com.sun.jini.test.spec.io.util.fakeArgumentJar=http://${HOST}:${com.sun.jini.test.port}/qa1-io-util-dl.jar
 com.sun.jini.qa.harness.runkitserver=false 

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=Get_NormalTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalledinstance-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalledinstance-test.jar>
 
 com.sun.jini.test.spec.io.util.fakeArgumentJar=http://${HOST}:${com.sun.jini.test.port}/qa1-io-util-dl.jar
 com.sun.jini.qa.harness.runkitserver=false 

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td Fri Feb 10 11:53:29 2012
@@ -1,6 +1,6 @@
 testClass=ObjectMethodsTest
 testCategories=io,io_spec
-testClasspath=<harnessJar>$:<file:lib/qa1-io-marshalledinstance-test.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${altClasspath}$:<file:lib/qa1-io-marshalledinstance-test.jar>
 testjvmargs=-Djava.rmi.server.RMIClassLoaderSpi=com.sun.jini.test.spec.io.util.FakeRMIClassLoaderSpi
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td Fri Feb 10 11:53:29 2012
@@ -3,3 +3,11 @@ testCategories=jeri,jeri_spec
 testConfiguration=<url: HttpsServerEndpointTest.config>
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
+#testjvmargs=\
+#-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
+#-Djava.security.debug=access:failure,\
+#-Dnet.jini.security.policy.PolicyFileProvider.basePolicyClass=net.jini.security.policy.ConcurrentPolicyFile,\
+#-Djava.security.manager=com.sun.jini.tool.ProfilingSecurityManager,\
+#${testjvmargs}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy Fri Feb 10 11:53:29 2012
@@ -43,6 +43,11 @@ grant principal "server" {
         "accept,connect";
 };
 
+grant {
+    permission java.lang.RuntimePermission "setIO";
+    permission java.lang.RuntimePermission "getenv.SOUL";
+};
+
 /**
  * The following grant is only used during test development when the
  * tests do not reside inside qa1.jar

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy Fri Feb 10 11:53:29 2012
@@ -14,6 +14,14 @@
  * 5. allow call setFactory().
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant codebase "http://*:${com.sun.jini.test.port}/qa1-loader-pref.jar" {
     permission net.jini.loader.DownloadPermission;
 };

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,15 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
+
 /*
  * Test-specific policy:
  * 1. allow call getProtectionDomain().

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy Fri Feb 10 11:53:29 2012
@@ -14,6 +14,14 @@
  * 5. allow call setFactory().
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant codebase "http://*:${com.sun.jini.test.port}/qa1-loader-pref.jar" {
     permission net.jini.loader.DownloadPermission;
 };

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow call getProtectionDomain().

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,15 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy Fri Feb 10 11:53:29 2012
@@ -4,6 +4,15 @@
  * as policy.qaHarness).
  */
 
+
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow classes coming from qa1-loader-pref.jar (via http:// and file:/)

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,15 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
+
 /*
  * Test-specific policy:
  * 1. allow call getProtectionDomain().

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,15 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy Fri Feb 10 11:53:29 2012
@@ -4,6 +4,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow classes coming from qa1-loader-pref.jar (via http:// and file:/)

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow call getProtectionDomain().

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy Fri Feb 10 11:53:29 2012
@@ -5,6 +5,14 @@
  * as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow connection to all hosts.

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td Fri Feb 10 11:53:29 2012
@@ -1,5 +1,5 @@
 testClass=DiscardDNE
 testCategories=locatordiscovery,locatordiscovery_spec,speclocatordiscovery
-testClasspath=<harnessJar>$:<testJar>$:<file:lib/qa1-lookup-simulator.jar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
+testClasspath=${testClasspath}$:<file:lib/qa1-lookup-simulator.jar>
 include0=locatordiscovery.properties
 include1=com/sun/jini/test/share/reggie1_0.properties

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td Fri Feb 10 11:53:29 2012
@@ -1,3 +1,5 @@
 testClass=MultipleEvntLeaseRenewals
 testCategories=lookupservice,lookupservice_spec,test_set00
 include0=../lookupservice.properties
+testjvmargs=-Dcom.sun.jini.test.spec.lookupservice.deltaTListener=20,\
+${testjvmargs}
\ No newline at end of file

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td Fri Feb 10 11:53:29 2012
@@ -1,3 +1,8 @@
 testClass=NotifyOnAttrAdd
 testCategories=lookupservice,lookupservice_spec,test_set00
 include0=../lookupservice.properties
+#testjvmargs=-Djava.security.debug=access,\
+testjvmargs=-Dcom.sun.jini.test.spec.lookupservice.deltaTListener=20,\
+#testjvmargs=-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+${testjvmargs}
\ No newline at end of file

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td Fri Feb 10 11:53:29 2012
@@ -1,3 +1,5 @@
 testClass=NotifyOnAttrDel
 testCategories=lookupservice,lookupservice_spec,test_set00
 include0=../lookupservice.properties
+testjvmargs=-Dcom.sun.jini.test.spec.lookupservice.deltaTListener=20,\
+${testjvmargs}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td Fri Feb 10 11:53:29 2012
@@ -1,3 +1,5 @@
 testClass=NotifyOnAttrMod
 testCategories=lookupservice,lookupservice_spec,test_set00
 include0=../lookupservice.properties
+testjvmargs=-Dcom.sun.jini.test.spec.lookupservice.deltaTListener=30,\
+${testjvmargs}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td Fri Feb 10 11:53:29 2012
@@ -1,3 +1,5 @@
 testClass=NotifyOnAttrSet
 testCategories=lookupservice,lookupservice_spec,test_set02
 include0=../lookupservice.properties
+testjvmargs=-Dcom.sun.jini.test.spec.lookupservice.deltaTListener=30,\
+${testjvmargs}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java Fri Feb 10 11:53:29 2012
@@ -347,13 +347,19 @@ public abstract class DynamicPolicyProvi
      *
      * @param pd the ProtectionDomain or null.
      * @param p  permissions granted earlier or null.
+     * @param dynamicallyGranted   This indicates that these permissions 
+     * have been dynamically granted.
+     * If the policy being tested supports revoking 
+     * permissions, dynamically granted permissions passed in must not be present, as this
+     * will remove the ability to revoke the permissions as they will become
+     * merged into the PermissionDomain's cached PermissionCollection.
      * @param msg  string to format log message.
      *
      * @throws TestException if failed
      *
      */
     protected void callGetPermissions(ProtectionDomain pd, Permission[] p,
-            String msg) throws TestException {
+                                            String msg) throws TestException {
         // Returned permissions.
         PermissionCollection pReturned = null;
 
@@ -372,7 +378,7 @@ public abstract class DynamicPolicyProvi
             throw new TestException(Util.fail(msg, SNULL,
                     "PermissionCollection"));
         }
-
+        
         for (int i = 0; i < p.length; i++) {
             if (!pReturned.implies(p[i])) {
                 String prm = p[i].toString();
@@ -396,8 +402,8 @@ public abstract class DynamicPolicyProvi
      * @throws TestException if failed
      *
      */
-    protected void callGetPermissions(CodeSource cs, Permission[] p, String msg)
-            throws TestException {
+    protected void callGetPermissions(CodeSource cs, Permission[] p,
+            boolean dynamicallyGranted, String msg) throws TestException {
         // Returned permissions.
         PermissionCollection pReturned = null;
 
@@ -420,7 +426,18 @@ public abstract class DynamicPolicyProvi
             throw new TestException(Util.fail(msg, SNULL,
                     "PermissionCollection"));
         }
-
+        if ( dynamicallyGranted && policy.revokeSupported()){
+            for (int i = 0; i < p.length; i++) {
+                if (pReturned.implies(p[i])) {
+                    String prm = p[i].toString();
+                    String exp = "PermissionCollection does not contain " + prm;
+                    String ret = "PermissionCollection contains " + prm;
+                    throw new TestException(Util.fail(msg, ret, exp));
+                }
+            }
+            logger.log(Level.FINE, Util.pass(msg, "permission(s) not present"));
+            return;
+        }
         for (int i = 0; i < p.length; i++) {
             if (!pReturned.implies(p[i])) {
                 String prm = p[i].toString();

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td Fri Feb 10 11:53:29 2012
@@ -4,3 +4,7 @@ testPolicyfile=policyProviderGrant01.pol
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+#testjvmargs=\
+#-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
\ No newline at end of file

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java Fri Feb 10 11:53:29 2012
@@ -355,12 +355,12 @@ public class GrantNoPrincipalCase02 exte
                     Permission[] p = new Permission[] {
                         pmDynamicGranted[k] };
                     boolean shouldReturn = (k <= i);
-                    checkImplies(pd, p, shouldReturn, false);
-                    checkImplies(pdNew01, p, shouldReturn, false);
-                    checkImplies(pdNew02, p, shouldReturn, false);
+                        checkImplies(pd, p, shouldReturn, false);
+                        checkImplies(pdNew01, p, shouldReturn, false);
+                        checkImplies(pdNew02, p, shouldReturn, false);
+                    }
                 }
             }
-        }
 
         /*
          * Call grant() on DynamicPolicyProvider passing
@@ -382,78 +382,78 @@ public class GrantNoPrincipalCase02 exte
         for (int i = 0; i < protectionDomains.length; i++) {
             ProtectionDomain pd = protectionDomains[i];
 
-            /*
-             * Call implies on DynamicPolicyProvider passing
-             * pmAll permissions. Verify that implies()
-             * returns true for null and non-null
-             * ProtectionDomains.
-             */
-            checkImplies(pd, pmAll, true, false);
-
-            /*
-             * Call implies on DynamicPolicyProvider passing
-             * permissions that granted in the policy file. Verify that
-             * implies() returns false if ProtectionDomain is equal to null,
-             * and verify that implies() returns true for non-null
-             * ProtectionDomains.
-             */
-            checkImplies(pd, pmGranted, true, true);
-
-            /*
-             * Call implies on DynamicPolicyProvider passing
-             * not granted permissions. Verify that implies()
-             * returns false for null and non-null
-             * ProtectionDomains.
-             */
-            checkImplies(pd, pmDynamicNotGranted, false, false);
+                /*
+                 * Call implies on DynamicPolicyProvider passing
+                 * pmAll permissions. Verify that implies()
+                 * returns true for null and non-null
+                 * ProtectionDomains.
+                 */
+                checkImplies(pd, pmAll, true, false);
 
-            if (pd == null) {
-                continue;
-            }
+                /*
+                 * Call implies on DynamicPolicyProvider passing
+                 * permissions that granted in the policy file. Verify that
+                 * implies() returns false if ProtectionDomain is equal to null,
+                 * and verify that implies() returns true for non-null
+                 * ProtectionDomains.
+                 */
+                checkImplies(pd, pmGranted, true, true);
 
-            /*
-             * Get CodeSource for ProtectionDomain.
-             */
-            CodeSource s = pd.getCodeSource();
+                /*
+                 * Call implies on DynamicPolicyProvider passing
+                 * not granted permissions. Verify that implies()
+                 * returns false for null and non-null
+                 * ProtectionDomains.
+                 */
+                checkImplies(pd, pmDynamicNotGranted, false, false);
 
-            /*
-             * Iterate over class loaders.
-             */
-            for (int j = 0; j < classLoaders.length; j++) {
+                if (pd == null) {
+                    continue;
+                }
 
                 /*
-                 * Create new ProtectionDomain passing code source,
-                 * null as PermissionCollection, class loader and
-                 * null as array of Principals.
+                 * Get CodeSource for ProtectionDomain.
                  */
-                ProtectionDomain pdNew01 = new ProtectionDomain(s, null,
-                        classLoaders[j], null);
+                CodeSource s = pd.getCodeSource();
 
                 /*
-                 * Create new ProtectionDomain passing null as code source,
-                 * null as PermissionCollection, class loader
-                 * and null as array of Principals.
+                 * Iterate over class loaders.
                  */
-                ProtectionDomain pdNew02 = new ProtectionDomain(null, null,
-                        classLoaders[j], null);
+                for (int j = 0; j < classLoaders.length; j++) {
+
+                    /*
+                     * Create new ProtectionDomain passing code source,
+                     * null as PermissionCollection, class loader and
+                     * null as array of Principals.
+                     */
+                    ProtectionDomain pdNew01 = new ProtectionDomain(s, null,
+                            classLoaders[j], null);
+
+                    /*
+                     * Create new ProtectionDomain passing null as code source,
+                     * null as PermissionCollection, class loader
+                     * and null as array of Principals.
+                     */
+                    ProtectionDomain pdNew02 = new ProtectionDomain(null, null,
+                            classLoaders[j], null);
+
+                    /*
+                     * Call implies() on DynamicPolicyProvider passing
+                     * newly created ProtectionDomains and pmAll
+                     * permissions and verify that implies() returns true.
+                     */
+                    checkImplies(pdNew01, pmAll, true, false);
+                    checkImplies(pdNew02, pmAll, true, false);
+                }
 
                 /*
-                 * Call implies() on DynamicPolicyProvider passing
-                 * newly created ProtectionDomains and pmAll
-                 * permissions and verify that implies() returns true.
+                 * Verify that granted permissions (aside from those granted
+                 * with a class value of null) are not included in
+                 * PermissionCollections returned from
+                 * Policy.getPermissions(CodeSource).
                  */
-                checkImplies(pdNew01, pmAll, true, false);
-                checkImplies(pdNew02, pmAll, true, false);
+                callGetPermissionsNoGranted(s, pmAsided);
+                callGetPermissions(s, pmAll, true, null);
             }
-
-            /*
-             * Verify that granted permissions (aside from those granted
-             * with a class value of null) are not included in
-             * PermissionCollections returned from
-             * Policy.getPermissions(CodeSource).
-             */
-            callGetPermissionsNoGranted(s, pmAsided);
-            callGetPermissions(s, pmAll, null);
         }
     }
-}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td Fri Feb 10 11:53:29 2012
@@ -4,3 +4,7 @@ testPolicyfile=policyProviderGrant01.pol
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
 com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+#testjvmargs=\
+#-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td Fri Feb 10 11:53:29 2012
@@ -7,3 +7,6 @@ FILEPOLICY01=<url: policyProviderGrant01
 FILEPOLICY02=<url: policyProviderGrant02.policy>
 FILEPOLICYUMBRELLA=<url: policyProviderUmbrellaGrant.policy>
 com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+#testjvmargs=-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td Fri Feb 10 11:53:29 2012
@@ -7,3 +7,7 @@ FILEPOLICY01=<url: policyProviderGrant01
 FILEPOLICY02=<url: policyProviderGrant02.policy>
 FILEPOLICYUMBRELLA=<url: policyProviderUmbrellaGrant.policy>
 com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+#testjvmargs=-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
+#testjvmargs=-Djava.security.manager=com.sun.jini.tool.ProfilingSecurityManager,${testjvmargs}
\ No newline at end of file

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java Fri Feb 10 11:53:29 2012
@@ -21,6 +21,7 @@ import java.util.logging.Level;
 
 // com.sun.jini.qa.harness
 import com.sun.jini.qa.harness.TestException;
+import java.security.Security;
 
 
 /**
@@ -77,6 +78,11 @@ import com.sun.jini.qa.harness.TestExcep
  */
 public class SecurityExceptionConstructor
         extends DynamicPolicyProviderTestBase {
+    
+    public SecurityExceptionConstructor(){
+        Security.setProperty("net.jini.security.policy.PolicyFileProvider.basePolicyClass",
+                "sun.security.provider.PolicyFile");
+    }
 
     /**
      * Run the test according <b>Test Description</b>

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td Fri Feb 10 11:53:29 2012
@@ -3,4 +3,5 @@ testCategories=policyprovider,policyprov
 testPolicyfile=policyProviderNoAccessClass.policy
 com.sun.jini.qa.harness.runkitserver=false 
 com.sun.jini.qa.harness.runjiniserver=false
-com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+com.sun.jini.qa.harness.securityproperties=<url: securityexceptionconstructornoaccessclass.properties>
+#com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy Fri Feb 10 11:53:29 2012
@@ -13,6 +13,30 @@
  * 5. allow accessClassInPackage for sun.security.provider
  */
 
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib-ext${/}*" {
+    permission java.security.AllPermission "", "";
+};
+
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.qa.harness.harnessJar}" {
+    //permission java.lang.RuntimePermission "modifyThreadGroup";
+};
+
+grant codebase "file:${com.sun.jini.qa.home}${/}lib${/}jiniharness.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+grant codebase "file:${com.sun.jini.qa.home}${/}lib${/}jinitests.jar" {
+
+};
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* End grants required for SecurityManager at startup */
+
 grant {
     permission java.lang.RuntimePermission "A";
     permission java.lang.RuntimePermission "B";
@@ -38,6 +62,7 @@ grant {
     permission java.security.SecurityPermission "getDomainCombiner";
     permission java.security.SecurityPermission "createAccessControlContext";
     permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+    permission java.util.PropertyPermission "FILEPOLICY02", "read";
 };
 
 /*
@@ -172,7 +197,7 @@ grant { 
     // grant read or write permission for individual properties
     // associated with separate tests.
 
-    permission java.util.PropertyPermission "*", "read,write"; 
+    permission java.util.PropertyPermission "*", "read,write";
 
     // discovery-specific PropertyPermission needed by the harness
     permission net.jini.discovery.DiscoveryPermission "*"; 

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy Fri Feb 10 11:53:29 2012
@@ -13,6 +13,14 @@
  * 5. allow accessClassInPackage for sun.security.provider
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant {
     permission java.lang.RuntimePermission "A";
     permission net.jini.security.GrantPermission

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy Fri Feb 10 11:53:29 2012
@@ -4,6 +4,22 @@
  * policy (the same as policy.qaHarness).
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+    permission java.lang.RuntimePermission "modifyThreadGroup";
+    permission java.lang.RuntimePermission "modifyThread";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
+    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+    permission java.security.SecurityPermission "getProperty.*";
+    permission java.security.SecurityPermission "putProviderProperty.*";
+    permission java.net.NetPermission "specifyStreamHandler";
+    permission java.lang.RuntimePermission "loadLibrary.net";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 /*
  * Test-specific policy:
  * 1. allow grant all permission at run time

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy Fri Feb 10 11:53:29 2012
@@ -13,6 +13,14 @@
  * 5. DO NOT allow accessClassInPackage for sun.security.provider
  */
 
+/* Grants required for SecurityManager used a startup: */
+
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant {
     permission java.security.SecurityPermission "setPolicy";
     permission java.security.SecurityPermission "getPolicy";



Mime
View raw message