You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/11/17 17:10:42 UTC
svn commit: r718268 -
/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
Author: gawor
Date: Mon Nov 17 08:10:42 2008
New Revision: 718268
URL: http://svn.apache.org/viewvc?rev=718268&view=rev
Log:
don't look for tools.jar on Mac OS X (GERONIMO-4411)
Modified:
geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
Modified: geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=718268&r1=718267&r2=718268&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Mon Nov 17 08:10:42 2008
@@ -29,6 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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;
@@ -115,7 +116,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()]);
}