Mercurial > hg > openjdk > jdk9 > jaxws
changeset 707:b41e7cd5f414
8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar
author | mchung |
---|---|
date | Wed, 10 Aug 2016 15:49:27 -0700 |
parents | 783e7e2c587f |
children | 9fff2477a4ca |
files | src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Mon Aug 08 10:15:29 2016 -0400 +++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Wed Aug 10 15:49:27 2016 -0700 @@ -140,7 +140,7 @@ aptargs.add("-cp"); aptargs.add(setClasspath(options.classpath)); // set original classpath + jaxb-api to be visible to annotation processor - aptargs.add("-addmods"); + aptargs.add("--add-modules"); aptargs.add("java.xml.bind"); if(options.targetDir!=null) {
--- a/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java Mon Aug 08 10:15:29 2016 -0400 +++ b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java Wed Aug 10 15:49:27 2016 -0700 @@ -162,7 +162,7 @@ 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("--add-modules"); args.add("java.xml.ws"); args.add("-d"); args.add(options.destDir.getAbsolutePath());
--- a/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Mon Aug 08 10:15:29 2016 -0400 +++ b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Wed Aug 10 15:49:27 2016 -0700 @@ -525,7 +525,7 @@ String classpathString = createClasspathString(); boolean bootCP = useBootClasspath(EndpointContext.class) || useBootClasspath(JAXBPermission.class); List<String> args = new ArrayList<String>(); - args.add("-addmods"); + args.add("--add-modules"); args.add("java.xml.ws"); args.add("-d"); args.add(classDir);