changeset 13518:21a8943cc9c6

Merge
author chegar
date Sat, 25 Jul 2015 17:24:46 +0100
parents be32e66cb27d e7d831bb90d4
children d661a7b73a3b
files
diffstat 12 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Sat Jul 25 17:24:46 2015 +0100
@@ -61,7 +61,7 @@
 
             ProcessBuilder pb = ProcessTools.
                 createJavaProcessBuilder(
-                    "-XaddExports:jdk.attach/sun.tools.attach",
+                    "-XaddExports:jdk.attach/sun.tools.attach=ALL-UNNAMED",
                     "-XX:+UseConcMarkSweepGC",  // this will cause UseParNewGC to be FLAG_SET_ERGO
                     "-XX:+PrintGCDetails",
                     "-XX:Flags=" + flagsFile.getAbsolutePath(),
--- a/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java	Sat Jul 25 17:24:46 2015 +0100
@@ -138,7 +138,7 @@
             p.put("java.security.policy", TestParams.defaultGroupPolicy);
             CommandEnvironment cmd = new ActivationGroupDesc.CommandEnvironment(
                     null,
-                    new String[] { "-XaddExports:java.rmi/sun.rmi.registry,"
+                    new String[] { "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,"
                             + "java.rmi/sun.rmi.server,java.rmi/sun.rmi.transport,"
                             + "java.rmi/sun.rmi.transport.tcp" });
 
--- a/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java	Sat Jul 25 17:24:46 2015 +0100
@@ -120,7 +120,7 @@
             //
             System.err.println("Create activation group, in a new VM");
             CommandEnvironment cmd = new ActivationGroupDesc.CommandEnvironment(null,
-                    new String[] { "-XaddExports:java.base/sun.security.provider,"
+                    new String[] { "-XaddExports:java.base/sun.security.provider=ALL-UNNAMED,"
                             + "java.rmi/sun.rmi.registry,java.rmi/sun.rmi.server,"
                             + "java.rmi/sun.rmi.transport,java.rmi/sun.rmi.transport.tcp" });
 
--- a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	Sat Jul 25 17:24:46 2015 +0100
@@ -105,7 +105,7 @@
             rmid = RMID.createRMID(System.out, System.err, true, true,
                                    TestLibrary.INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT);
             rmid.addOptions(
-                "-XaddExports:java.base/sun.nio.ch",
+                "-XaddExports:java.base/sun.nio.ch=ALL-UNNAMED",
                 "-Djava.nio.channels.spi.SelectorProvider=InheritedChannelNotServerSocket$SP");
             rmid.start();
 
--- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	Sat Jul 25 17:24:46 2015 +0100
@@ -93,7 +93,7 @@
             rmid = RMID.createRMID(System.out, System.err, true, false,
                                    TestLibrary.RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT);
             rmid.addOptions(
-                "-XaddExports:java.base/sun.nio.ch",
+                "-XaddExports:java.base/sun.nio.ch=ALL-UNNAMED",
                 "-Djava.nio.channels.spi.SelectorProvider=RmidViaInheritedChannel$RmidSelectorProvider");
             if (System.getProperty("os.name").startsWith("Windows") &&
                 System.getProperty("os.version").startsWith("5."))
--- a/test/java/rmi/transport/checkFQDN/CheckFQDN.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/java/rmi/transport/checkFQDN/CheckFQDN.java	Sat Jul 25 17:24:46 2015 +0100
@@ -123,7 +123,7 @@
                                     propOption + property +
                                     equal +
                                     propertyValue + extraProp +
-                                    " -XaddExports:java.rmi/sun.rmi.registry,"
+                                    " -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,"
                                     + "java.rmi/sun.rmi.server,java.rmi/sun.rmi.transport,"
                                     + "java.rmi/sun.rmi.transport.tcp" +
                                     " -Drmi.registry.port=" +
--- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Sat Jul 25 17:24:46 2015 +0100
@@ -150,7 +150,7 @@
             ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
                 "-cp",
                 TEST_CLASSPATH,
-                "-XaddExports:java.management/sun.management",
+                "-XaddExports:java.management/sun.management=ALL-UNNAMED",
                 "TestManager",
                 String.valueOf(serverPrc.getPid()),
                 port.get(),
--- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Sat Jul 25 17:24:46 2015 +0100
@@ -131,7 +131,7 @@
             ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
                 "-cp",
                 TEST_CLASSPATH,
-                "-XaddExports:java.management/sun.management",
+                "-XaddExports:java.management/sun.management=ALL-UNNAMED",
                 "TestManager",
                 String.valueOf(serverPrc.getPid()),
                 port.get(),
--- a/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java	Sat Jul 25 17:24:46 2015 +0100
@@ -68,7 +68,7 @@
         // (neither on standard output, nor on standard err streams).
         JavaVM vm = new JavaVM(
                 DoRMIStuff.class.getName(),
-                "-XaddExports:java.rmi/sun.rmi.registry,"
+                "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,"
                 + "java.rmi/sun.rmi.server,java.rmi/sun.rmi.transport,"
                 + "java.rmi/sun.rmi.transport.tcp"
                 + " -Djava.util.logging.config.file="
--- a/test/tools/jar/modularJar/Basic.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/tools/jar/modularJar/Basic.java	Sat Jul 25 17:24:46 2015 +0100
@@ -476,7 +476,7 @@
         commands.add("-d");
         commands.add(dest.toString());
         if (dest.toString().contains("bar"))
-            commands.add("-XaddExports:java.base/jdk.internal.module");
+            commands.add("-XaddExports:java.base/jdk.internal.module=bar");
         if (modulePath != null) {
             commands.add("-mp");
             commands.add(modulePath.toString());
--- a/test/tools/launcher/MiscTests.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/tools/launcher/MiscTests.java	Sat Jul 25 17:24:46 2015 +0100
@@ -39,7 +39,7 @@
 
     private static final String mainClass = "Foo";
     private static final String exportOpts
-            = "-XaddExports:jdk.crypto.pkcs11/sun.security.pkcs11";
+            = "-XaddExports:jdk.crypto.pkcs11/sun.security.pkcs11=ALL-UNNAMED";
 
     // 6856415: Checks to ensure that proper exceptions are thrown by java
     static void test6856415() throws IOException {
--- a/test/tools/pack200/Utils.java	Sat Jul 25 17:24:14 2015 +0100
+++ b/test/tools/pack200/Utils.java	Sat Jul 25 17:24:46 2015 +0100
@@ -101,7 +101,7 @@
 
         compiler("-d",
                 XCLASSES.getName(),
-                "-XaddExports:jdk.jdeps/com.sun.tools.classfile",
+                "-XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED",
                 "@" + tmpFile.getAbsolutePath());
 
         jar("cvfe",
@@ -138,7 +138,7 @@
         init();
         List<String> cmds = new ArrayList<String>();
         cmds.add(getJavaCmd());
-        cmds.add("-XaddExports:jdk.jdeps/com.sun.tools.classfile");
+        cmds.add("-XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED");
         cmds.add("-cp");
         cmds.add(VerifierJar.getName());
         cmds.add("sun.tools.pack.verify.Main");