diff options
Diffstat (limited to 'branches/sca-java-1.3.2/modules/binding-ws-wsdlgen')
3 files changed, 11 insertions, 11 deletions
diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java index d94ed30c34..de1cab15d8 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java @@ -61,7 +61,7 @@ import org.apache.tuscany.sca.xsd.XSDFactory; */ public class BindingWSDLGenerator { private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName()); - private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "soap.1_2"); + private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "SOAP.1_2"); public static boolean printWSDL; // external code sets this to print generated WSDL diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index 1047331924..b8f5b356dd 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -215,9 +215,9 @@ public class Interface2WSDLGenerator { QName name = getQName(iface); Definition definition = factory.newDefinition(); if (requiresSOAP12) { - definition.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + definition.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } else { - definition.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); + definition.addNamespace("SOAP", "http://schemas.xmlsoap.org/wsdl/soap/"); } definition.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/"); definition.addNamespace("xs", SCHEMA_NS); diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java index d2e2e9eb34..ebfbdc509a 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java @@ -280,9 +280,9 @@ public class WSDLServiceGenerator { if (wsBinding.getBinding() == null && ports.size() == 0) { Binding binding = helper.createBinding(def, portType); if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) { - def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } else { - def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); } helper.createBindingOperations(def, binding, portType); binding.setUndefined(false); @@ -310,9 +310,9 @@ public class WSDLServiceGenerator { String endpointURI = computeActualURI(wsBinding, null); Port port = helper.createPort(def, wsBinding.getBinding(), service, endpointURI); if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) { - def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } else { - def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); } wsBinding.setPort(port); } @@ -349,10 +349,10 @@ public class WSDLServiceGenerator { List bindingExtensions = binding.getExtensibilityElements(); for (final Object extension : bindingExtensions) { if (extension instanceof SOAPBinding) { - newDef.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + newDef.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); } if (extension instanceof SOAP12Binding) { - newDef.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + newDef.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } } } @@ -412,7 +412,7 @@ public class WSDLServiceGenerator { for (final Object extension : portExtensions) { ExtensibilityElement newExt = null; if (extension instanceof SOAPAddress) { - def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); try { newExt = def.getExtensionRegistry().createExtension( Port.class, WSDLDefinitionGenerator.SOAP_ADDRESS); @@ -422,7 +422,7 @@ public class WSDLServiceGenerator { ((SOAPAddress)newExt).setLocationURI(uri); newPort.addExtensibilityElement(newExt); } else if (extension instanceof SOAP12Address) { - def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); try { newExt = def.getExtensionRegistry().createExtension( Port.class, WSDLDefinitionGenerator.SOAP12_ADDRESS); |