# HG changeset patch
# User alanb
# Date 1462262989 -3600
# Node ID 339503342184bd74d34c2ce8dd2add128402c98f
# Parent  82b8d12a553f5617737c238cec060281d52e351c
8154956: Module system implementation refresh (4/2016)
Reviewed-by: mchung, chegar, redestad

diff -r 82b8d12a553f -r 339503342184 jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Wed Jul 05 21:39:33 2017 +0200
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Tue May 03 09:09:49 2016 +0100
@@ -140,6 +140,9 @@
         aptargs.add("-cp");
         aptargs.add(setClasspath(options.classpath)); // set original classpath + jaxb-api to be visible to annotation processor
 
+        aptargs.add("-addmods");
+        aptargs.add("java.xml.bind");
+
         if(options.targetDir!=null) {
             aptargs.add("-d");
             aptargs.add(options.targetDir.getPath());
diff -r 82b8d12a553f -r 339503342184 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java	Wed Jul 05 21:39:33 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java	Tue May 03 09:09:49 2016 +0100
@@ -162,6 +162,8 @@
         boolean bootCP = useBootClasspath(EndpointReference.class) || useBootClasspath(XmlSeeAlso.class);
         List<String> args = new ArrayList<String>(6 + (bootCP ? 1 : 0) + (options.nocompile ? 1 : 0)
                 + (options.encoding != null ? 2 : 0));
+        args.add("-addmods");
+        args.add("java.xml.ws");
         args.add("-d");
         args.add(options.destDir.getAbsolutePath());
         args.add("-classpath");
diff -r 82b8d12a553f -r 339503342184 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java	Wed Jul 05 21:39:33 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java	Tue May 03 09:09:49 2016 +0100
@@ -525,6 +525,8 @@
             String classpathString = createClasspathString();
             boolean bootCP = useBootClasspath(EndpointContext.class) || useBootClasspath(JAXBPermission.class);
             List<String> args = new ArrayList<String>();
+            args.add("-addmods");
+            args.add("java.xml.ws");
             args.add("-d");
             args.add(classDir);
             args.add("-classpath");