changeset 869:b70d94739d62

Merge
author mchung
date Thu, 15 Sep 2016 13:57:27 -0700
parents 297c16d401c5 f821c21cf83b
children 0dbac66127c2
files
diffstat 7 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.jcheck/conf	Thu Sep 15 17:15:53 2016 +0000
+++ b/.jcheck/conf	Thu Sep 15 13:57:27 2016 -0700
@@ -1,1 +1,4 @@
 project=jdk9
+comments=lax
+tags=lax
+bugids=dup
--- a/src/java.activation/share/classes/module-info.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/java.activation/share/classes/module-info.java	Thu Sep 15 13:57:27 2016 -0700
@@ -27,7 +27,7 @@
  * Defines the JavaBeans Activation Framework (JAF) API.
  */
 module java.activation {
-    requires public java.datatransfer;
+    requires transitive java.datatransfer;
     // dependence on java.beans.Beans to be eliminated
     requires java.desktop;
     requires java.logging;
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java	Thu Sep 15 13:57:27 2016 -0700
@@ -39,7 +39,7 @@
 
     private static final Logger logger = Util.getClassLogger();
 
-    protected static final boolean noOptimize =
+    protected static final boolean noOptimize = Runtime.version().major() >= 9 ||
         Util.getSystemProperty(ClassTailor.class.getName()+".noOptimize")!=null;
 
     static {
--- a/src/java.xml.bind/share/classes/module-info.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/java.xml.bind/share/classes/module-info.java	Thu Sep 15 13:57:27 2016 -0700
@@ -27,8 +27,8 @@
  * Defines the Java Architecture for XML Binding (JAXB) API.
  */
 module java.xml.bind {
-    requires public java.activation;
-    requires public java.xml;
+    requires transitive java.activation;
+    requires transitive java.xml;
     requires java.compiler;
     requires java.desktop;
     requires java.logging;
@@ -87,7 +87,7 @@
         jdk.xml.bind;
     exports com.sun.xml.internal.bind.v2.model.impl to
         jdk.xml.bind;
-    exports com.sun.xml.internal.bind.v2.model.nav to
+    exports private com.sun.xml.internal.bind.v2.model.nav to
         java.xml.ws,
         jdk.xml.bind,
         jdk.xml.ws;
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java	Thu Sep 15 13:57:27 2016 -0700
@@ -347,6 +347,7 @@
     }
 
     private boolean noWrapperGen() {
+        if (Runtime.version().major() >= 9) return true;
         Object o = config.properties().get(SuppressDocLitWrapperGeneration);
         return (o!= null && o instanceof Boolean) ? ((Boolean) o) : false;
     }
--- a/src/java.xml.ws/share/classes/module-info.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/java.xml.ws/share/classes/module-info.java	Thu Sep 15 13:57:27 2016 -0700
@@ -28,9 +28,9 @@
  * the Web Services Metadata API.
  */
 module java.xml.ws {
-    requires public java.activation;
-    requires public java.xml;
-    requires public java.xml.bind;
+    requires transitive java.activation;
+    requires transitive java.xml;
+    requires transitive java.xml.bind;
     requires java.annotations.common;
     requires java.desktop;
     requires java.logging;
@@ -56,6 +56,8 @@
     exports javax.xml.ws.spi.http;
     exports javax.xml.ws.wsaddressing;
 
+    exports private javax.xml.ws.wsaddressing to java.xml.bind;
+
     exports com.oracle.webservices.internal.api.databinding to
         jdk.xml.ws;
     exports com.sun.xml.internal.ws.addressing to
@@ -103,10 +105,10 @@
         jdk.xml.ws;
 
     // XML document content needs to be exported
-    exports com.sun.xml.internal.ws.runtime.config to java.xml.bind;
+    exports private com.sun.xml.internal.ws.runtime.config to java.xml.bind;
 
     // com.sun.xml.internal.ws.fault.SOAPFaultBuilder uses JAXBContext.newInstance
-    exports com.sun.xml.internal.ws.fault to java.xml.bind;
+    exports private com.sun.xml.internal.ws.fault to java.xml.bind;
 
     // JAF data handlers
     exports com.sun.xml.internal.messaging.saaj.soap to
--- a/src/jdk.xml.bind/share/classes/module-info.java	Thu Sep 15 17:15:53 2016 +0000
+++ b/src/jdk.xml.bind/share/classes/module-info.java	Thu Sep 15 13:57:27 2016 -0700
@@ -56,7 +56,7 @@
         jdk.xml.ws;
 
     // XML document content needs to be exported
-    exports com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
+    exports private com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
         java.xml.bind;
 
     // com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo uses JAXBContext