svn commit: r157491 - in geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder: AxisServiceBuilder.java PortInfo.java WSDescriptorParser.java

[dblevins]

Author: dblevins
Date: Mon Mar 14 18:01:54 2005
New Revision: 157491

URL: http://svn.apache.org/viewcvs?view=rev&rev=157491
Log:
Build more information into PortInfo

Modified:
    
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
    
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/PortInfo.java
    
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java

Modified: 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java?view=diff&r1=157490&r2=157491
==============================================================================
--- 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
 (original)
+++ 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
 Mon Mar 14 18:01:54 2005
@@ -106,7 +106,7 @@
 
         URL location = getAddressLocation(port);
         serviceDesc.setEndpointURL(location.toExternalForm());
-
+        serviceDesc.setWSDLFile(portInfo.getWsdlURL().toExternalForm());
         Binding binding = port.getBinding();
 
         serviceDesc.setStyle(getStyle(binding));

Modified: 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/PortInfo.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/PortInfo.java?view=diff&r1=157490&r2=157491
==============================================================================
--- 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/PortInfo.java
 (original)
+++ 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/PortInfo.java
 Mon Mar 14 18:01:54 2005
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.axis.builder;
 
+import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
@@ -37,7 +38,9 @@
     private final PortComponentHandlerType[] handlers;
     private final Port port;
 
-    public PortInfo(String portName, QName portQName, Definition definition, 
JavaWsdlMappingType javaWsdlMapping, String seiInterfaceName, 
PortComponentHandlerType[] handlers, Port port, 
ServiceEndpointInterfaceMappingType seiMapping) {
+    private final URL wsdlURL;
+
+    public PortInfo(String portName, QName portQName, Definition definition, 
JavaWsdlMappingType javaWsdlMapping, String seiInterfaceName, 
PortComponentHandlerType[] handlers, Port port, 
ServiceEndpointInterfaceMappingType seiMapping, URL wsdlURL) {
         this.portName = portName;
         this.portQName = portQName;
         this.definition = definition;
@@ -46,6 +49,11 @@
         this.handlers = handlers;
         this.port = port;
         this.seiMapping = seiMapping;
+        this.wsdlURL = wsdlURL;
+    }
+
+    public URL getWsdlURL() {
+        return wsdlURL;
     }
 
     public String getPortName() {

Modified: 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java?view=diff&r1=157490&r2=157491
==============================================================================
--- 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
 (original)
+++ 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
 Mon Mar 14 18:01:54 2005
@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.*;
 import java.util.jar.JarFile;
 import java.lang.reflect.Method;
@@ -72,6 +73,7 @@
 import org.apache.geronimo.xbeans.j2ee.WebserviceDescriptionType;
 import org.apache.geronimo.xbeans.j2ee.WebservicesDocument;
 import org.apache.geronimo.xbeans.j2ee.WebservicesType;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.SchemaTypeSystem;
 import org.apache.xmlbeans.XmlBeans;
@@ -191,7 +193,14 @@
 
                 ServiceEndpointInterfaceMappingType seiMapping = 
(ServiceEndpointInterfaceMappingType)seiMappings.get(seiInterfaceName);
 
-                PortInfo portInfo = new PortInfo(portComponentName, portQName, 
definition, javaWsdlMapping, seiInterfaceName, handlers, port, seiMapping);
+                URL wsdlURL = null;
+                try {
+                    wsdlURL = DeploymentUtil.createJarURL(moduleFile, 
webserviceDescription.getWsdlFile().getStringValue().trim());
+                } catch (MalformedURLException e) {
+                    throw new DeploymentException("Invalid WSDL URL: 
"+webserviceDescription.getWsdlFile().getStringValue().trim(), e);
+                }
+
+                PortInfo portInfo = new PortInfo(portComponentName, portQName, 
definition, javaWsdlMapping, seiInterfaceName, handlers, port, seiMapping, 
wsdlURL);
 
                 if (portMap.put(linkName, portInfo) != null) {
                     throw new DeploymentException("Ambiguous description of 
port associated with j2ee component " + linkName);