changeset 943:d9b3cf2dd4d2

Merge
author mchung
date Thu, 08 Sep 2016 17:40:49 -0700
parents aa053a3faf26 11ceba666902
children e5f8d3bb9704
files
diffstat 2 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.jcheck/conf	Thu Sep 08 21:11:53 2016 +0000
+++ b/.jcheck/conf	Thu Sep 08 17:40:49 2016 -0700
@@ -1,1 +1,3 @@
 project=jdk9
+comments=lax
+tags=lax
--- a/src/java.corba/share/classes/module-info.java	Thu Sep 08 21:11:53 2016 +0000
+++ b/src/java.corba/share/classes/module-info.java	Thu Sep 08 17:40:49 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -26,6 +26,7 @@
 /**
  * Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
  */
+@Deprecated(since="9", forRemoval=true)
 module java.corba {
     requires public java.desktop;
     requires public java.rmi;
@@ -64,14 +65,13 @@
     exports org.omg.PortableServer.portable;
     exports org.omg.SendingContext;
     exports org.omg.stub.java.rmi;
-    exports com.sun.corba.se.impl.util to
-        jdk.rmic;
-    exports com.sun.jndi.cosnaming to
-        java.naming;
-    exports com.sun.jndi.url.corbaname to
-        java.naming;
-    exports com.sun.jndi.url.iiop to
-        java.naming;
-    exports com.sun.jndi.url.iiopname to
-        java.naming;
+
+    // rmic --iiop
+    exports com.sun.corba.se.impl.util to jdk.rmic;
+
+    // JNDI CosNaming provider
+    exports dynamic com.sun.jndi.cosnaming to java.naming;
+    exports dynamic com.sun.jndi.url.corbaname to java.naming;
+    exports dynamic com.sun.jndi.url.iiop to java.naming;
+    exports dynamic com.sun.jndi.url.iiopname to java.naming;
 }