You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ba...@apache.org on 2007/04/10 20:30:09 UTC
svn commit: r527240 - in /webservices/axis2/trunk/java/modules:
jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/
metadata/src/org/apache/axis2/jaxws/description/impl/
metadata/src/org/apache/axis2/jaxws/i18n/
metadata/src/org/apache/axis2/jax...
Author: barrettj
Date: Tue Apr 10 11:30:08 2007
New Revision: 527240
URL: http://svn.apache.org/viewvc?view=rev&rev=527240
Log:
AXIS2-2499
Contributed by Dustin Amrhein. Throw IOException if WSDL file can't be opened.
Modified:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java?view=diff&rev=527240&r1=527239&r2=527240
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java Tue Apr 10 11:30:08 2007
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.ConnectException;
import java.net.UnknownHostException;
@@ -92,7 +93,10 @@
}catch(ConnectException e) {
e.printStackTrace();
fail();
- }catch(WSDLException e){
+ }catch(IOException e) {
+ e.printStackTrace();
+ fail();
+ }catch(WSDLException e){
e.printStackTrace();
fail();
}catch(SchemaReaderException e){
@@ -137,6 +141,9 @@
}catch(ConnectException e) {
e.printStackTrace();
fail();
+ }catch(IOException e) {
+ e.printStackTrace();
+ fail();
}catch(WSDLException e){
e.printStackTrace();
fail();
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?view=diff&rev=527240&r1=527239&r2=527240
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Tue Apr 10 11:30:08 2007
@@ -47,6 +47,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.soap.SOAPBinding;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.net.ConnectException;
import java.net.URL;
import java.net.UnknownHostException;
@@ -488,6 +489,9 @@
catch (ConnectException e) {
throw ExceptionFactory.makeWebServiceException(
Messages.getMessage("connectionRefused", e.getMessage()), e);
+ }
+ catch(IOException e) {
+ throw ExceptionFactory.makeWebServiceException(Messages.getMessage("urlStream", e.getMessage()), e);
}
catch (WSDLException e) {
throw ExceptionFactory.makeWebServiceException(
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties?view=diff&rev=527240&r1=527239&r2=527240
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties Tue Apr 10 11:30:08 2007
@@ -152,6 +152,7 @@
NullParamErr1=Argument {0} in operation {1} is null. This is not allowed for messages {2}.
unknownHost=The host specified by the URL is unknown.
connectionRefused=An attempt to connect to the URL was refused.
+urlStream=The WSDL file could not be located.
mimeBodyPartError=Error: Problem creating mime parts.
schemaImportError=An internal error occurred resolving imported schema {0} relative to parent document {1}
ExecutorShutdown=RejectedExcecutionException. The request is rejected because the Executor Service for the service is shutdown.
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java?view=diff&rev=527240&r1=527239&r2=527240
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java Tue Apr 10 11:30:08 2007
@@ -35,6 +35,7 @@
import javax.xml.namespace.QName;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.InputStream;
import java.net.ConnectException;
import java.net.URL;
@@ -58,7 +59,7 @@
private URL wsdlURL;
public WSDL4JWrapper(URL wsdlURL) throws FileNotFoundException, UnknownHostException,
- ConnectException, WSDLException {
+ ConnectException, IOException, WSDLException {
super();
this.wsdlURL = wsdlURL;
try {
@@ -127,11 +128,12 @@
throw ex;
} catch (ConnectException ex) {
throw ex;
+ } catch(IOException ex) {
+ throw ex;
} catch (Exception ex) {
throw new WSDLException("WSDL4JWrapper : ", ex.getMessage());
}
}
-
private URL getURLFromJAR(URLClassLoader urlLoader, URL relativeURL) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org