river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtra...@apache.org
Subject svn commit: r1520131 - in /river/jtsk/trunk: ./ dep-libs/asm/ qa/ qa/doc/ qa/harness/policy/ qa/src/com/sun/jini/test/resources/ src-extra/org/apache/river/extra/discovery/ src-extra/org/apache/river/extra/selfhealing/ src/net/jini/security/policy/
Date Wed, 04 Sep 2013 20:16:29 GMT
Author: gtrasuk
Date: Wed Sep  4 20:16:27 2013
New Revision: 1520131

URL: http://svn.apache.org/r1520131
Log:
Merge fix for RIVER-425 from 2.2 branch over to trunk.

Modified:
    river/jtsk/trunk/   (props changed)
    river/jtsk/trunk/dep-libs/asm/asm-3.2.jar   (props changed)
    river/jtsk/trunk/dep-libs/asm/asm-commons-3.2.jar   (props changed)
    river/jtsk/trunk/qa/   (props changed)
    river/jtsk/trunk/qa/README.txt   (props changed)
    river/jtsk/trunk/qa/doc/HowToRunATest.html   (props changed)
    river/jtsk/trunk/qa/doc/HowToWriteATest.html   (props changed)
    river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html   (props changed)
    river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html   (props changed)
    river/jtsk/trunk/qa/doc/discoverymanagement-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/discoverymanagement-req.html   (props changed)
    river/jtsk/trunk/qa/doc/discoverymanagement-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/discoverymanagement-test.html   (props changed)
    river/jtsk/trunk/qa/doc/discoveryservice-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/discoveryservice-req.html   (props changed)
    river/jtsk/trunk/qa/doc/discoveryservice-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/discoveryservice-test.html   (props changed)
    river/jtsk/trunk/qa/doc/eventmailbox-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/eventmailbox-req.html   (props changed)
    river/jtsk/trunk/qa/doc/eventmailbox-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/eventmailbox-test.html   (props changed)
    river/jtsk/trunk/qa/doc/index-requirements.html   (props changed)
    river/jtsk/trunk/qa/doc/index-testdescriptions.html   (props changed)
    river/jtsk/trunk/qa/doc/index.html   (props changed)
    river/jtsk/trunk/qa/doc/javaspace_req.html   (props changed)
    river/jtsk/trunk/qa/doc/javaspace_test.html   (props changed)
    river/jtsk/trunk/qa/doc/joinmanager-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/joinmanager-req.html   (props changed)
    river/jtsk/trunk/qa/doc/joinmanager-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/locatordiscovery-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/locatordiscovery-req.html   (props changed)
    river/jtsk/trunk/qa/doc/locatordiscovery-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/lookupdiscovery-req.html   (props changed)
    river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/qaMethodWorkArch.html   (props changed)
    river/jtsk/trunk/qa/doc/qaarch.sdw   (props changed)
    river/jtsk/trunk/qa/doc/renewalmanager-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/renewalmanager-req.html   (props changed)
    river/jtsk/trunk/qa/doc/renewalservice-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/renewalservice-req.html   (props changed)
    river/jtsk/trunk/qa/doc/renewalservice-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/renewalservice-test.html   (props changed)
    river/jtsk/trunk/qa/doc/servicediscovery-req.doc   (props changed)
    river/jtsk/trunk/qa/doc/servicediscovery-req.html   (props changed)
    river/jtsk/trunk/qa/doc/servicediscovery-test.doc   (props changed)
    river/jtsk/trunk/qa/doc/servicediscovery-test.html   (props changed)
    river/jtsk/trunk/qa/doc/testcategories.doc   (props changed)
    river/jtsk/trunk/qa/doc/testcategories.html   (props changed)
    river/jtsk/trunk/qa/harness/policy/defaultmahalo.policy
    river/jtsk/trunk/qa/harness/policy/defaulttest.policy
    river/jtsk/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
    river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop
    river/jtsk/trunk/src-extra/org/apache/river/extra/discovery/   (props changed)
    river/jtsk/trunk/src-extra/org/apache/river/extra/selfhealing/   (props changed)
    river/jtsk/trunk/src/net/jini/security/policy/   (props changed)
    river/jtsk/trunk/src/net/jini/security/policy/PolicyFileProvider.java   (props changed)

Propchange: river/jtsk/trunk/
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2:r1520020

Propchange: river/jtsk/trunk/dep-libs/asm/asm-3.2.jar
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/dep-libs/asm/asm-3.2.jar:r1520020

Propchange: river/jtsk/trunk/dep-libs/asm/asm-commons-3.2.jar
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/dep-libs/asm/asm-commons-3.2.jar:r1520020

Propchange: river/jtsk/trunk/qa/
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa:r1520020

Propchange: river/jtsk/trunk/qa/README.txt
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/README.txt:r1520020

Propchange: river/jtsk/trunk/qa/doc/HowToRunATest.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/HowToRunATest.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/HowToWriteATest.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/HowToWriteATest.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-test.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoveryservice-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoveryservice-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoveryservice-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/discoveryservice-test.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-test.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/eventmailbox-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/eventmailbox-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/eventmailbox-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/eventmailbox-test.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-test.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/index-requirements.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/index-requirements.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/index-testdescriptions.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/index-testdescriptions.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/index.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/index.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/javaspace_req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/javaspace_req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/javaspace_test.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/javaspace_test.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/joinmanager-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/joinmanager-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/joinmanager-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/joinmanager-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/joinmanager-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/joinmanager-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/locatordiscovery-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/locatordiscovery-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/locatordiscovery-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/locatordiscovery-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/lookupdiscovery-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/lookupdiscovery-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/qaMethodWorkArch.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/qaMethodWorkArch.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/qaarch.sdw
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/qaarch.sdw:r1520020

