svn commit: r171376 - /geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java /geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java

[dj...@apache.org]

Author: djencks
Date: Sun May 22 15:27:13 2005
New Revision: 171376

URL: http://svn.apache.org/viewcvs?rev=171376&view=rev
Log:
Cleanup related to GERONIMO-651, allow ejb ws to specify their address in the openejb plan

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

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java?rev=171376&r1=171375&r2=171376&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java Sun May 22 15:27:13 2005
@@ -282,6 +282,9 @@
 
             //find the service we are working with
             javax.wsdl.Service service = getService(serviceQName, schemaInfoBuilder.getDefinition());
+            if (serviceQName == null) {
+                serviceQName = service.getQName();
+            }
 
             Map wsdlPortMap = service.getPorts();
             for (Iterator iterator = wsdlPortMap.entrySet().iterator(); iterator.hasNext();) {

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?rev=171376&r1=171375&r2=171376&view=diff
==============================================================================
--- 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 Sun May 22 15:27:13 2005
@@ -93,19 +93,6 @@
         return createServiceInfo(portInfo, classLoader);
     }
 
-    private static JavaServiceDesc createEJBServiceDesc(JarFile jarFile, String ejbName, ClassLoader classLoader) throws DeploymentException {
-        Map portComponentsMap = null;
-        try {
-            URL webservicesURL = DeploymentUtil.createJarURL(jarFile, "META-INF/webservices.xml");
-            portComponentsMap = WSDescriptorParser.parseWebServiceDescriptor(webservicesURL, jarFile, true);
-        } catch (MalformedURLException e1) {
-            throw new DeploymentException("Invalid URL to webservices.xml", e1);
-        }
-
-        // Grab the portInfo for this ejb
-        PortInfo portInfo = (PortInfo) portComponentsMap.get(ejbName);
-        return createServiceDesc(portInfo, classLoader);
-    }
 
     public static ServiceInfo createServiceInfo(PortInfo portInfo, ClassLoader classLoader) throws DeploymentException {
         JavaServiceDesc serviceDesc = createServiceDesc(portInfo, classLoader);
@@ -134,8 +121,8 @@
 
         JavaServiceDesc serviceDesc = new JavaServiceDesc();
 
-        URL location = getAddressLocation(port);
-        serviceDesc.setEndpointURL(location.toExternalForm());
+        String location = getAddressLocation(port);
+        serviceDesc.setEndpointURL(location);
         serviceDesc.setWSDLFile(portInfo.getWsdlLocation());
         Binding binding = port.getBinding();
 
@@ -231,16 +218,16 @@
         return portStyle;
     }
 
-    private static URL getAddressLocation(Port port) throws DeploymentException {
+    private static String getAddressLocation(Port port) throws DeploymentException {
         SOAPAddress soapAddress = (SOAPAddress) SchemaInfoBuilder.getExtensibilityElement(SOAPAddress.class, port.getExtensibilityElements());
         String locationURIString = soapAddress.getLocationURI();
-        URL location = null;
-        try {
-            location = new URL(locationURIString);
-        } catch (MalformedURLException e) {
-            throw new DeploymentException("Could not construct web service location URL from " + locationURIString);
-        }
-        return location;
+//        URL location = null;
+//        try {
+//            location = new URL(locationURIString);
+//        } catch (MalformedURLException e) {
+//            throw new DeploymentException("Could not construct web service location URL from " + locationURIString);
+//        }
+        return locationURIString;
     }
 
     private static Map rewriteWsdlMap(PortInfo portInfo, Map rawWsdlMap) throws DeploymentException {