src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 45,61 ****
  import com.sun.tools.internal.ws.wsdl.parser.MetadataFinder;
  import com.sun.tools.internal.ws.wsdl.parser.WSDLInternalizationLogic;
  import com.sun.tools.internal.xjc.util.NullStream;
  import com.sun.xml.internal.ws.api.server.Container;
  import com.sun.xml.internal.ws.util.ServiceFinder;
- import com.sun.istack.internal.tools.ParallelWorldClassLoader;
  import org.xml.sax.EntityResolver;
  import org.xml.sax.SAXParseException;
  
- import javax.xml.bind.JAXBPermission;
  import javax.xml.stream.*;
- import javax.xml.ws.EndpointContext;
  import java.io.*;
  import java.util.*;
  import java.text.MessageFormat;
  import java.util.jar.JarEntry;
  import java.util.jar.JarOutputStream;
--- 45,58 ----
*** 64,73 ****
--- 61,73 ----
  
  /**
   * @author Vivek Pandey
   */
  public class WsimportTool {
+     /** JAXB module name. JAXB dependency is mandatory in generated Java module. */
+     private static final String JAXWS_PACKAGE = "java.xml.ws";
+ 
      private static final String WSIMPORT = "wsimport";
      private final PrintStream out;
      private final Container container;
  
      /**
*** 474,486 ****
                  // fatal error. error should have been reported
                  return false;
              }
          }
  
          CodeWriter cw;
          if (options.filer != null) {
!             cw = new FilerCodeWriter(options.sourceDir, options);
          } else {
              cw = new WSCodeWriter(options.sourceDir, options);
          }
  
          if (options.verbose)
--- 474,490 ----
                  // fatal error. error should have been reported
                  return false;
              }
          }
  
+         if (options.getModuleName() != null) {
+             options.getCodeModel()._prepareModuleInfo(options.getModuleName(), JAXWS_PACKAGE);
+         }
+ 
          CodeWriter cw;
          if (options.filer != null) {
!             cw = new FilerCodeWriter(options);
          } else {
              cw = new WSCodeWriter(options.sourceDir, options);
          }
  
          if (options.verbose)
*** 497,518 ****
  
      public void setEntityResolver(EntityResolver resolver){
          this.options.entityResolver = resolver;
      }
  
-     /*
-      * To take care of JDK6-JDK6u3, where 2.1 API classes are not there
-      */
-     private static boolean useBootClasspath(Class clazz) {
-         try {
-             ParallelWorldClassLoader.toJarUrl(clazz.getResource('/'+clazz.getName().replace('.','/')+".class"));
-             return true;
-         } catch(Exception e) {
-             return false;
-         }
-     }
- 
      protected boolean compileGeneratedClasses(ErrorReceiver receiver, WsimportListener listener){
          List<String> sourceFiles = new ArrayList<String>();
  
          for (File f : options.getGeneratedFiles()) {
              if (f.exists() && f.getName().endsWith(".java")) {
--- 501,510 ----
*** 521,545 ****
          }
  
          if (sourceFiles.size() > 0) {
              String classDir = options.destDir.getAbsolutePath();
              String classpathString = createClasspathString();
-             boolean bootCP = useBootClasspath(EndpointContext.class) || useBootClasspath(JAXBPermission.class);
              List<String> args = new ArrayList<String>();
              args.add("--add-modules");
              args.add("java.xml.ws");
              args.add("-d");
              args.add(classDir);
              args.add("-classpath");
              args.add(classpathString);
-             //javac is not working in osgi as the url starts with a bundle
-             if (bootCP) {
-                 args.add("-Xbootclasspath/p:"
-                         + JavaCompilerHelper.getJarFile(EndpointContext.class)
-                         + File.pathSeparator
-                         + JavaCompilerHelper.getJarFile(JAXBPermission.class));
-             }
  
              if (options.debug) {
                  args.add("-g");
              }
  
--- 513,531 ----
          }
  
          if (sourceFiles.size() > 0) {
              String classDir = options.destDir.getAbsolutePath();
              String classpathString = createClasspathString();
              List<String> args = new ArrayList<String>();
+ 
              args.add("--add-modules");
              args.add("java.xml.ws");
+ 
              args.add("-d");
              args.add(classDir);
              args.add("-classpath");
              args.add(classpathString);
  
              if (options.debug) {
                  args.add("-g");
              }