diff -Nru glassfish-jaxws-2.2.10/tools/wscompile/src/main/java/com/sun/tools/ws/ant/WrapperTask.java glassfish-jaxws-2.2.10.jaxb-xjc/tools/wscompile/src/main/java/com/sun/tools/ws/ant/WrapperTask.java
--- glassfish-jaxws-2.2.10/tools/wscompile/src/main/java/com/sun/tools/ws/ant/WrapperTask.java	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.jaxb-xjc/tools/wscompile/src/main/java/com/sun/tools/ws/ant/WrapperTask.java	2015-02-03 15:14:10.815732891 +0100
@@ -44,7 +44,6 @@
 import com.sun.tools.ws.Invoker;
 import com.sun.tools.ws.wscompile.Options;
 import com.sun.tools.ws.resources.WscompileMessages;
-import com.sun.tools.xjc.api.util.ToolsJarNotFoundException;
 import com.sun.xml.bind.util.Which;
 import org.apache.tools.ant.BuildException;
 
@@ -83,7 +82,6 @@
     }
 
     protected ClassLoader createClassLoader() throws ClassNotFoundException, IOException {
-        try {
             ClassLoader cl = getClass().getClassLoader();
             if (doEndorsedMagic) {
                 return Invoker.createClassLoader(cl);
@@ -106,8 +104,5 @@
                     }
                 }
             }
-        } catch (ToolsJarNotFoundException e) {
-            throw new ClassNotFoundException(e.getMessage(), e);
-        }
     }
 }
diff -Nru glassfish-jaxws-2.2.10/tools/wscompile/src/main/java/com/sun/tools/ws/Invoker.java glassfish-jaxws-2.2.10.jaxb-xjc/tools/wscompile/src/main/java/com/sun/tools/ws/Invoker.java
--- glassfish-jaxws-2.2.10/tools/wscompile/src/main/java/com/sun/tools/ws/Invoker.java	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.jaxb-xjc/tools/wscompile/src/main/java/com/sun/tools/ws/Invoker.java	2015-02-03 15:22:34.080474573 +0100
@@ -44,7 +44,6 @@
 import com.sun.istack.tools.ParallelWorldClassLoader;
 import com.sun.tools.ws.resources.WscompileMessages;
 import com.sun.tools.ws.wscompile.Options;
-import com.sun.tools.xjc.api.util.ToolsJarNotFoundException;
 import com.sun.xml.bind.util.Which;
 
 import javax.xml.ws.Service;
@@ -145,24 +144,6 @@
                     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);
@@ -173,8 +154,6 @@
             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){
@@ -183,7 +162,6 @@
             Thread.currentThread().setContextClassLoader(oldcc);
         }
 
-        return -1;
     }
 
     /**
@@ -221,7 +199,7 @@
      * Creates a classloader that can load JAXB/WS 2.2 API and tools.jar,
      * and then return a classloader that can RI classes, which can see all those APIs and tools.jar.  
      */
-    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)
@@ -250,7 +228,7 @@
     /**
      * Creates a classloader for loading JAXB/WS 2.2 jar and tools.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) {
@@ -265,12 +243,10 @@
             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 {
+    /*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.
@@ -287,6 +263,6 @@
             }
             urls.add(toolsJar.toURL());
         }
-    }
+    }*/
 
 }