geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423551 - in /geronimo/sandbox/svkmerge/trunk: ./ modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
Date Wed, 19 Jul 2006 18:17:09 GMT
Author: jdillon
Date: Wed Jul 19 11:17:09 2006
New Revision: 423551

URL: http://svn.apache.org/viewvc?rev=423551&view=rev
Log:
 r463@Bliss (orig r423474):  sppatel | 2006-07-19 07:39:44 -0700
 GERONIMO-1582
 

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jul 19 11:17:09 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:423470
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:423474

Modified: geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java?rev=423551&r1=423550&r2=423551&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
Wed Jul 19 11:17:09 2006
@@ -30,10 +30,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
 import javax.wsdl.Definition;
 import javax.wsdl.Operation;
 import javax.wsdl.Port;
-import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.handler.HandlerInfo;
 import javax.xml.rpc.holders.BigDecimalHolder;
@@ -92,7 +93,11 @@
         JavaWsdlMappingType mapping;
         InputStream jaxrpcInputStream = null;
         try {
-            jaxrpcInputStream = moduleFile.getInputStream(moduleFile.getEntry(jaxrpcMappingPath));
+            ZipEntry zipEntry = moduleFile.getEntry(jaxrpcMappingPath);
+            if(zipEntry == null){
+                throw new DeploymentException("The JAX-RPC mapping file "+jaxrpcMappingPath+"
specified in webservices.xml for the ejb module could not be found.");
+            }
+            jaxrpcInputStream = moduleFile.getInputStream(zipEntry);
         } catch (IOException e) {
             throw new DeploymentException("Could not open stream to jaxrpc mapping document",
e);
         }



Mime
View raw message