You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2012/02/19 05:51:25 UTC

svn commit: r1290948 [3/4] - in /river/jtsk/merge: ./ asm/ qa/ 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/transpor...

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy Sun Feb 19 04:51:20 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";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderUmbrellaGrant.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderUmbrellaGrant.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderUmbrellaGrant.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderUmbrellaGrant.policy Sun Feb 19 04:51:20 2012
@@ -14,6 +14,14 @@
  * 6. 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 java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant01.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant01.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant01.policy Sun Feb 19 04:51:20 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 java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant02.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant02.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant02.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant02.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoAccessClass.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoAccessClass.policy Sun Feb 19 04:51:20 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";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoGetProperty.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoGetProperty.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoGetProperty.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoGetProperty.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderUmbrellaGrant.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderUmbrellaGrant.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderUmbrellaGrant.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderUmbrellaGrant.policy Sun Feb 19 04:51:20 2012
@@ -14,6 +14,14 @@
  * 6. 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 java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td Sun Feb 19 04:51:20 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}
\ No newline at end of file

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/SecurityExceptionConstructor.java
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/SecurityExceptionConstructor.java?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/SecurityExceptionConstructor.java (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/SecurityExceptionConstructor.java Sun Feb 19 04:51:20 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;
 
 
 /**
@@ -86,6 +87,11 @@ public class SecurityExceptionConstructo
     /** String to format test status string */
     private static final String CALLName1 = "new PolicyFileProvider(\"Bar\")";
 
+    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/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy Sun Feb 19 04:51:20 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 java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant02.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant02.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant02.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant02.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrantAll.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrantAll.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrantAll.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy Sun Feb 19 04:51:20 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";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy Sun Feb 19 04:51:20 2012
@@ -14,6 +14,14 @@
  * 6. 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 java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy Sun Feb 19 04:51:20 2012
@@ -13,6 +13,18 @@
  * 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 "", "";
+};
+
+grant codebase "file:${com.sun.jini.qa.home}${/}lib${/}jiniharness.jar" {
+    permission java.security.AllPermission "", "";
+};
+
+/* end grants required for SecurityManager during startup. */
+
 grant {
     permission java.lang.RuntimePermission "A";
     permission java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant02.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant02.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant02.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant02.policy Sun Feb 19 04:51:20 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/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoAccessClass.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoAccessClass.policy Sun Feb 19 04:51:20 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";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoGetProperty.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoGetProperty.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoGetProperty.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoGetProperty.policy Sun Feb 19 04:51:20 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 net.jini.security.GrantPermission
         "java.security.AllPermission";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderUmbrellaGrant.policy
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderUmbrellaGrant.policy?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderUmbrellaGrant.policy (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderUmbrellaGrant.policy Sun Feb 19 04:51:20 2012
@@ -14,6 +14,14 @@
  * 6. 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 java.lang.RuntimePermission "B";

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties Sun Feb 19 04:51:20 2012
@@ -1,3 +1,4 @@
 # Java security properties file which overrides the harness supplied
 # file so that the MergedPolicyProvider is not used, which would interfere
 # with the correct operation of these tests
+#net.jini.security.policy.PolicyFileProvider.basePolicyClass=sun.security.provider.PolicyFile
\ No newline at end of file

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/util/Util.java
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/util/Util.java?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/util/Util.java (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/policyprovider/util/Util.java Sun Feb 19 04:51:20 2012
@@ -94,6 +94,7 @@ public class Util {
      * @return status string.
      */
     public static String fail(String msg, Exception ret, String exp) {
+        ret.printStackTrace(System.err);
         StringBuffer buf = new StringBuffer("\n");
         buf.append(msg).append("\n");
         buf.append("  throws:   ").append(ret.toString()).append("\n");

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.td Sun Feb 19 04:51:20 2012
@@ -2,3 +2,6 @@ testClass=ConstructorExceptionsTest
 testCategories=security,security_spec
 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}
\ No newline at end of file

Modified: river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.td
URL: http://svn.apache.org/viewvc/river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.td?rev=1290948&r1=1290947&r2=1290948&view=diff
==============================================================================
--- river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.td (original)
+++ river/jtsk/merge/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.td Sun Feb 19 04:51:20 2012
@@ -4,4 +4,6 @@ com.sun.jini.qa.harness.runactivation=fa
 com.sun.jini.qa.harness.runjiniserver=false
 com.sun.jini.qa.harness.runkitserver=false
 com.sun.jini.qa.harness.shared=false
-
+#testjvmargs=-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
\ No newline at end of file