TUSCANY-4013 - store the user specified binding uri so it doesn't get overwritten by the BindingURIBuilder. Needs reworking when we fix TUSCANY-4014

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

3 files changed, 24 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index b6bcb38645..79c2a5c40c 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
@@ -276,4 +276,18 @@ public interface WebServiceBinding extends Binding {
      * to use a JMS transport
      */
     boolean isJMSTransport();
+    
+    /**
+     * Returns the user specified binding name.
+     *
+     * @return the binding uri
+     */
+    String getUserSpecifiedURI();
+
+    /**
+     * Sets the user specified binding uri.
+     *
+     * @param name the binding uri
+     */
+    void setUserSpecifiedURI(String uri);
 }  
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index dd931476ff..efb3b0fb54 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
@@ -86,6 +86,7 @@ class WebServiceBindingImpl implements WebServiceBinding, DefaultingPolicySubjec
     private boolean isLiteralEncoding;
     private boolean isMessageWrapped;
     private Map<String, String> wsdliLocations = new HashMap<String, String>();
+    private String userSpecifiedUri;
 
     protected WebServiceBindingImpl() {
     }
@@ -104,6 +105,10 @@ class WebServiceBindingImpl implements WebServiceBinding, DefaultingPolicySubjec
     public String getURI() {
         return uri;
     }
+    
+    public String getUserSpecifiedURI() {
+        return userSpecifiedUri;
+    }
 
     public void setName(String name) {
         this.name = name;
@@ -112,6 +117,10 @@ class WebServiceBindingImpl implements WebServiceBinding, DefaultingPolicySubjec
     public void setURI(String uri) {
         this.uri = uri;
     }
+    
+    public void setUserSpecifiedURI(String uri) {
+        this.userSpecifiedUri = uri;
+    }    
 
     public boolean isUnresolved() {
         return unresolved;
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 052a1ced74..bed8b9411f 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
@@ -178,6 +178,7 @@ public class WebServiceBindingProcessor extends BaseStAXArtifactProcessor implem
         String uri = getURIString(reader, URI);
         if (uri != null) {
             wsBinding.setURI(uri);
+            wsBinding.setUserSpecifiedURI(uri);
             
             // BWS20001
             if (context.getParentModel() instanceof Reference){