diff options
author | scottkurz <scottkurz@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-23 18:58:30 +0000 |
---|---|---|
committer | scottkurz <scottkurz@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-23 18:58:30 +0000 |
commit | f46dc97c15a4b8fd0a58a96a4f7080ae8648c0a8 (patch) | |
tree | 6967c9092b69456f3a9cdd899010fde51558c4a5 /sca-java-2.x/trunk/modules/binding-ws-wsdlgen | |
parent | db53a81138ed703d9be0cb32a0c23c8ea6e8c58e (diff) |
Fix for TUSCANY-3824. Thanks Greg.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1292896 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-ws-wsdlgen')
2 files changed, 9 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index 1824e27f98..c20ffd7c43 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -360,9 +360,10 @@ public class Interface2WSDLGenerator { javax.wsdl.Operation operation = generateOperation(definition, op, helpers, wrappers); portType.addOperation(operation); String action = ((JavaOperation)op).getAction(); - if ((action == null || "".equals(action)) && !op.isInputWrapperStyle() && op.getInputWrapper() == null) { - // Bare style - action = "urn:" + op.getName(); + // Removed improper defaulting of SOAP action when using doc/lit BARE. + // The correct default is "" (empty string). + if (action == null) { + action = ""; } BindingOperation bindingOp = definitionGenerator.createBindingOperation(definition, operation, action); binding.addBindingOperation(bindingOp); diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java index 5308b3c0e7..6edd4dc86a 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java +++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java @@ -161,8 +161,12 @@ public class WSDLDefinitionGenerator { try { for (Iterator oi = portType.getOperations().iterator(); oi.hasNext();) { Operation operation = (Operation)oi.next(); + // Removed improper defaulting of SOAP action. createBindingOperations() is called + // when binding.ws does not supply a WSDL binding and the reference is using interface.wsdl. + // In this case there is no source for a user-supplied action. + // The correct default is "" (empty string). BindingOperation bindingOperation = - createBindingOperation(definition, operation, "urn:" + operation.getName()); + createBindingOperation(definition, operation, ""); binding.addBindingOperation(bindingOperation); } } catch (WSDLException e) { |