Author: peter_firmstone Date: Sat Nov 30 12:20:56 2013 New Revision: 1546721
URL: http://svn.apache.org/r1546721 Log: Add permissions required for Java 1.7.0_25 and later and replace RMISecurityManager with CombinerSecurityManager in NonActivatableGroupImpl Modified: river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaultmahalo.policy river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1_debug.logging Modified: river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaultmahalo.policy URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaultmahalo.policy?rev=1546721&r1=1546720&r2=1546721&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaultmahalo.policy (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaultmahalo.policy Sat Nov 30 12:20:56 2013 @@ -9,3 +9,11 @@ grant codebase "file:${com.sun.jini.jsk. grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-lib.jar" { permission java.security.AllPermission "", ""; }; + +// Grants required for later versions of jdk1.7 for classes that override +// ObjectOutputStream, unfortunately the way this is implemented it isn't +// possible to perform as a privileged action from the overriding class. +grant { + permission java.lang.RuntimePermission "accessClassInPackage.com.sun.proxy"; + permission java.io.FilePermission "${com.sun.jini.jsk.home}${/}lib${/}jsk-lib.jar", "read"; +}; \ No newline at end of file Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java?rev=1546721&r1=1546720&r2=1546721&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java Sat Nov 30 12:20:56 2013 @@ -35,6 +35,7 @@ import net.jini.config.ConfigurationExce import net.jini.config.ConfigurationProvider; import net.jini.export.Exporter; import net.jini.jrmp.JrmpExporter; +import org.apache.river.api.security.CombinerSecurityManager; /** * A container for nonactivatable services. This class is the @@ -72,7 +73,7 @@ class NonActivatableGroupImpl { origErr = System.err; System.setErr(System.out); if (System.getSecurityManager() == null) { - System.setSecurityManager(new java.rmi.RMISecurityManager()); + System.setSecurityManager(new CombinerSecurityManager()); } group = new GroupImpl(); try { Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1546721&r1=1546720&r2=1546721&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties Sat Nov 30 12:20:56 2013 @@ -228,7 +228,6 @@ com.sun.jini.qa.harness.globalvmargs=\ -ea,\ -esa,\ -Djava.ext.dirs=${java.ext.dirs},\ --Djava.security.debug=access:failure,\ -Dcom.sun.jini.jsk.port=${com.sun.jini.jsk.port},\ -Dcom.sun.jini.qa.port=${com.sun.jini.qa.port},\ -Dcom.sun.jini.jsk.home=${com.sun.jini.jsk.home},\ @@ -272,7 +271,8 @@ altClasspath=<harnessJar>$:${com.sun.jin # Arguments are comma separated. To embed a comma in # an argument, use "+,". # -testjvmargs=-client,${testjvmargs} +testjvmargs=-client,\ +${testjvmargs} # # defined for historical reasons. Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1_debug.logging URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1_debug.logging?rev=1546721&r1=1546720&r2=1546721&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1_debug.logging (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1_debug.logging Sat Nov 30 12:20:56 2013 @@ -105,8 +105,8 @@ java.util.logging.FileHandler.level = IN # For Everything sun.rmi.level = INFO -net.jini.level = FINE -com.sun.jini.level = FINE +net.jini.level = INFO +com.sun.jini.level = INFO # For the LogManager com.sun.jini.logging.LogManager.level = INFO
