Fix TUSCANY-2446

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@672939 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 313 insertions, 349 deletions

diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index 024009095e..47359c3484 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
@@ -23,12 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;
@@ -45,33 +40,26 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService;
  */
 public class Axis2SCABindingProviderFactory implements BindingProviderFactory<DistributedSCABinding> {
     
-    private ModelFactoryExtensionPoint modelFactories;
-    private ServletHost servletHost;
+    private ExtensionPointRegistry extensionPoints;
     private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
-    private DataBindingExtensionPoint dataBindings;
 
     public Axis2SCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        servletHost = servletHosts.getServletHosts().get(0);
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        this.extensionPoints = extensionPoints;
         policyHandlerClassnames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames();
-        dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
     }    
 
     public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
                                                                    RuntimeComponentReference reference,
                                                                    DistributedSCABinding binding) {
         return new Axis2SCAReferenceBindingProvider(component, reference, binding,
-                                                    servletHost, modelFactories,
-                                                    policyHandlerClassnames, dataBindings);
+                                                    extensionPoints, policyHandlerClassnames);
     }
 
     public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
                                                                RuntimeComponentService service,
                                                                DistributedSCABinding binding) {
         return new Axis2SCAServiceBindingProvider(component, service, binding,
-                                                  servletHost, modelFactories,
-                                                  policyHandlerClassnames, dataBindings);
+                                                  extensionPoints, policyHandlerClassnames);
     }
 
     public Class<DistributedSCABinding> getModelType() {
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index ce8e19e618..93ad1d30e5 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
@@ -1,197 +1,186 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.binding.sca.axis2.impl;

-

-import java.net.URI;

-import java.util.List;

-import java.util.Map;

-import java.util.logging.Logger;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;

-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ResolverExtension;

-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;

-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;

-import org.apache.tuscany.sca.host.http.ServletHost;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;

-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;

-import org.apache.tuscany.sca.interfacedef.wsdl.java2wsdl.Java2WSDLHelper;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.MessageFactory;

-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-import org.apache.tuscany.sca.runtime.EndpointReference;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-import org.apache.tuscany.sca.xsd.XSDFactory;

-

-/**

- * The reference binding provider for the remote sca binding implementation. Relies on the 

- * binding-ws-axis implementation for sending messages to remote services to this provider

- * just uses the ws-axis provider. 

- * 

- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $

- */

-public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider {

-

-    private static final Logger logger = Logger.getLogger(Axis2SCAReferenceBindingProvider.class.getName());

-    

-    private RuntimeComponent component;

-    private RuntimeComponentReference reference;

-    private SCABinding binding;

-    private Axis2ReferenceBindingProvider axisReferenceBindingProvider;

-    private WebServiceBinding wsBinding;

-    

-    private EndpointReference serviceEPR = null;

-    private EndpointReference callbackEPR = null;

-

-    public Axis2SCAReferenceBindingProvider(RuntimeComponent component,

-                                            RuntimeComponentReference reference,

-                                            DistributedSCABinding binding,

-                                            ServletHost servletHost,

-                                            ModelFactoryExtensionPoint modelFactories,

-                                            Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames,

-                                            DataBindingExtensionPoint dataBindings) {

-

-        WSDLFactory wsdlFactory = modelFactories.getFactory(WSDLFactory.class);

-        XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class);

-

-        this.component = component;

-        this.reference = reference;

-        this.binding = binding.getSCABinding();

-        wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();

-       

-        // Turn the java interface contract into a WSDL interface contract

-        InterfaceContract contract = reference.getInterfaceContract();

-        if ((contract instanceof JavaInterfaceContract)) {

-            ModelResolver resolver = component instanceof ResolverExtension ?

-                                         ((ResolverExtension)component).getModelResolver() : null;

-            contract = Java2WSDLHelper.createWSDLInterfaceContract(

-                           (JavaInterfaceContract)contract, resolver, dataBindings, wsdlFactory, xsdFactory);

-        }

-        

-        // Set to use the Axiom data binding

-        contract.getInterface().resetDataBinding(OMElement.class.getName());

-        

-        wsBinding.setBindingInterfaceContract(contract);

-        wsBinding.setName(this.binding.getName());         

-               

-        axisReferenceBindingProvider = new Axis2ReferenceBindingProvider(component,

-                                                                         reference,

-                                                                         wsBinding,

-                                                                         servletHost,

-                                                                         modelFactories,

-                                                                         policyHandlerClassnames,

-                                                                         dataBindings);

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return wsBinding.getBindingInterfaceContract();

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-    public Invoker createInvoker(Operation operation) {

-        return new Axis2SCABindingInvoker(this, axisReferenceBindingProvider.createInvoker(operation));

-    }

-

-    /**

-     * Uses the distributed domain service discovery feature to locate remote

-     * service endpoints

-     * 

-     * @return An EPR for the target service that this reference refers to 

-     */

-    public EndpointReference getServiceEndpoint(){

-      

-        if (serviceEPR == null){

-            String endpointURL = null;

-            

-            if (binding.getURI() != null) {

-                // check if the binding URI is already resolved if it is use is if not 

-                try {

-                    URI uri = new URI(binding.getURI());

-                     if (uri.isAbsolute()) {

-                         endpointURL = binding.getURI();

-                     } 

-                } catch(Exception ex) {

-                    // do nothing

-                } 

-            }

-            

-            serviceEPR = new EndpointReferenceImpl(endpointURL);

-        }

-        

-        return serviceEPR;

-    }

-    

-    

-    /**

-     * Retrieves the URI of the callback service (that this reference has created)

-     * returns null if there is no callback service for the sca binding

-     * 

-     * @return the callback endpoint

-     */

-    public EndpointReference getCallbackEndpoint(){

-        if (callbackEPR == null) {

-            if (reference.getCallbackService() != null) {

-                for (Binding callbackBinding : reference.getCallbackService().getBindings()) {

-                    if (callbackBinding instanceof SCABinding) {

-                        callbackEPR = new EndpointReferenceImpl(reference.getName() + "/" + callbackBinding.getName());

-                        continue;

-                    }

-                }

-            }    

-        }

-        return callbackEPR;

-    }

-    

-    

-    public SCABinding getSCABinding () {

-        return binding;

-    }

-    

-    public RuntimeComponent getComponent () {

-        return component;

-    }

-    

-    public RuntimeComponentReference getComponentReference () {

-        return reference;

-    }    

-

-    public void start() {

-        axisReferenceBindingProvider.start();

-    }

-

-    public void stop() {

-        axisReferenceBindingProvider.stop();

-    }

-

-}

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.sca.axis2.impl;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider;
+import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
+import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.EndpointReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+/**
+ * The reference binding provider for the remote sca binding implementation. Relies on the 
+ * binding-ws-axis implementation for sending messages to remote services to this provider
+ * just uses the ws-axis provider. 
+ * 
+ * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
+ */
+public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider {
+
+    private static final Logger logger = Logger.getLogger(Axis2SCAReferenceBindingProvider.class.getName());
+    
+    private RuntimeComponent component;
+    private RuntimeComponentReference reference;
+    private SCABinding binding;
+    private Axis2ReferenceBindingProvider axisReferenceBindingProvider;
+    private WebServiceBinding wsBinding;
+    
+    private EndpointReference serviceEPR = null;
+    private EndpointReference callbackEPR = null;
+
+    public Axis2SCAReferenceBindingProvider(RuntimeComponent component,
+                                            RuntimeComponentReference reference,
+                                            DistributedSCABinding binding,
+                                            ExtensionPointRegistry extensionPoints,
+                                            Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
+
+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+        ServletHost servletHost = servletHosts.getServletHosts().get(0);
+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
+
+        this.component = component;
+        this.reference = reference;
+        this.binding = binding.getSCABinding();
+        wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();
+        wsBinding.setName(this.binding.getName());         
+       
+        // Turn the java interface contract into a WSDL interface contract
+        BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, extensionPoints, null);
+        
+        // Set to use the Axiom data binding
+        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
+        contract.getInterface().resetDataBinding(OMElement.class.getName());
+        
+        axisReferenceBindingProvider = new Axis2ReferenceBindingProvider(component,
+                                                                         reference,
+                                                                         wsBinding,
+                                                                         servletHost,
+                                                                         modelFactories,
+                                                                         policyHandlerClassnames,
+                                                                         dataBindings);
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return wsBinding.getBindingInterfaceContract();
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public Invoker createInvoker(Operation operation) {
+        return new Axis2SCABindingInvoker(this, axisReferenceBindingProvider.createInvoker(operation));
+    }
+
+    /**
+     * Uses the distributed domain service discovery feature to locate remote
+     * service endpoints
+     * 
+     * @return An EPR for the target service that this reference refers to 
+     */
+    public EndpointReference getServiceEndpoint(){
+      
+        if (serviceEPR == null){
+            String endpointURL = null;
+            
+            if (binding.getURI() != null) {
+                // check if the binding URI is already resolved if it is use is if not 
+                try {
+                    URI uri = new URI(binding.getURI());
+                     if (uri.isAbsolute()) {
+                         endpointURL = binding.getURI();
+                     } 
+                } catch(Exception ex) {
+                    // do nothing
+                } 
+            }
+            
+            serviceEPR = new EndpointReferenceImpl(endpointURL);
+        }
+        
+        return serviceEPR;
+    }
+    
+    
+    /**
+     * Retrieves the URI of the callback service (that this reference has created)
+     * returns null if there is no callback service for the sca binding
+     * 
+     * @return the callback endpoint
+     */
+    public EndpointReference getCallbackEndpoint(){
+        if (callbackEPR == null) {
+            if (reference.getCallbackService() != null) {
+                for (Binding callbackBinding : reference.getCallbackService().getBindings()) {
+                    if (callbackBinding instanceof SCABinding) {
+                        callbackEPR = new EndpointReferenceImpl(reference.getName() + "/" + callbackBinding.getName());
+                        continue;
+                    }
+                }
+            }    
+        }
+        return callbackEPR;
+    }
+    
+    
+    public SCABinding getSCABinding () {
+        return binding;
+    }
+    
+    public RuntimeComponent getComponent () {
+        return component;
+    }
+    
+    public RuntimeComponentReference getComponentReference () {
+        return reference;
+    }    
+
+    public void start() {
+        axisReferenceBindingProvider.start();
+    }
+
+    public void stop() {
+        axisReferenceBindingProvider.stop();
+    }
+
+}
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index 14f209d245..0ecbf60395 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
@@ -1,136 +1,123 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.binding.sca.axis2.impl;

-

-import java.util.List;

-import java.util.Map;

-import java.util.logging.Logger;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;

-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ResolverExtension;

-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;

-import org.apache.tuscany.sca.host.http.ServletHost;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;

-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;

-import org.apache.tuscany.sca.interfacedef.wsdl.java2wsdl.Java2WSDLHelper;

-import org.apache.tuscany.sca.invocation.MessageFactory;

-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-import org.apache.tuscany.sca.xsd.XSDFactory;

-

-/**

- * The service binding provider for the remote sca binding implementation. Relies on the 

- * binding-ws-axis implementation for providing a remote message endpoint for this service

- * 

- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $

- */

-public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider {

-    

-    private static final Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());

-

-    private SCABinding binding;

-    private Axis2ServiceProvider axisProvider;

-    private WebServiceBinding wsBinding;

-    

-    private boolean started = false;

-

-

-    public Axis2SCAServiceBindingProvider(RuntimeComponent component,

-                                          RuntimeComponentService service,

-                                          DistributedSCABinding binding,

-                                          ServletHost servletHost,

-                                          ModelFactoryExtensionPoint modelFactories,

-                                          Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames,

-                                          DataBindingExtensionPoint dataBindings) {

-

-        MessageFactory messageFactory = modelFactories.getFactory(MessageFactory.class); 

-        WSDLFactory wsdlFactory = modelFactories.getFactory(WSDLFactory.class);

-        XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class);

-

-        this.binding = binding.getSCABinding();

-        wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();

-        

-        // Turn the java interface contract into a WSDL interface contract

-        InterfaceContract contract = service.getInterfaceContract();

-        if ((contract instanceof JavaInterfaceContract)) {

-            ModelResolver resolver = component instanceof ResolverExtension ?

-                                         ((ResolverExtension)component).getModelResolver() : null;

-            contract = Java2WSDLHelper.createWSDLInterfaceContract(

-                           (JavaInterfaceContract)contract, resolver, dataBindings, wsdlFactory, xsdFactory);

-        }

-        

-        // Set to use the Axiom data binding

-        contract.getInterface().resetDataBinding(OMElement.class.getName());

-        

-        wsBinding.setBindingInterfaceContract(contract);

-        wsBinding.setName(this.binding.getName()); 

-        wsBinding.setURI(this.binding.getURI());

-        

-        axisProvider = new Axis2SCAServiceProvider(component, 

-                                                   service, 

-                                                   this.binding,

-                                                   wsBinding,

-                                                   servletHost,

-                                                   messageFactory,

-                                                   policyHandlerClassnames);

-        

-        this.binding.setURI(wsBinding.getURI());      

-

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return wsBinding.getBindingInterfaceContract();

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-    public void start() {

-        if (started) {

-            return;

-        } else {

-            started = true;

-        }

-        

-        axisProvider.start();

-    }

-

-    public void stop() {

-        if (!started) {

-            return;

-        } else {

-            started = false;

-        }

-        

-        axisProvider.stop();

-    }

-

-}

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.sca.axis2.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
+import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;
+import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+/**
+ * The service binding provider for the remote sca binding implementation. Relies on the 
+ * binding-ws-axis implementation for providing a remote message endpoint for this service
+ * 
+ * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
+ */
+public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider {
+    
+    private static final Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
+
+    private SCABinding binding;
+    private Axis2ServiceProvider axisProvider;
+    private WebServiceBinding wsBinding;
+    
+    private boolean started = false;
+
+
+    public Axis2SCAServiceBindingProvider(RuntimeComponent component,
+                                          RuntimeComponentService service,
+                                          DistributedSCABinding binding,
+                                          ExtensionPointRegistry extensionPoints,
+                                          Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
+
+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+        ServletHost servletHost = servletHosts.getServletHosts().get(0);
+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        MessageFactory messageFactory = modelFactories.getFactory(MessageFactory.class); 
+        DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
+
+        this.binding = binding.getSCABinding();
+        wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();
+        wsBinding.setName(this.binding.getName());         
+        wsBinding.setURI(this.binding.getURI());
+       
+        // Turn the java interface contract into a WSDL interface contract
+        BindingWSDLGenerator.generateWSDL(component, service, wsBinding, extensionPoints, null);
+
+        // Set to use the Axiom data binding
+        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
+        contract.getInterface().resetDataBinding(OMElement.class.getName());
+        
+        axisProvider = new Axis2SCAServiceProvider(component, 
+                                                   service, 
+                                                   this.binding,
+                                                   wsBinding,
+                                                   servletHost,
+                                                   messageFactory,
+                                                   policyHandlerClassnames);
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return wsBinding.getBindingInterfaceContract();
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public void start() {
+        if (started) {
+            return;
+        } else {
+            started = true;
+        }
+        
+        axisProvider.start();
+    }
+
+    public void stop() {
+        if (!started) {
+            return;
+        } else {
+            started = false;
+        }
+        
+        axisProvider.stop();
+    }
+
+}