jdk-sandbox: comparison jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/Invoker.java

equal deleted inserted replaced

-:9d0e6639a4d7
+:e04929038abf
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* 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
 import com.sun.istack.internal.tools.MaskingClassLoader;
 import com.sun.istack.internal.tools.ParallelWorldClassLoader;
 import com.sun.tools.internal.ws.resources.WscompileMessages;
 import com.sun.tools.internal.ws.wscompile.Options;
-import com.sun.tools.internal.xjc.api.util.ToolsJarNotFoundException;
 import com.sun.xml.internal.bind.util.Which;
 import javax.xml.ws.Service;
 import javax.xml.ws.WebServiceFeature;
 import javax.xml.namespace.QName;
-import java.io.File;
 import java.io.OutputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 public final class Invoker {
 /**
 * The list of package prefixes we want the
 * {@link MaskingClassLoader} to prevent the parent
-* classLoader from loading
+* class loader from loading
 */
 static final String[] maskedPackages = new String[]{
 "com.sun.istack.internal.tools.",
 "com.sun.tools.internal.jxc.",
 "com.sun.tools.internal.xjc.",
 System.err.println(WscompileMessages.WRAPPER_TASK_LOADING_INCORRECT_API(loadedVersion.getVersion(), Which.which(Service.class), targetVersion.getVersion()));
 }
 return -1;
 }
-//find and load tools.jar
-List<URL> urls = new ArrayList<URL>();
-findToolsJar(cl, urls);
-if(urls.size() > 0){
-List<String> mask = new ArrayList<String>(Arrays.asList(maskedPackages));
-// first create a protected area so that we load JAXB/WS 2.1 API
-// and everything that depends on them inside
-cl = new MaskingClassLoader(cl,mask);
-// then this classloader loads the API and tools.jar
-cl = new URLClassLoader(urls.toArray(new URL[urls.size()]), cl);
-// finally load the rest of the RI. The actual class files are loaded from ancestors
-cl = new ParallelWorldClassLoader(cl,"");
-}
 }
 Thread.currentThread().setContextClassLoader(cl);
 Class compileTool = cl.loadClass(mainClass);
 Constructor ctor = compileTool.getConstructor(OutputStream.class);
 Object tool = ctor.newInstance(System.out);
 Method runMethod = compileTool.getMethod("run",String[].class);
 boolean r = (Boolean)runMethod.invoke(tool,new Object[]{args});
 return r ? 0 : 1;
-} catch (ToolsJarNotFoundException e) {
-System.err.println(e.getMessage());
 } catch (InvocationTargetException e) {
 throw e.getCause();
 } catch(ClassNotFoundException e){
 throw e;
 }finally {
 Thread.currentThread().setContextClassLoader(oldcc);
 }
-return -1;
 }
 /**
 * Returns true if the RI appears to be loading the JAX-WS 2.1 API.
 */
 return false;
 }
 /**
-* Creates a classloader that can load JAXB/WS 2.2 API and tools.jar,
+* Creates a class loader that can load JAXB/WS 2.2 API,
-* and then return a classloader that can RI classes, which can see all those APIs and tools.jar.
+* and then return a class loader that can RI classes, which can see all those APIs.
 */
-public static ClassLoader createClassLoader(ClassLoader cl) throws ClassNotFoundException, IOException, ToolsJarNotFoundException {
+public static ClassLoader createClassLoader(ClassLoader cl) throws ClassNotFoundException, IOException {
 URL[] urls = findIstack22APIs(cl);
 if(urls.length==0)
 return cl;  // we seem to be able to load everything already. no need for the hack
 // first create a protected area so that we load JAXB/WS 2.1 API
 // and everything that depends on them inside
 cl = new MaskingClassLoader(cl,mask);
-// then this classloader loads the API and tools.jar
+// then this class loader loads the API
 cl = new URLClassLoader(urls, cl);
 // finally load the rest of the RI. The actual class files are loaded from ancestors
 cl = new ParallelWorldClassLoader(cl,"");
 return cl;
 }
 /**
-* Creates a classloader for loading JAXB/WS 2.2 jar and tools.jar
+* Creates a class loader for loading JAXB/WS 2.2 jar
 */
-private static URL[] findIstack22APIs(ClassLoader cl) throws ClassNotFoundException, IOException, ToolsJarNotFoundException {
+private static URL[] findIstack22APIs(ClassLoader cl) throws ClassNotFoundException, IOException {
 List<URL> urls = new ArrayList<URL>();
 if(Service.class.getClassLoader()==null) {
-// JAX-WS API is loaded from bootstrap classloader
+// JAX-WS API is loaded from bootstrap class loader
 URL res = cl.getResource("javax/xml/ws/EndpointContext.class");
 if(res==null)
 throw new ClassNotFoundException("There's no JAX-WS 2.2 API in the classpath");
 urls.add(ParallelWorldClassLoader.toJarUrl(res));
 res = cl.getResource("javax/xml/bind/JAXBPermission.class");
 if(res==null)
 throw new ClassNotFoundException("There's no JAXB 2.2 API in the classpath");
 urls.add(ParallelWorldClassLoader.toJarUrl(res));
 }
-findToolsJar(cl, urls);
 return urls.toArray(new URL[urls.size()]);
 }
-private static void findToolsJar(ClassLoader cl, List<URL> urls) throws ToolsJarNotFoundException, MalformedURLException {
-try {
-Class.forName("com.sun.tools.javac.Main",false,cl);
-// we can already load them in the parent class loader.
-// so no need to look for tools.jar.
-// this happens when we are run inside IDE/Ant, or
-// in Mac OS.
-} catch (ClassNotFoundException e) {
-// otherwise try to find tools.jar
-File jreHome = new File(System.getProperty("java.home"));
-File toolsJar = new File( jreHome.getParent(), "lib/tools.jar" );
-if (!toolsJar.exists()) {
-throw new ToolsJarNotFoundException(toolsJar);
-}
-urls.add(toolsJar.toURL());
-}
-}
 }

changeset 26658	e04929038abf
parent 25871	b80b84e87032