diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-07-02 15:12:28 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-07-02 15:12:28 +0000 |
| commit | fccdd6a87c4e9961153eb52e9b2b9f614ebb9724 (patch) | |
| tree | a8a4640744c6babc2f54751ecd4e561c9b7b73c6 /sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src | |
| parent | 8a38be79d254e187d4313fe68692551b2f735e10 (diff) | |
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
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java index 08c140c74c..a8d35c3381 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java @@ -278,7 +278,7 @@ public class Axis2EngineIntegration { } // Add schema information to the AxisService (needed for "?xsd=" support) - addSchemas(wsBinding.getWSDLDefinition(), axisService); + addSchemas(wsBinding.getUserSpecifiedWSDLDefinition(), axisService); // Use the existing WSDL Parameter wsdlParam = new Parameter("wsdl4jDefinition", null); diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java index 4d71e97568..1532aa6a65 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java @@ -162,7 +162,7 @@ public class Axis2ReferenceBindingInvoker implements Invoker { } if (wrapperNamespace == null){ - wrapperNamespace = wsBinding.getWSDLDefinition().getNamespace(); + wrapperNamespace = wsBinding.getUserSpecifiedWSDLDefinition().getNamespace(); } QName operationQName = new QName(wrapperNamespace, diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java index a09d18c1dd..59645ef679 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java @@ -203,7 +203,7 @@ public class TuscanyServiceProvider { }
if (wrapperNamespace == null){
- wrapperNamespace = wsBinding.getWSDLDefinition().getNamespace();
+ wrapperNamespace = wsBinding.getUserSpecifiedWSDLDefinition().getNamespace();
}
QName operationResponseQName = new QName(wrapperNamespace,
|