changeset 820:083973007bef

8182416: Clean up module-info.java like move requires transitive adjacent to exports Reviewed-by: alanb
author mchung
date Sat, 17 Jun 2017 11:51:31 -0700
parents c9b85ef1567e
children a5d361b9d1f7
files src/java.activation/share/classes/module-info.java src/java.xml.bind/share/classes/module-info.java src/java.xml.ws.annotation/share/classes/module-info.java src/java.xml.ws/share/classes/module-info.java src/jdk.xml.bind/share/classes/module-info.java src/jdk.xml.ws/share/classes/module-info.java
diffstat 6 files changed, 40 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.activation/share/classes/module-info.java	Fri Jun 16 19:12:34 2017 -0400
+++ b/src/java.activation/share/classes/module-info.java	Sat Jun 17 11:51:31 2017 -0700
@@ -26,13 +26,16 @@
 /**
  * Defines the JavaBeans Activation Framework (JAF) API.
  *
+ * <p> This module is upgradeble.
+ *
  * @moduleGraph
  * @since 9
  */
 @Deprecated(since="9", forRemoval=true)
 module java.activation {
+    requires java.logging;
+
     requires transitive java.datatransfer;
-    requires java.logging;
 
     exports javax.activation;
 }
--- a/src/java.xml.bind/share/classes/module-info.java	Fri Jun 16 19:12:34 2017 -0400
+++ b/src/java.xml.bind/share/classes/module-info.java	Sat Jun 17 11:51:31 2017 -0700
@@ -26,6 +26,8 @@
 /**
  * Defines the Java Architecture for XML Binding (JAXB) API.
  *
+ * <p> This module is upgradeble.
+ *
  * @uses javax.xml.bind.JAXBContextFactory
  *
  * @moduleGraph
@@ -33,14 +35,13 @@
  */
 @Deprecated(since="9", forRemoval=true)
 module java.xml.bind {
-    requires transitive java.activation;
-    requires transitive java.xml;
     requires java.compiler;
     requires java.desktop;
     requires java.logging;
     requires jdk.unsupported;
 
-    uses javax.xml.bind.JAXBContextFactory;
+    requires transitive java.activation;
+    requires transitive java.xml;
 
     exports javax.xml.bind;
     exports javax.xml.bind.annotation;
@@ -48,6 +49,7 @@
     exports javax.xml.bind.attachment;
     exports javax.xml.bind.helpers;
     exports javax.xml.bind.util;
+
     exports com.sun.istack.internal to
         java.xml.ws,
         jdk.xml.bind,
@@ -147,4 +149,7 @@
         java.xml.ws,
         jdk.xml.bind,
         jdk.xml.ws;
+
+    uses javax.xml.bind.JAXBContextFactory;
+
 }
--- a/src/java.xml.ws.annotation/share/classes/module-info.java	Fri Jun 16 19:12:34 2017 -0400
+++ b/src/java.xml.ws.annotation/share/classes/module-info.java	Sat Jun 17 11:51:31 2017 -0700
@@ -27,6 +27,8 @@
  * Defines a subset of the Common Annotations API to support programs running
  * on the Java SE Platform.
  *
+ * <p> This module is upgradeble.
+ *
  * @moduleGraph
  * @since 9
  */
--- a/src/java.xml.ws/share/classes/module-info.java	Fri Jun 16 19:12:34 2017 -0400
+++ b/src/java.xml.ws/share/classes/module-info.java	Sat Jun 17 11:51:31 2017 -0700
@@ -27,6 +27,8 @@
  * Defines the Java API for XML-Based Web Services (JAX-WS), and
  * the Web Services Metadata API.
  *
+ * <p> This module is upgradeble.
+ *
  * @uses javax.xml.soap.MessageFactory
  * @uses javax.xml.soap.SAAJMetaFactory
  * @uses javax.xml.soap.SOAPConnectionFactory
@@ -38,21 +40,16 @@
  */
 @Deprecated(since="9", forRemoval=true)
 module java.xml.ws {
+    requires java.desktop;
+    requires java.logging;
+    requires java.management;
+    requires java.xml.ws.annotation;
+    requires jdk.httpserver;
+    requires jdk.unsupported;
+
     requires transitive java.activation;
     requires transitive java.xml;
     requires transitive java.xml.bind;
-    requires java.xml.ws.annotation;
-    requires java.desktop;
-    requires java.logging;
-    requires java.management;
-    requires jdk.httpserver;
-    requires jdk.unsupported;
-
-    uses javax.xml.ws.spi.Provider;
-    uses javax.xml.soap.MessageFactory;
-    uses javax.xml.soap.SAAJMetaFactory;
-    uses javax.xml.soap.SOAPConnectionFactory;
-    uses javax.xml.soap.SOAPFactory;
 
     exports javax.jws;
     exports javax.jws.soap;
@@ -66,8 +63,6 @@
     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
@@ -113,6 +108,13 @@
         jdk.xml.ws;
     exports com.sun.xml.internal.ws.wsdl.writer to
         jdk.xml.ws;
+    // JAF data handlers
+    exports com.sun.xml.internal.messaging.saaj.soap to
+        java.activation;
+    exports com.sun.xml.internal.ws.encoding to
+        java.activation;
+
+    opens javax.xml.ws.wsaddressing to java.xml.bind;
 
     // XML document content needs to be exported
     opens com.sun.xml.internal.ws.runtime.config to java.xml.bind;
@@ -123,10 +125,10 @@
     // 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
-        java.activation;
-    exports com.sun.xml.internal.ws.encoding to
-        java.activation;
+    uses javax.xml.ws.spi.Provider;
+    uses javax.xml.soap.MessageFactory;
+    uses javax.xml.soap.SAAJMetaFactory;
+    uses javax.xml.soap.SOAPConnectionFactory;
+    uses javax.xml.soap.SOAPFactory;
 }
 
--- a/src/jdk.xml.bind/share/classes/module-info.java	Fri Jun 16 19:12:34 2017 -0400
+++ b/src/jdk.xml.bind/share/classes/module-info.java	Sat Jun 17 11:51:31 2017 -0700
@@ -69,15 +69,16 @@
         jdk.xml.ws;
     exports com.sun.xml.internal.xsom.parser to
         jdk.xml.ws;
+    // com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo uses JAXBContext
+    exports com.sun.tools.internal.xjc.generator.bean to
+       java.xml.bind;
 
     // XML document content needs to be exported
     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;
 
-    uses com.sun.tools.internal.xjc.Plugin;
     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,
--- a/src/jdk.xml.ws/share/classes/module-info.java	Fri Jun 16 19:12:34 2017 -0400
+++ b/src/jdk.xml.ws/share/classes/module-info.java	Sat Jun 17 11:51:31 2017 -0700
@@ -48,6 +48,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;
 }