stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-05-05 19:10:57 +00:00
commit 84afafafa5
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
View File

@ -140,6 +140,9 @@ public class SchemaGenerator {
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());

2
jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
View File

@ -162,6 +162,8 @@ public class WsgenTool {
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");

2
jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
View File

@ -525,6 +525,8 @@ public class WsimportTool {
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");