You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2006/11/14 09:49:56 UTC
svn commit: r474704 -
/geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SchemaInfoBuilder.java
Author: vamsic007
Date: Tue Nov 14 00:49:55 2006
New Revision: 474704
URL: http://svn.apache.org/viewvc?view=rev&rev=474704
Log:
GERONIMO-1580 Better error message for missing WSDL file for EJB web service
Modified:
geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SchemaInfoBuilder.java
Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SchemaInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SchemaInfoBuilder.java?view=diff&rev=474704&r1=474703&r2=474704
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SchemaInfoBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/SchemaInfoBuilder.java Tue Nov 14 00:49:55 2006
@@ -558,6 +558,8 @@
definition = wsdlReader.readWSDL(wsdlLocator);
} catch (WSDLException e) {
throw new DeploymentException("Failed to read wsdl document", e);
+ } catch (RuntimeException e) {
+ throw new DeploymentException(e.getMessage(), e);
}
} finally {
thread.setContextClassLoader(oldCl);
@@ -645,8 +647,11 @@
public InputSource getBaseInputSource() {
InputStream wsdlInputStream;
+ ZipEntry entry = moduleFile.getEntry(wsdlURI.toString());
+ if(entry == null){
+ throw new RuntimeException("The webservices.xml file for the EJB JAR points to a non-existant WSDL file "+wsdlURI.toString());
+ }
try {
- ZipEntry entry = moduleFile.getEntry(wsdlURI.toString());
wsdlInputStream = moduleFile.getInputStream(entry);
DefinitionsDocument definition = DefinitionsDocument.Factory.parse(wsdlInputStream);
wsdlMap.put(wsdlURI, definition);