svn commit: r1243103 - in /tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws: WebServiceBinding.java impl/WebServiceBindingImpl.java xml/WebServiceBindingProcessor.java

[slaws]

Author: slaws
Date: Sat Feb 11 17:09:09 2012
New Revision: 1243103

URL: http://svn.apache.org/viewvc?rev=1243103&view=rev
Log:
TUSCANY-4013 - store the user specified binding uri so it doesn't get 
overwritten by the BindingURIBuilder. Needs reworking when we fix TUSCANY-4014

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
    
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
    
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java?rev=1243103&r1=1243102&r2=1243103&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
 Sat Feb 11 17:09:09 2012
@@ -276,4 +276,18 @@ public interface WebServiceBinding exten
      * 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);
 }  

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java?rev=1243103&r1=1243102&r2=1243103&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
 Sat Feb 11 17:09:09 2012
@@ -86,6 +86,7 @@ class WebServiceBindingImpl implements W
     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 W
     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 W
     public void setURI(String uri) {
         this.uri = uri;
     }
+    
+    public void setUserSpecifiedURI(String uri) {
+        this.userSpecifiedUri = uri;
+    }    
 
     public boolean isUnresolved() {
         return unresolved;

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=1243103&r1=1243102&r2=1243103&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
 Sat Feb 11 17:09:09 2012
@@ -178,6 +178,7 @@ public class WebServiceBindingProcessor 
         String uri = getURIString(reader, URI);
         if (uri != null) {
             wsBinding.setURI(uri);
+            wsBinding.setUserSpecifiedURI(uri);
             
             // BWS20001
             if (context.getParentModel() instanceof Reference){