OpenJDK / jdk / jdk10

changeset 42400:bd7790c39ad8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Thu, 01 Dec 2016 21:40:21 +0000
parents ed51f91f29ef 8aa9f5bf4b43
children 925e4d87ebac
files
diffstat 8 files changed, 29 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/jaxws/.hgignore	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/.hgignore	Thu Dec 01 21:40:21 2016 +0000
@@ -4,5 +4,4 @@
 ^drop_included/
 ^webrev
 /nbproject/private/
-^.hgtip
 .DS_Store
--- a/jaxws/src/java.activation/share/classes/module-info.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/java.activation/share/classes/module-info.java	Thu Dec 01 21:40:21 2016 +0000
@@ -27,7 +27,7 @@
  * Defines the JavaBeans Activation Framework (JAF) API.
  */
 module java.activation {
-    requires public java.datatransfer;
+    requires transitive java.datatransfer;
     requires java.logging;
 
     exports javax.activation;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java	Thu Dec 01 21:40:21 2016 +0000
@@ -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/jaxws/src/java.xml.bind/share/classes/module-info.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/java.xml.bind/share/classes/module-info.java	Thu Dec 01 21:40:21 2016 +0000
@@ -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;
@@ -91,6 +91,10 @@
         java.xml.ws,
         jdk.xml.bind,
         jdk.xml.ws;
+    opens com.sun.xml.internal.bind.v2.model.nav to
+        java.xml.ws,
+        jdk.xml.bind,
+        jdk.xml.ws;
     exports com.sun.xml.internal.bind.v2.model.runtime to
         java.xml.ws;
     exports com.sun.xml.internal.bind.v2.model.util to
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java	Thu Dec 01 21:40:21 2016 +0000
@@ -346,6 +346,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/jaxws/src/java.xml.ws/share/classes/module-info.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/module-info.java	Thu Dec 01 21:40:21 2016 +0000
@@ -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;
@@ -55,6 +55,8 @@
     exports javax.xml.ws.spi.http;
     exports javax.xml.ws.wsaddressing;
 
+    opens 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
@@ -102,10 +104,13 @@
         jdk.xml.ws;
 
     // XML document content needs to be exported
-    exports com.sun.xml.internal.ws.runtime.config to java.xml.bind;
+    opens 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;
+    opens com.sun.xml.internal.ws.fault to java.xml.bind;
+
+    // classes passed to JAXBContext.newInstance for deep reflection
+    opens com.sun.xml.internal.ws.addressing to java.xml.bind;
 
     // JAF data handlers
     exports com.sun.xml.internal.messaging.saaj.soap to
--- a/jaxws/src/jdk.xml.bind/share/classes/module-info.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/jdk.xml.bind/share/classes/module-info.java	Thu Dec 01 21:40:21 2016 +0000
@@ -56,18 +56,19 @@
         jdk.xml.ws;
 
     // XML document content needs to be exported
-    exports com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
+    opens com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
         java.xml.bind;
 
     // com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo uses JAXBContext
     exports com.sun.tools.internal.xjc.generator.bean to java.xml.bind;
 
     uses com.sun.tools.internal.xjc.Plugin;
-    provides com.sun.tools.internal.xjc.Plugin with com.sun.tools.internal.xjc.addon.accessors.PluginImpl;
-    provides com.sun.tools.internal.xjc.Plugin with com.sun.tools.internal.xjc.addon.at_generated.PluginImpl;
-    provides com.sun.tools.internal.xjc.Plugin with com.sun.tools.internal.xjc.addon.code_injector.PluginImpl;
-    provides com.sun.tools.internal.xjc.Plugin with com.sun.tools.internal.xjc.addon.episode.PluginImpl;
-    provides com.sun.tools.internal.xjc.Plugin with com.sun.tools.internal.xjc.addon.locator.SourceLocationAddOn;
-    provides com.sun.tools.internal.xjc.Plugin with com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn;
+    provides com.sun.tools.internal.xjc.Plugin with
+        com.sun.tools.internal.xjc.addon.accessors.PluginImpl,
+        com.sun.tools.internal.xjc.addon.at_generated.PluginImpl,
+        com.sun.tools.internal.xjc.addon.code_injector.PluginImpl,
+        com.sun.tools.internal.xjc.addon.episode.PluginImpl,
+        com.sun.tools.internal.xjc.addon.locator.SourceLocationAddOn,
+        com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn;
 }
 
--- a/jaxws/src/jdk.xml.ws/share/classes/module-info.java	Thu Dec 01 21:01:53 2016 +0000
+++ b/jaxws/src/jdk.xml.ws/share/classes/module-info.java	Thu Dec 01 21:40:21 2016 +0000
@@ -33,6 +33,7 @@
     requires jdk.xml.bind;
 
     uses com.sun.tools.internal.ws.wscompile.Plugin;
-    provides com.sun.tools.internal.ws.wscompile.Plugin with com.sun.tools.internal.ws.wscompile.plugin.at_generated.PluginImpl;
+    provides com.sun.tools.internal.ws.wscompile.Plugin with
+        com.sun.tools.internal.ws.wscompile.plugin.at_generated.PluginImpl;
 }
© 2007, Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks