diff options
Diffstat (limited to '')
2 files changed, 13 insertions, 3 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 { diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java index 114dd45f8c..eff1e9f083 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java @@ -316,7 +316,11 @@ public class BindingURIBuilderImpl implements CompositeBuilder { } } else { if (bindingURI != null) { - uriString = basedURI(baseURI, componentURI.resolve(bindingURI)).toString(); + if (bindingURI.toString().startsWith("/")) { + uriString = basedURI(baseURI, componentURI.resolve(bindingURI)).toString(); + } else { + uriString = basedURI(baseURI, componentURI.resolve(name + "/" + bindingURI)).toString(); + } } else { uriString = basedURI(baseURI, componentURI.resolve(name)).toString(); } |