Propchange: river/jtsk/trunk/qa/doc/renewalmanager-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/renewalmanager-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/renewalmanager-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/renewalmanager-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/renewalservice-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/renewalservice-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/renewalservice-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/renewalservice-test.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-test.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/servicediscovery-req.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-req.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/servicediscovery-req.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-req.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/servicediscovery-test.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-test.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/servicediscovery-test.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-test.html:r1520020

Propchange: river/jtsk/trunk/qa/doc/testcategories.doc
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/testcategories.doc:r1520020

Propchange: river/jtsk/trunk/qa/doc/testcategories.html
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/qa/doc/testcategories.html:r1520020

Modified: river/jtsk/trunk/qa/harness/policy/defaultmahalo.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/harness/policy/defaultmahalo.policy?rev=1520131&r1=1520130&r2=1520131&view=diff
==============================================================================
--- river/jtsk/trunk/qa/harness/policy/defaultmahalo.policy (original)
+++ river/jtsk/trunk/qa/harness/policy/defaultmahalo.policy Wed Sep  4 20:16:27 2013
@@ -9,3 +9,9 @@ grant codebase "file:${com.sun.jini.jsk.
 grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-lib.jar" {
     permission java.security.AllPermission "", "";
 };
+
+grant {
+    //Needed since JDK7u25 appears to have made the proxy inaccessible.
+    permission java.lang.RuntimePermission
+        "accessClassInPackage.com.sun.proxy";
+};

Modified: river/jtsk/trunk/qa/harness/policy/defaulttest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/harness/policy/defaulttest.policy?rev=1520131&r1=1520130&r2=1520131&view=diff
==============================================================================
--- river/jtsk/trunk/qa/harness/policy/defaulttest.policy (original)
+++ river/jtsk/trunk/qa/harness/policy/defaulttest.policy Wed Sep  4 20:16:27 2013
@@ -75,6 +75,22 @@ grant {
     permission java.io.FilePermission "${com.sun.jini.jsk.home}${/}lib${/}-", "read";
     permission java.io.FilePermission "${com.sun.jini.qa.home}${/}lib${/}-", "read";
     permission java.util.PropertyPermission "*", "read";
+
+    //Needed since JDK7u25 appears to have made the proxy inaccessible.
+    permission java.lang.RuntimePermission
+        "accessClassInPackage.com.sun.proxy";
+
+    permission java.lang.RuntimePermission
+        "accessClassInPackage.sun.util.logging.resources";
+
+    permission java.io.FilePermission
+	"${com.sun.jini.jsk.home}${/}lib${/}-", "read";
+
+    permission java.io.FilePermission
+	"${com.sun.jini.qa.home}${/}lib${/}-", "read";
+
+    permission java.util.PropertyPermission
+        "*", "read";
 };
 
 // needed by some io tests

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=1520131&r1=1520130&r2=1520131&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 Wed Sep  4 20:16:27
2013
@@ -129,3 +129,12 @@ grant codebase "file:${com.sun.jini.jsk.
     permission com.sun.jini.start.SharedActivationPolicyPermission "file:${com.sun.jini.test.home}${/}src${/}com${/}sun${/}jini${/}test${/}impl${/}mahalo${/}bogusMahaloImpl.policy";
     permission com.sun.jini.start.SharedActivationPolicyPermission "jar:file:${com.sun.jini.qa.harness.testJar}!/com/sun/jini/test/impl/mahalo/bogusMahaloImpl.policy";
 };
+
+// JDK7u21 and higher try to disallow remote codebase and proxy usage.  This grant
+// un-does that.
+grant {
+    //Needed since JDK7u25 appears to have made the proxy inaccessible.
+    permission java.lang.RuntimePermission
+        "accessClassInPackage.com.sun.proxy";
+};
+

Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop?rev=1520131&r1=1520130&r2=1520131&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/resources/qaHarness.prop Wed Sep  4 20:16:27
2013
@@ -216,7 +216,8 @@ testOverrideProviders=${testOverrideProv
 com.sun.jini.qa.harness.globalvmargs=${com.sun.jini.qa.harness.globalvmargs},\
 -Dcom.sun.jini.test.home=${com.sun.jini.test.home},\
 -Dcom.sun.jini.test.port=${com.sun.jini.test.port},\
--Dcom.sun.jini.qa.harness.policies=<url: src/com/sun/jini/test/resources/jinitest.policy>
+-Dcom.sun.jini.qa.harness.policies=<url: src/com/sun/jini/test/resources/jinitest.policy>,\
+-Djava.rmi.server.useCodebaseOnly=false
 
 # make sure slave's use their local test home directory
 com.sun.jini.qa.harness.slaveOverrides=${com.sun.jini.qa.harness.slaveOverrides} com.sun.jini.test.home

Propchange: river/jtsk/trunk/src-extra/org/apache/river/extra/discovery/
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/src-extra/org/apache/river/extra/discovery:r1520020

Propchange: river/jtsk/trunk/src-extra/org/apache/river/extra/selfhealing/
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/src-extra/org/apache/river/extra/selfhealing:r1520020

Propchange: river/jtsk/trunk/src/net/jini/security/policy/
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/src/net/jini/security/policy:r1520020

Propchange: river/jtsk/trunk/src/net/jini/security/policy/PolicyFileProvider.java
------------------------------------------------------------------------------
  Merged /river/jtsk/branches/2.2/src/net/jini/security/policy/PolicyFileProvider.java:r1520020



Mime
View raw message