diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-17 13:55:03 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-17 13:55:03 +0000 |
commit | fa1fc36d0706759915fe770e17f6682c71b22fc0 (patch) | |
tree | aa927d226b3af97fa6a235ee6bfde20bbd3f5f65 /sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java | |
parent | 8e27ce1f6c338862338651532538e5f95754ac0c (diff) |
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
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java')
4 files changed, 6 insertions, 6 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 97f1a8b0b2..08c140c74c 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 @@ -230,7 +230,7 @@ public class Axis2EngineIntegration { Port port, WebServiceBinding wsBinding) throws AxisFault { - Definition definition = wsBinding.getWSDLDocument(); + Definition definition = wsBinding.getGeneratedWSDLDocument(); QName serviceQName = wsBinding.getService().getQName(); Definition def = getDefinition(definition, serviceQName); 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 4db3522e53..6db39d6a7e 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 @@ -154,7 +154,7 @@ public class Axis2ReferenceBindingInvoker implements Invoker { PortType portType = ((WSDLInterface)wsBinding.getBindingInterfaceContract().getInterface()).getPortType(); Operation op = portType.getOperation(wsdlOperationName.getLocalPart(), null, null); action = - WSDL11ActionHelper.getActionFromInputElement(wsBinding.getWSDLDocument(), portType, op, op + WSDL11ActionHelper.getActionFromInputElement(wsBinding.getGeneratedWSDLDocument(), portType, op, op .getInput()); } diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java index f427154c92..27b90b0251 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java @@ -96,7 +96,7 @@ public class Axis2ReferenceBindingProvider extends Axis2BaseBindingProvider impl this.reference = (RuntimeComponentReference)endpointReference.getReference(); // A WSDL document should always be present in the binding - if (wsBinding.getWSDLDocument() == null) { + if (wsBinding.getGeneratedWSDLDocument() == null) { throw new ServiceRuntimeException("No WSDL document for " + component.getName() + "/" + reference.getName()); } @@ -128,7 +128,7 @@ public class Axis2ReferenceBindingProvider extends Axis2BaseBindingProvider impl configContext = Axis2EngineIntegration.getAxisConfigurationContext(extensionPoints.getServiceDiscovery()); try { - Definition definition = wsBinding.getWSDLDocument(); + Definition definition = wsBinding.getGeneratedWSDLDocument(); QName serviceQName = wsBinding.getService().getQName(); Port port = wsBinding.getPort(); if (port == 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/Axis2ServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java index ec6c610d76..925ecbc8f7 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java @@ -89,7 +89,7 @@ public class Axis2ServiceBindingProvider extends Axis2BaseBindingProvider implem this.service = (RuntimeComponentService)endpoint.getService(); // A WSDL document should always be present in the binding - if (wsBinding.getWSDLDocument() == null) { + if (wsBinding.getGeneratedWSDLDocument() == null) { throw new ServiceRuntimeException("No WSDL document for " + component.getName() + "/" + service.getName()); } @@ -273,7 +273,7 @@ public class Axis2ServiceBindingProvider extends Axis2BaseBindingProvider implem private void createAxisService(String endpointURL, Port port) throws AxisFault { AxisService axisService; - if (wsBinding.getWSDLDocument() != null) { + if (wsBinding.getGeneratedWSDLDocument() != null) { axisService = Axis2EngineIntegration.createWSDLAxisService(endpointURL, port, wsBinding); } else { axisService = Axis2EngineIntegration.createJavaAxisService(endpointURL, configContext, service); |