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:42:59 UTC

svn commit: r664055 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java

Author: linsun
Date: Fri Jun  6 10:42:59 2008
New Revision: 664055

URL: http://svn.apache.org/viewvc?rev=664055&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/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java?rev=664055&r1=664054&r2=664055&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java Fri Jun  6 10:42:59 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");



Re: svn commit: r664055 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java

Posted by Lin Sun <li...@gmail.com>.
Cool - thanks for the tip!   I've been wondering how some jiras and
commits are linked.

Lin

On Fri, Jun 6, 2008 at 1:54 PM, Joe Bohn <jo...@earthlink.net> wrote:
> linsun@apache.org wrote:
>>
>> Author: linsun
>> Date: Fri Jun  6 10:42:59 2008
>> New Revision: 664055
>>
>> URL: http://svn.apache.org/viewvc?rev=664055&view=rev
>> Log:
>> G4100 - Allow users to use jaxws-tools.bat/sh when SUN SAAJ impl is not
>> provided in the assembly
>
> Lin,
>
> If you include "GERONIMO-4100" instead of "G4100" in your change description
> the "Subversion Commits" section of the referenced JIRA will be
> automatically updated with the change details.  This is preferred over
> manually entering the change details in the JIRA.
>
> Joe
>

Re: svn commit: r664055 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSToolsCLI.java

Posted by Joe Bohn <jo...@earthlink.net>.
linsun@apache.org wrote:
> Author: linsun
> Date: Fri Jun  6 10:42:59 2008
> New Revision: 664055
> 
> URL: http://svn.apache.org/viewvc?rev=664055&view=rev
> Log:
> G4100 - Allow users to use jaxws-tools.bat/sh when SUN SAAJ impl is not provided in the assembly

Lin,

If you include "GERONIMO-4100" instead of "G4100" in your change 
description the "Subversion Commits" section of the referenced JIRA will 
be automatically updated with the change details.  This is preferred 
over manually entering the change details in the JIRA.

Joe