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

2 files changed, 13 insertions, 12 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
index 516ca62c11..86f5214b71 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
@@ -113,16 +113,19 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
         properties.put(Endpoint.WSDL_PORT, portName);
                       
         QName serviceName = new QName(targetNamespace,
-                                      wsBinding.getService().getQName().getLocalPart());
+                                      wsBinding.getServiceName().getLocalPart()); 
         properties.put(Endpoint.WSDL_SERVICE, serviceName);
-        
+
         wsEndpoint.setMetadata(metadata);
         wsEndpoint.setProperties(properties);               
        
         // Start up the endpoint
+   
         wsEndpoint.publish(wsBinding.getURI());
-        
+     
+       
         jaxwsBindingProvider.start();        
+       
     }
 
     public void stop() {
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) {