You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2008/06/06 19:41:51 UTC
svn commit: r664053 -
/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
Author: linsun
Date: Fri Jun 6 10:41:51 2008
New Revision: 664053
URL: http://svn.apache.org/viewvc?rev=664053&view=rev
Log:
G4100 - Allow users to use jaxws-tools.bat/sh when SUN SAAJ impl is not provided in the assembly
Modified:
geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
Modified: geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.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/JAXWSToolsCLI.java?rev=664053&r1=664052&r2=664053&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java Fri Jun 6 10:41:51 2008
@@ -72,7 +72,15 @@
tools.setUseSunSAAJ();
tools.setOverrideContextClassLoader(true);
- File [] jars = tools.getClasspath(repositories);
+ File [] jars;
+ try {
+ jars = tools.getClasspath(repositories);
+ } catch (Exception e) {
+ //if we cannot find SUN's SAAJ impl, try Axis2's.
+ tools.setUseAxis2SAAJ();
+ jars = tools.getClasspath(repositories);
+ }
+
URL[] jarUrls = JAXWSTools.toURL(jars);
String javaClassPath = System.getProperty("java.class.path");