From 7723d4d6d2ba7824a7f2a02d75282e2ee3b75308 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 28 Nov 2016 09:20:13 +0100 Subject: [PATCH 1/2] 8031567: Better model for storing source revision information Reviewed-by: erikj --- corba/.hgignore | 1 - 1 file changed, 1 deletion(-) diff --git a/corba/.hgignore b/corba/.hgignore index 5e6b22f24ee..d782b284ae1 100644 --- a/corba/.hgignore +++ b/corba/.hgignore @@ -2,5 +2,4 @@ ^dist/ ^webrev /nbproject/private/ -^.hgtip .DS_Store From 072e9236b4054c175d84146af3eadbe904448fde Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Thu, 1 Dec 2016 08:56:35 +0000 Subject: [PATCH 2/2] 8169069: Module system implementation refresh (11/2016) Co-authored-by: Mandy Chung Reviewed-by: alanb, mchung --- .../java.corba/share/classes/module-info.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/corba/src/java.corba/share/classes/module-info.java b/corba/src/java.corba/share/classes/module-info.java index 58cff065605..10a26f0bc21 100644 --- a/corba/src/java.corba/share/classes/module-info.java +++ b/corba/src/java.corba/share/classes/module-info.java @@ -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,9 +26,10 @@ /** * 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; + requires transitive java.desktop; + requires transitive java.rmi; requires java.logging; requires java.naming; requires java.transaction; @@ -65,14 +66,13 @@ module java.corba { 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 + opens com.sun.jndi.cosnaming to java.naming; // jndiprovider.properties + 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; }