svn commit: r718267 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java

[ga...@apache.org]

Author: gawor
Date: Mon Nov 17 08:09:48 2008
New Revision: 718267

URL: http://svn.apache.org/viewvc?rev=718267&view=rev
Log:
don't look for tools.jar on Mac OS X (GERONIMO-4411)

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=718267&r1=718266&r2=718267&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Mon Nov 17 08:09:48 2008
@@ -29,6 +29,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.geronimo.kernel.classloader.JarFileClassLoader;
+import org.apache.geronimo.kernel.config.Os;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.Repository;
@@ -128,7 +129,11 @@
         if (this.saajImpl != null) {
             jars.add(getLocation(repositories, this.saajImpl));
         }
-        addToolsJarLocation(jars);
+        // add tools.jar to classpath except on Mac OS. On Mac OS there is classes.jar with the
+        // same contents as tools.jar and is automatically included in the classpath.
+        if (!Os.isFamily(Os.FAMILY_MAC)) {
+            addToolsJarLocation(jars);
+        }
         
         return jars.toArray(new File[jars.size()]);
     }