--- old/test/java/rmi/testlibrary/JavaVM.java 2014-03-05 13:46:16.000000000 -0800 +++ new/test/java/rmi/testlibrary/JavaVM.java 2014-03-05 13:46:16.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,7 +124,11 @@ addOptions(new String[] { option }); } - addOptions(new String[] { getCodeCoverageOptions() }); + addOptions(new String[] { + getCodeCoverageOptions(), + TestParams.testJavaOpts, + TestParams.testVmOpts + }); StringTokenizer optionsTokenizer = new StringTokenizer(options); StringTokenizer argsTokenizer = new StringTokenizer(args); --- old/test/java/rmi/testlibrary/RMID.java 2014-03-05 13:46:17.000000000 -0800 +++ new/test/java/rmi/testlibrary/RMID.java 2014-03-05 13:46:17.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -117,6 +117,18 @@ args += " -C-Dtest.classes=" + TestParams.testClasses; } + if (!TestParams.testJavaOpts.equals("")) { + for (String a : TestParams.testJavaOpts.split(" +")) { + args += " -C" + a; + } + } + + if (!TestParams.testVmOpts.equals("")) { + for (String a : TestParams.testVmOpts.split(" +")) { + args += " -C" + a; + } + } + args += " -C-Djava.rmi.server.useCodebaseOnly=false "; args += " " + getCodeCoverageArgs(); --- old/test/java/rmi/testlibrary/TestLibrary.java 2014-03-05 13:46:18.000000000 -0800 +++ new/test/java/rmi/testlibrary/TestLibrary.java 2014-03-05 13:46:18.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -154,15 +154,19 @@ return false; } - public static String getProperty(String property, String defaultVal) { - final String prop = property; - final String def = defaultVal; - return java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public String run() { - return System.getProperty(prop, def); - } - }); + public static String getProperty(final String property, + final String defaultVal) { + try { + return java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public String run() { + return System.getProperty(property, defaultVal); + } + }); + } catch (Exception ex) { + bomb("Exception getting property " + property, ex); + throw new AssertionError("this should be unreachable"); + } } /** --- old/test/java/rmi/testlibrary/TestParams.java 2014-03-05 13:46:19.000000000 -0800 +++ new/test/java/rmi/testlibrary/TestParams.java 2014-03-05 13:46:19.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,55 +32,49 @@ public class TestParams { /** variables that hold value property values */ - public static String testSrc = null; - public static String testClasses = null; + public static final String testSrc; + public static final String testClasses; - /** name of default security policy */ - public static String defaultPolicy = null; + /** name of default security policy for test JVM */ + public static final String defaultPolicy; /** name of default security policy for RMID */ - public static String defaultRmidPolicy = null; + public static final String defaultRmidPolicy; /** name of default security policy for activation groups */ - public static String defaultGroupPolicy = null; + public static final String defaultGroupPolicy; /** name of default security manager */ - public static String defaultSecurityManager = - "java.rmi.RMISecurityManager"; + public static final String defaultSecurityManager; + /** VM options string */ + public static final String testVmOpts; + + /** Java options string */ + public static final String testJavaOpts; /* Initalize commonly used strings */ static { - try { - testSrc = TestLibrary. - getProperty("test.src", "."); - testClasses = TestLibrary. - getProperty("test.classes", "."); - - // if policy file already set use it - defaultPolicy = TestLibrary. - getProperty("java.security.policy", - defaultPolicy); - if (defaultPolicy == null) { - defaultPolicy = testSrc + File.separatorChar + - "security.policy"; - } - - // if manager prop set use it - defaultSecurityManager = TestLibrary. - getProperty("java.security.manager", - defaultSecurityManager); - - defaultRmidPolicy = - testSrc + File.separatorChar + "rmid.security.policy"; - - defaultGroupPolicy = testSrc + - File.separatorChar + "group.security.policy"; - - } catch (SecurityException se) { - TestLibrary.bomb("Security exception received" + - " during test initialization:", - se); + testSrc = TestLibrary.getProperty("test.src", "."); + testClasses = TestLibrary.getProperty("test.classes", "."); + + String dp = TestLibrary.getProperty("java.security.policy", null); + if (dp == null) { + dp = testSrc + File.separatorChar + "security.policy"; } + defaultPolicy = dp; + + defaultRmidPolicy = + testSrc + File.separatorChar + "rmid.security.policy"; + + defaultGroupPolicy = + testSrc + File.separatorChar + "group.security.policy"; + + defaultSecurityManager = TestLibrary.getProperty( + "java.security.manager", "java.lang.SecurityManager"); + + testVmOpts = TestLibrary.getProperty("test.vm.opts", ""); + + testJavaOpts = TestLibrary.getProperty("test.java.opts", ""); } } --- old/test/java/rmi/activation/Activatable/checkActivateRef/security.policy 2014-03-05 13:46:20.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/checkActivateRef/security.policy 2014-03-05 13:46:20.000000000 -0800 @@ -30,8 +30,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/checkAnnotations/security.policy 2014-03-05 13:46:21.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/checkAnnotations/security.policy 2014-03-05 13:46:21.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy 2014-03-05 13:46:23.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy 2014-03-05 13:46:23.000000000 -0800 @@ -33,8 +33,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy 2014-03-05 13:46:24.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy 2014-03-05 13:46:24.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy 2014-03-05 13:46:25.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy 2014-03-05 13:46:25.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy 2014-03-05 13:46:26.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy 2014-03-05 13:46:26.000000000 -0800 @@ -32,8 +32,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy 2014-03-05 13:46:27.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy 2014-03-05 13:46:27.000000000 -0800 @@ -31,8 +31,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy 2014-03-05 13:46:29.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy 2014-03-05 13:46:28.000000000 -0800 @@ -18,8 +18,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy 2014-03-05 13:46:32.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy 2014-03-05 13:46:31.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/inactiveGroup/security.policy 2014-03-05 13:46:33.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/inactiveGroup/security.policy 2014-03-05 13:46:32.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/nestedActivate/security.policy 2014-03-05 13:46:34.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/nestedActivate/security.policy 2014-03-05 13:46:33.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy 2014-03-05 13:46:35.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy 2014-03-05 13:46:34.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/restartCrashedService/security.policy 2014-03-05 13:46:36.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/restartCrashedService/security.policy 2014-03-05 13:46:35.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/restartLatecomer/security.policy 2014-03-05 13:46:37.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/restartLatecomer/security.policy 2014-03-05 13:46:36.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/restartService/security.policy 2014-03-05 13:46:38.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/restartService/security.policy 2014-03-05 13:46:37.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy 2014-03-05 13:46:39.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy 2014-03-05 13:46:39.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/Activatable/unregisterInactive/security.policy 2014-03-05 13:46:40.000000000 -0800 +++ new/test/java/rmi/activation/Activatable/unregisterInactive/security.policy 2014-03-05 13:46:40.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy 2014-03-05 13:46:41.000000000 -0800 +++ new/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy 2014-03-05 13:46:41.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy 2014-03-05 13:46:42.000000000 -0800 +++ new/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy 2014-03-05 13:46:42.000000000 -0800 @@ -16,8 +16,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy 2014-03-05 13:46:43.000000000 -0800 +++ new/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy 2014-03-05 13:46:43.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy 2014-03-05 13:46:44.000000000 -0800 +++ new/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy 2014-03-05 13:46:44.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy 2014-03-05 13:46:45.000000000 -0800 +++ new/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy 2014-03-05 13:46:45.000000000 -0800 @@ -22,8 +22,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/activation/CommandEnvironment/security.policy 2014-03-05 13:46:46.000000000 -0800 +++ new/test/java/rmi/activation/CommandEnvironment/security.policy 2014-03-05 13:46:46.000000000 -0800 @@ -23,8 +23,7 @@ permission java.util.PropertyPermission "java.compiler", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.rmi.activation.port", "write"; --- old/test/java/rmi/dgc/VMID/security.policy 2014-03-05 13:46:47.000000000 -0800 +++ new/test/java/rmi/dgc/VMID/security.policy 2014-03-05 13:46:47.000000000 -0800 @@ -9,8 +9,7 @@ grant { // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; }; --- old/test/java/rmi/registry/classPathCodebase/security.policy 2014-03-05 13:46:48.000000000 -0800 +++ new/test/java/rmi/registry/classPathCodebase/security.policy 2014-03-05 13:46:48.000000000 -0800 @@ -15,8 +15,7 @@ permission java.io.FilePermission ".${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy 2014-03-05 13:46:49.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy 2014-03-05 13:46:48.000000000 -0800 @@ -19,8 +19,7 @@ permission java.io.FilePermission ".${/}codebase${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; }; --- old/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy 2014-03-05 13:46:50.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy 2014-03-05 13:46:49.000000000 -0800 @@ -17,8 +17,7 @@ ".${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy 2014-03-05 13:46:51.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/getClassLoader/security.policy 2014-03-05 13:46:50.000000000 -0800 @@ -14,8 +14,7 @@ ".${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy 2014-03-05 13:46:52.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy 2014-03-05 13:46:51.000000000 -0800 @@ -20,8 +20,7 @@ permission java.lang.reflect.ReflectPermission "newProxyInPackage.java.util.zip"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; }; --- old/test/java/rmi/server/RMIClassLoader/spi/security.policy 2014-03-05 13:46:53.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/spi/security.policy 2014-03-05 13:46:52.000000000 -0800 @@ -17,8 +17,7 @@ ".${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy 2014-03-05 13:46:54.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy 2014-03-05 13:46:53.000000000 -0800 @@ -21,8 +21,7 @@ ".${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy 2014-03-05 13:46:55.000000000 -0800 +++ new/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy 2014-03-05 13:46:54.000000000 -0800 @@ -16,8 +16,7 @@ permission java.io.FilePermission ".${/}-", "read,write,delete"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; }; --- old/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy 2014-03-05 13:46:56.000000000 -0800 +++ new/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy 2014-03-05 13:46:55.000000000 -0800 @@ -25,8 +25,7 @@ permission java.util.PropertyPermission "java.security.manager", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy 2014-03-05 13:46:57.000000000 -0800 +++ new/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy 2014-03-05 13:46:56.000000000 -0800 @@ -17,8 +17,7 @@ permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy 2014-03-05 13:46:58.000000000 -0800 +++ new/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy 2014-03-05 13:46:57.000000000 -0800 @@ -17,8 +17,7 @@ permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/server/useCustomRef/security.policy 2014-03-05 13:46:58.000000000 -0800 +++ new/test/java/rmi/server/useCustomRef/security.policy 2014-03-05 13:46:58.000000000 -0800 @@ -17,8 +17,7 @@ permission java.util.PropertyPermission "package.restrict.access.sun.rmi", "read"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/transport/checkLeaseInfoLeak/security.policy 2014-03-05 13:46:59.000000000 -0800 +++ new/test/java/rmi/transport/checkLeaseInfoLeak/security.policy 2014-03-05 13:46:59.000000000 -0800 @@ -14,8 +14,7 @@ permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/java/rmi/transport/dgcDeadLock/security.policy 2014-03-05 13:47:00.000000000 -0800 +++ new/test/java/rmi/transport/dgcDeadLock/security.policy 2014-03-05 13:47:00.000000000 -0800 @@ -19,8 +19,7 @@ permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute"; // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read"; --- old/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy 2014-03-05 13:47:01.000000000 -0800 +++ new/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy 2014-03-05 13:47:01.000000000 -0800 @@ -9,8 +9,7 @@ grant { // used by TestLibrary to determine test environment - permission java.util.PropertyPermission "test.classes", "read"; - permission java.util.PropertyPermission "test.src", "read"; + permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; permission java.util.PropertyPermission "java.home", "read";