Mergejdk-9+174

4 files changed, 38 insertions, 0 deletions

diff --git a/src/java.xml.bind/share/classes/module-info.java b/src/java.xml.bind/share/classes/module-info.java
index c871b6f0..61f80413 100644
--- a/src/java.xml.bind/share/classes/module-info.java
+++ b/src/java.xml.bind/share/classes/module-info.java
@@ -26,6 +26,8 @@
 /**
  * Defines the Java Architecture for XML Binding (JAXB) API.
  *
+ * @uses javax.xml.bind.JAXBContextFactory
+ *
  * @moduleGraph
  * @since 9
  */
diff --git a/src/java.xml.ws/share/classes/module-info.java b/src/java.xml.ws/share/classes/module-info.java
index a1f9cfb6..67ab3d18 100644
--- a/src/java.xml.ws/share/classes/module-info.java
+++ b/src/java.xml.ws/share/classes/module-info.java
@@ -27,6 +27,12 @@
  * Defines the Java API for XML-Based Web Services (JAX-WS), and
  * the Web Services Metadata API.
  *
+ * @uses javax.xml.soap.MessageFactory
+ * @uses javax.xml.soap.SAAJMetaFactory
+ * @uses javax.xml.soap.SOAPConnectionFactory
+ * @uses javax.xml.soap.SOAPFactory
+ * @uses javax.xml.ws.spi.Provider
+ *
  * @moduleGraph
  * @since 9
  */
diff --git a/src/jdk.xml.bind/share/classes/module-info.java b/src/jdk.xml.bind/share/classes/module-info.java
index 8757ce45..3f33b76c 100644
--- a/src/jdk.xml.bind/share/classes/module-info.java
+++ b/src/jdk.xml.bind/share/classes/module-info.java
@@ -23,6 +23,21 @@
  * questions.
  */
 
+/**
+ * Defines tools for JAXB classes and XML schema generation,
+ * including the <em>{@index schemagen schemagen tool}</em>
+ * and <em>{@index xjc xjc tool}</em> tools.
+ *
+ * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
+ * <dt class="simpleTagLabel">Tool Guides:
+ * <dd>{@extLink schemagen_tool_reference schemagen},
+ *     {@extLink xjc_tool_reference xjc}
+ * </dl>
+ *
+ * @moduleGraph
+ * @since 9
+ */
+@Deprecated(since="9", forRemoval=true)
 module jdk.xml.bind {
     requires java.activation;
     requires java.compiler;
diff --git a/src/jdk.xml.ws/share/classes/module-info.java b/src/jdk.xml.ws/share/classes/module-info.java
index dbec9c53..81a6d04e 100644
--- a/src/jdk.xml.ws/share/classes/module-info.java
+++ b/src/jdk.xml.ws/share/classes/module-info.java
@@ -23,6 +23,21 @@
  * questions.
  */
 
+/**
+ * Defines tools for JAX-WS classes and WSDL generation,
+ * including the <em>{@index wsgen wsgen tool}</em>
+ * and <em>{@index wsimport wsimport tool}</em> tools.
+ *
+ * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
+ * <dt class="simpleTagLabel">Tool Guides:
+ * <dd>{@extLink wsgen_tool_reference wsgen},
+ *     {@extLink wsimport_tool_reference wsimport}
+ * </dl>
+ *
+ * @moduleGraph
+ * @since 9
+ */
+@Deprecated(since="9", forRemoval=true)
 module jdk.xml.ws {
     requires java.compiler;
     requires java.logging;