1 files changed, 13 insertions, 9 deletions
diff --git a/sca-java-2.x/contrib/modules/binding-ws-runtime-jaxws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/axis2/JAXWSServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-ws-runtime-jaxws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/axis2/JAXWSServiceBindingProvider.java
index e5f297c9fc..2aa2cc5db2 100644
--- a/sca-java-2.x/contrib/modules/binding-ws-runtime-jaxws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/axis2/JAXWSServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-runtime-jaxws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/axis2/JAXWSServiceBindingProvider.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.ws.jaxws.axis2;
 
+import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 
@@ -37,7 +38,6 @@ import org.apache.axis2.jaxws.description.builder.WebServiceProviderAnnot;
 import org.apache.axis2.jaxws.description.builder.converter.JavaClassToDBCConverter;
 import org.apache.axis2.jaxws.description.impl.DescriptionFactoryImpl;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.jaxws.JAXWSBindingProvider;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -141,16 +141,19 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
             defaultPort = ps.getProperties().getProperty(this.getClass().getName() + ".defaultPort");
         }
         // ========
-        
+/*        
         jaxwsBindingProvider = new JAXWSBindingProvider(endpoint, 
                                                         servletHost,
                                                         modelFactories,
                                                         dataBindings,
                                                         defaultPort);
-        
+*/                                                        
+        jaxwsBindingProvider = new JAXWSBindingProvider();
+                
         // get the Axis configuration context
         configContext = Axis2EngineIntegration.getAxisConfigurationContext(extensionPoints.getServiceDiscovery());
-        configContext.setContextRoot(servletHost.getContextPath());
+        //configContext.setContextRoot(servletHost.getContextPath());
+        configContext.setContextRoot("http://localhost:8085");
     }
     
     public void start() {
@@ -176,7 +179,7 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
             // adjust the service description to match the service we're actually exposing
             DescriptionBuilderComposite dbc = dbcMap.values().iterator().next();
             dbc.setWebServiceProviderAnnot(webServiceProviderAnnot);
-            dbc.setWsdlDefinition(wsBinding.getWSDLDefinition().getDefinition());
+            dbc.setWsdlDefinition(wsBinding.getService().getQName(), wsBinding.getWSDLDefinition().getDefinition());
             List<ServiceDescription> serviceDescList = DescriptionFactoryImpl.createServiceDescriptionFromDBCMap(dbcMap, configContext);
             ServiceDescription sd = null;
             if (serviceDescList != null && serviceDescList.size() > 0) {
@@ -185,13 +188,14 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
             
             // get the first endpoint
             EndpointDescription endpointDesc = sd.getEndpointDescriptions_AsCollection().iterator().next();           
-            //Binding binding = BindingUtils.createBinding(endpointDesc);
+            Binding binding = BindingUtils.createBinding(endpointDesc);
             
             // Add the service into the configuration context
             AxisService axisService = endpointDesc.getAxisService();
-            axisService.setName(endpointURI);
+            String path = URI.create(endpointURI).getPath();
+            axisService.setName(path);
             axisService.setServiceDescription("Tuscany configured AxisService for service: " + deployedURI);
-            axisService.setClientSide(false);            
+            axisService.setClientSide(false);  
             configContext.getAxisConfiguration().addService(axisService);
             
             // fire up the Axis servlet
@@ -271,7 +275,7 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider {
 */
 
     public void stop() {
-        jaxwsBindingProvider.stop();
+        //jaxwsBindingProvider.stop();
         wsEndpoint.stop();
     }