Mercurial > hg > openjdk > jdk9 > jaxws
changeset 687:6ba73d04589c jdk-9+118
Merge
| author | lana |
|---|---|
| date | Thu, 05 May 2016 19:10:57 +0000 |
| parents | 2d52e0610b05 (current diff) 8a7d05e55608 (diff) |
| children | 331a825f849a |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Thu May 05 17:35:48 2016 +0000 +++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Thu May 05 19:10:57 2016 +0000 @@ -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());
--- a/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java Thu May 05 17:35:48 2016 +0000 +++ b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java Thu May 05 19:10:57 2016 +0000 @@ -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");
--- a/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Thu May 05 17:35:48 2016 +0000 +++ b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Thu May 05 19:10:57 2016 +0000 @@ -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");