Add a flag to the binding builder to indicate that generated data should be regenerated. Also rename the methods for getting/setting the generated data to make it more obvious that that's what it's doing.

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

2 files changed, 4 insertions, 12 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 7288ece1b5..c8ae5827a1 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
@@ -205,7 +205,7 @@ public interface WebServiceBinding extends Binding {
      * Returns the generated WSDL definitions document.
      * @return the generated WSDL definitions document
      */
-    Definition getWSDLDocument();
+    Definition getGeneratedWSDLDocument();
 
     /**
      * Sets the generated WSDL definitions document. The WSDL is generated
@@ -213,14 +213,6 @@ public interface WebServiceBinding extends Binding {
      * 
      * @param definition the generated WSDL definitions document
      */
-    void setWSDLDocument(Definition definition);
-    
-    
-    // TODO - There are a wealth of oddly named methods in this binding 
-    //        We have an opportunity with the JAXWS version of the WS binding
-    //        to re-think how the information here should be present so am 
-    //        going to start adding/moving methods to below this point that 
-    //        (hopefully) give a better idea of where the information is
-    //        derived from. 
+    void setGeneratedWSDLDocument(Definition definition);
 
 }
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 05e14155c1..9fc60c2224 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
@@ -287,11 +287,11 @@ class WebServiceBindingImpl implements WebServiceBinding, PolicySubject, Extensi
         this.endPointReference = epr;
     }
 
-    public Definition getWSDLDocument() {
+    public Definition getGeneratedWSDLDocument() {
         return generatedWSDLDocument;
     }
 
-    public void setWSDLDocument(Definition definition) {
+    public void setGeneratedWSDLDocument(Definition definition) {
         this.generatedWSDLDocument = definition;
     }