More changes to fix binding.s otests. Also change binding.ws model getter/setter to make it more explicit which of the WSDLs it stores are user defined.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
index b8efc2dcdd..516ca62c11 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
@@ -81,7 +81,7 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
         //           sometimes getService().getQName returns a QName namespace that doesn't match the WSDL
         //           sometimes getNamespace() returns null
         //        So here we delve directly into the WSDL4J model as the Tuscany model isn't up to date
-        String targetNamespace = wsBinding.getWSDLDefinition().getDefinition().getTargetNamespace();
+        String targetNamespace = wsBinding.getUserSpecifiedWSDLDefinition().getDefinition().getTargetNamespace();
        
         //set up WSDL for Provider   
         List<Source> metadata = new ArrayList<Source>();
@@ -94,7 +94,7 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
         ByteArrayOutputStream outStream = new ByteArrayOutputStream();
         try {
             WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
-            writer.writeWSDL(wsBinding.getWSDLDefinition().getDefinition(), outStream);
+            writer.writeWSDL(wsBinding.getUserSpecifiedWSDLDefinition().getDefinition(), outStream);
         } catch (Exception ex){
             ex.printStackTrace();
         }