TUSCANY-3993 - Update code to handle relative URIs and add a test case

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1212386 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index c6f1db4a3e..e131ea83b0 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
@@ -411,7 +411,10 @@ public class WSDLServiceGenerator {
                              Port.class, WSDLDefinitionGenerator.SOAP_ADDRESS);
                 } catch (WSDLException e) {
                 }
-                String uri = computeActualURI(wsBinding, port);
+                // By this stage the URI should have been copied from the WSDL port and
+                // should have run through the binding URI builder. 
+                //String uri = computeActualURI(wsBinding, port);
+                String uri = wsBinding.getURI();
                 ((SOAPAddress)newExt).setLocationURI(uri);
                 newPort.addExtensibilityElement(newExt);
             } else if (extension instanceof SOAP12Address) {
@@ -421,7 +424,10 @@ public class WSDLServiceGenerator {
                              Port.class, WSDLDefinitionGenerator.SOAP12_ADDRESS);
                 } catch (WSDLException e) {
                 }
-                String uri = computeActualURI(wsBinding, port);
+                // By this stage the URI should have been copied from the WSDL port and
+                // should have run through the binding URI builder. 
+                //String uri = computeActualURI(wsBinding, port);
+                String uri = wsBinding.getURI();
                 ((SOAP12Address)newExt).setLocationURI(uri);
                 newPort.addExtensibilityElement(newExt);
             } else {