svn commit: r515930 - /geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java

[ga...@apache.org]

Author: gawor
Date: Wed Mar  7 21:31:42 2007
New Revision: 515930

URL: http://svn.apache.org/viewvc?view=rev&rev=515930
Log:
process imports. different wsdl parts could be in different files. eventually will have to hookup oasis catalog resolver here too

Modified:
    geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java?view=diff&rev=515930&r1=515929&r2=515930
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java Wed Mar  7 21:31:42 2007
@@ -131,7 +131,7 @@
             throw new DeploymentException("Could not create WSDLFactory", e);
         }
         WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.importDocuments", false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments", true);
         wsdlReader.setFeature("javax.wsdl.verbose", false);
         try {
             if (wsdlURL != null) {
@@ -238,9 +238,9 @@
     
     private URI getWSDLLocation(WebServiceClient webServiceClient) throws DeploymentException {
         String wsdlLocation = webServiceClient.wsdlLocation();
-        if (wsdlLocation != null) {
+        if (wsdlLocation != null && wsdlLocation.trim().length() > 0) {            
             try {
-                return new URI(wsdlLocation);
+                return new URI(wsdlLocation.trim());
             } catch (URISyntaxException e) {
                 throw new DeploymentException(
                         "Invalid wsdl location in annotation: " + wsdlLocation);