From 9398b3a75f2bde364e96f748255a3e933e250474 Mon Sep 17 00:00:00 2001 From: bdaniel Date: Mon, 18 Oct 2010 19:04:02 +0000 Subject: TUSCANY-3711 Enable correct wsdl service name mapping and fix issue in JAXWSServiceBindingProvider that was causing ?wsdl to fail git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1023951 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache') 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 4ade60d55b..5308b3c0e7 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 @@ -273,15 +273,13 @@ public class WSDLDefinitionGenerator { } protected void configureService(Definition definition, Service service, PortType portType, String serviceName) throws WSDLException { - // TODO -- this is the recommended mapping in the ws binding spec, but for some reason it is causing ?wsdl to not be available - // in binding-ws-runtime-jaxws-ri WSDLPortTestCase.testQuestionMarkWSDL(). -// if ( serviceName != null ) { -// QName name = new QName(definition.getTargetNamespace(), serviceName); -// if ( definition.getService(name) == null ) { -// service.setQName(name); -// return; -// } -// } + if ( serviceName != null ) { + QName name = new QName(definition.getTargetNamespace(), serviceName); + if ( definition.getService(name) == null ) { + service.setQName(name); + return; + } + } QName portTypeName = portType.getQName(); if (portTypeName != null) { -- cgit v1.2.3