geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r474702 - /geronimo/server/branches/1.1/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
Date Tue, 14 Nov 2006 08:48:34 GMT
Author: vamsic007
Date: Tue Nov 14 00:48:33 2006
New Revision: 474702

URL: http://svn.apache.org/viewvc?view=rev&rev=474702
Log:
GERONIMO-1580 Better error message for missing WSDL file for EJB web service

Modified:
    geronimo/server/branches/1.1/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java

Modified: geronimo/server/branches/1.1/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java?view=diff&rev=474702&r1=474701&r2=474702
==============================================================================
--- geronimo/server/branches/1.1/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
(original)
+++ geronimo/server/branches/1.1/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
Tue Nov 14 00:48:33 2006
@@ -557,6 +557,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);
@@ -643,8 +645,11 @@
 
         public InputSource getBaseInputSource() {
             InputStream wsdlInputStream = null;
+            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);



Mime
View raw message