Add the ability to map binding.sca to any bindings in the runtime by configuration

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

6 files changed, 475 insertions, 176 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
new file mode 100644
index 0000000000..14c8fae369
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
@@ -0,0 +1,217 @@
+/*
+ * 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.provider;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.assembly.Base;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.builder.BindingBuilder;
+import org.apache.tuscany.sca.assembly.builder.BuilderContext;
+import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint;
+import org.apache.tuscany.sca.common.xml.stax.StAXHelper;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser;
+import org.apache.tuscany.sca.policy.PolicySubject;
+import org.apache.tuscany.sca.provider.ProviderFactory;
+import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
+import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
+import org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
+import org.oasisopen.sca.ServiceRuntimeException;
+
+/**
+ * Default implementation of SCABindingMapper
+ */
+public class DefaultSCABindingMapper implements SCABindingMapper {
+    private final static Logger logger = Logger.getLogger(DefaultSCABindingMapper.class.getName());
+    protected ExtensionPointRegistry registry;
+    protected ProviderFactoryExtensionPoint providerFactories;
+    protected StAXArtifactProcessor processor;
+    protected BindingBuilder builder;
+    protected QName mappedBinding;
+    private Binding bindingTemplate;
+    private boolean remotable;
+
+    public DefaultSCABindingMapper(ExtensionPointRegistry registry, Map<String, String> attributes) {
+        this.registry = registry;
+        providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
+        BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class);
+        StAXArtifactProcessorExtensionPoint processors =
+            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+        if (attributes != null) {
+            String qname = attributes.get("mappedBinding");
+            if (qname != null) {
+                mappedBinding = ServiceDeclarationParser.getQName(qname);
+            }
+        }
+        if (mappedBinding == null) {
+            String qname =
+                System.getProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
+            if (qname != null) {
+                mappedBinding = ServiceDeclarationParser.getQName(qname);
+            } else {
+                // By default, mapping to binding.ws
+                mappedBinding = new QName(Base.SCA11_NS, "binding.ws");
+            }
+        }
+
+        processor = processors.getProcessor(mappedBinding);
+        builder = builders.getBindingBuilder(mappedBinding);
+        if (processor == null) {
+            logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding);
+        }
+
+        try {
+            if (processor != null) {
+                bindingTemplate = createDelegatingBinding();
+                ProviderFactory providerFactory = providerFactories.getProviderFactory(bindingTemplate.getClass());
+                if (providerFactory == null) {
+                    logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding);
+                    processor = null;
+                }
+            }
+        } catch (Throwable e) {
+            throw new ServiceRuntimeException(e);
+        }
+        remotable = isDistributed() && processor != null;
+    }
+
+    // FIXME: [rfeng] This is a HACK to check if we should make binding.sca remotable
+    // by checking if we have distributed domain registry present
+    private boolean isDistributed() {
+        DomainRegistryFactoryExtensionPoint factories =
+            registry.getExtensionPoint(DomainRegistryFactoryExtensionPoint.class);
+        List<DomainRegistryFactory> list = factories.getDomainRegistryFactories();
+        if (list.size() == 1) {
+            String[] schemes = list.get(0).getSupportedSchemes();
+            if (Arrays.asList(schemes).contains("local")) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public RuntimeEndpoint map(RuntimeEndpoint endpoint) {
+        if (processor == null) {
+            return null;
+        }
+        // create a copy of the endpoint  but with the web service binding in
+        RuntimeEndpoint ep = null;
+        try {
+            ep = (RuntimeEndpoint)endpoint.clone();
+        } catch (Exception ex) {
+            // we know we can clone endpoint references
+        }
+
+        Binding binding = map(endpoint.getBinding(), false);
+        ep.setBinding(binding);
+        if (builder != null) {
+            builder.build(ep.getComponent(), ep.getService(), binding, new BuilderContext(registry));
+        }
+        return ep;
+    }
+
+    public RuntimeEndpointReference map(RuntimeEndpointReference endpointReference) {
+        if (processor == null) {
+            return null;
+        }
+        // create a copy of the endpoint  but with the web service binding in
+        RuntimeEndpointReference epr = null;
+        try {
+            epr = (RuntimeEndpointReference)endpointReference.clone();
+        } catch (Exception ex) {
+            // we know we can clone endpoint references
+        }
+
+        Binding binding = map(endpointReference.getBinding(), true);
+        epr.setBinding(binding);
+
+        // epr.setTargetEndpoint(map((RuntimeEndpoint)epr.getTargetEndpoint()));
+
+        if (builder != null) {
+            builder.build(epr.getComponent(), epr.getReference(), binding, new BuilderContext(registry));
+        }
+
+        return epr;
+    }
+
+    protected Binding map(Binding scaBinding, boolean referenceSide) {
+        try {
+            Binding binding = createDelegatingBinding();
+            binding.setName(scaBinding.getName());
+            if (!referenceSide) {
+                // Only set the binding URI for the service side
+                binding.setURI(scaBinding.getURI());
+            }
+            binding.setOperationSelector(scaBinding.getOperationSelector());
+            binding.setRequestWireFormat(scaBinding.getRequestWireFormat());
+            binding.setResponseWireFormat(scaBinding.getResponseWireFormat());
+            if (binding instanceof PolicySubject && scaBinding instanceof PolicySubject) {
+                PolicySubject subject1 = (PolicySubject)binding;
+                PolicySubject subject2 = (PolicySubject)scaBinding;
+                subject1.getPolicySets().addAll(subject2.getPolicySets());
+                subject1.getRequiredIntents().addAll(subject2.getRequiredIntents());
+            }
+            return binding;
+        } catch (Throwable e) {
+            throw new ServiceRuntimeException(e);
+        }
+
+    }
+
+    private Binding createDelegatingBinding() throws XMLStreamException, ContributionReadException {
+        if (bindingTemplate != null) {
+            try {
+                return (Binding)bindingTemplate.clone();
+            } catch (CloneNotSupportedException e) {
+                // Ignore
+            }
+        }
+        // This is a hack to create an instance of the binding using the XML QName
+        StringBuffer xml = new StringBuffer();
+        xml.append("<").append(mappedBinding.getLocalPart()).append(" xmlns:b=\"").append(mappedBinding
+            .getNamespaceURI()).append("\"/>");
+
+        StAXHelper staxHelper = StAXHelper.getInstance(registry);
+        XMLStreamReader reader = staxHelper.createXMLStreamReader(new StringReader(xml.toString()));
+        reader.nextTag();
+        Binding binding = (Binding)processor.read(reader, new ProcessorContext(registry));
+        return binding;
+    }
+
+    public boolean isRemotable() {
+        return remotable;
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
new file mode 100644
index 0000000000..a8fec07f5c
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
@@ -0,0 +1,69 @@
+/*
+ * 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.provider;
+
+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.provider.EndpointReferenceProvider;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
+
+/**
+ * The reference binding provider for the remote sca binding implementation. 
+ */
+public class DelegatingSCAReferenceBindingProvider implements EndpointReferenceProvider {
+
+    private ReferenceBindingProvider provider;
+
+    public DelegatingSCAReferenceBindingProvider(RuntimeEndpointReference endpointReference,
+                                                 SCABindingMapper mapper) {
+        RuntimeEndpointReference epr = mapper.map(endpointReference);
+        if (epr != null) {
+            provider = epr.getBindingProvider();
+        }
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return provider.getBindingInterfaceContract();
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return provider.supportsOneWayInvocation();
+    }
+
+    public Invoker createInvoker(Operation operation) {
+        return provider.createInvoker(operation);
+    }
+
+    public void start() {
+        provider.start();
+    }
+
+    public void stop() {
+        provider.stop();
+    }
+
+    public void configure() {
+        if (provider instanceof EndpointReferenceProvider) {
+            ((EndpointReferenceProvider)provider).configure();
+        }
+    }
+}
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
new file mode 100644
index 0000000000..47625b5d5d
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
@@ -0,0 +1,80 @@
+/*
+ * 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.provider;
+
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+
+/**
+ * The service binding provider for the remote sca binding implementation. Relies on the
+ * binding-ws-axis implementation for providing a remote message endpoint
+ *
+ * @version $Rev$ $Date$
+ */
+public class DelegatingSCAServiceBindingProvider implements ServiceBindingProvider {
+
+    private static final Logger logger = Logger.getLogger(DelegatingSCAServiceBindingProvider.class.getName());
+
+    private ServiceBindingProvider provider;
+    protected Class<? extends Binding> bindingClass;
+    private boolean started = false;
+
+    public DelegatingSCAServiceBindingProvider(RuntimeEndpoint endpoint, SCABindingMapper mapper) {
+        RuntimeEndpoint ep = mapper.map(endpoint);
+        if (ep != null) {
+            endpoint.setBinding(ep.getBinding());
+            provider = ep.getBindingProvider();
+        }
+
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return provider.getBindingInterfaceContract();
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return provider.supportsOneWayInvocation();
+    }
+
+    public void start() {
+        if (started) {
+            return;
+        } else {
+            provider.start();
+            started = true;
+        }
+    }
+
+    public void stop() {
+        if (!started) {
+            return;
+        }
+        try {
+            provider.stop();
+        } finally {
+            started = false;
+        }
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
index 1f84dd5d19..88c6888ba9 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
@@ -19,14 +19,9 @@
 
 package org.apache.tuscany.sca.binding.sca.provider;
 
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
 import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.databinding.Mediator;
 import org.apache.tuscany.sca.interfacedef.Compatibility;
@@ -35,9 +30,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.InvocationChain;
 import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
 import org.apache.tuscany.sca.provider.EndpointReferenceProvider;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -58,19 +51,17 @@ import org.oasisopen.sca.ServiceUnavailableException;
  */
 public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProvider {
 
-    private static final Logger logger = Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName());
-
     private RuntimeEndpointReference endpointReference;
     private RuntimeComponent component;
     private RuntimeComponentReference reference;
     private SCABinding binding;
+    private boolean remotable;
     private boolean started = false;
 
-    private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory = null;
-    private ReferenceBindingProvider distributedProvider = null;
-    private SCABindingFactory scaBindingFactory;
+    private ReferenceBindingProvider distributedProvider;
     private Mediator mediator;
     private InterfaceContractMapper interfaceContractMapper;
+    private SCABindingMapper scaBindingMapper;
 
     public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints,
                                               RuntimeEndpointReference endpointReference) {
@@ -78,93 +69,36 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv
         this.component = (RuntimeComponent)endpointReference.getComponent();
         this.reference = (RuntimeComponentReference)endpointReference.getReference();
         this.binding = (SCABinding)endpointReference.getBinding();
-        this.scaBindingFactory =
-            extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class);
-
-        // look to see if a distributed SCA binding implementation has
-        // been included on the classpath. This will be needed by the
-        // provider itself to do it's thing
-        ProviderFactoryExtensionPoint factoryExtensionPoint =
-            extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        distributedProviderFactory =
-            (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint
-                .getProviderFactory(DistributedSCABinding.class);
 
         UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
         this.mediator = utilities.getUtility(Mediator.class);
         this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
+        this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class);
+        remotable = isTargetRemote();
+        getDistributedProvider();
     }
 
-    public boolean isTargetRemote() {
+    private boolean isTargetRemote() {
         return endpointReference.getTargetEndpoint().isRemote();
-        /*
-        boolean targetIsRemote = false;
-
-        // The decision is based on the results of the wiring process in the assembly model
-        // and there are three possibilities
-        // 1 - target service is running in a separate node in a separate JVM
-        // 2 - target service is running in a separate node in the same JVM
-        // 3 - target service is running in the same node
-        
-        // TODO - EPR - the method needs to be able to indicate the three cases
-        
-
-        if (RemoteBindingHelper.isTargetRemote()) {
-        	// TODO - EPR - what is this RemoteBindingHelper for?
-            if (reference.getInterfaceContract() != null) {
-                targetIsRemote = reference.getInterfaceContract().getInterface().isRemotable();
-            } else {
-                targetIsRemote = true;
-            }
-        } if ( (endpointReference.isRemote()) &&
-               (endpointReference.getTargetEndpoint().isRemote())){
-        	// case 1
-            targetIsRemote = true;
-        } else if (endpointReference.isRemote()) {
-        	// case 2
-        	targetIsRemote = false;
-        } else {
-        	// case 3
-        	targetIsRemote = false;
-        }
-        return targetIsRemote;
-        */
     }
 
     private ReferenceBindingProvider getDistributedProvider() {
 
-        if (isTargetRemote()) {
+        if (remotable) {
             // initialize the remote provider if it hasn't been done already
             if (distributedProvider == null) {
-                if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface().isRemotable()) {
+                if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface()
+                    .isRemotable()) {
                     throw new ServiceRuntimeException("Reference interface not remotable for component: " + component
                         .getName()
                         + " and reference: "
                         + reference.getName());
                 }
 
-                if (distributedProviderFactory == null) {
-                    throw new ServiceRuntimeException("No distributed SCA binding available for component: " + component
-                        .getName()
-                        + " and reference: "
-                        + reference.getName());
+                if (scaBindingMapper.isRemotable()) {
+                    distributedProvider =
+                        new DelegatingSCAReferenceBindingProvider(endpointReference, scaBindingMapper);
                 }
-
-                // create the remote provider
-                DistributedSCABinding distributedBinding = scaBindingFactory.createDistributedSCABinding();
-                distributedBinding.setSCABinding(binding);
-                
-                // create a copy of the endpoint reference and change the binding
-                RuntimeEndpointReference epr = null;
-                try {
-                    epr = (RuntimeEndpointReference)endpointReference.clone();
-                } catch (Exception ex) {
-                    // we know we can clone endpoint references
-                }
-                epr.setBinding(distributedBinding);
-
-                distributedProvider =
-                    distributedProviderFactory.createReferenceBindingProvider(epr);
             }
         }
 
@@ -172,8 +106,8 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv
     }
 
     public InterfaceContract getBindingInterfaceContract() {
-        if (isTargetRemote()) {
-            return getDistributedProvider().getBindingInterfaceContract();
+        if (remotable && distributedProvider != null) {
+            return distributedProvider.getBindingInterfaceContract();
         } else {
             // Check if there is a target
             RuntimeEndpoint endpoint = (RuntimeEndpoint)endpointReference.getTargetEndpoint();
@@ -186,31 +120,32 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv
     }
 
     public boolean supportsOneWayInvocation() {
-        if (isTargetRemote()) {
-            return getDistributedProvider().supportsOneWayInvocation();
+        if (remotable && distributedProvider != null) {
+            return distributedProvider.supportsOneWayInvocation();
         } else {
             return false;
         }
     }
-   
 
     private Invoker getInvoker(RuntimeEndpointReference epr, Operation operation) {
         Endpoint target = epr.getTargetEndpoint();
         if (target != null) {
             RuntimeComponentService service = (RuntimeComponentService)target.getService();
             if (service != null) { // not a callback wire
-                InvocationChain chain = ((RuntimeEndpoint) target).getInvocationChain(operation);
-                
+                InvocationChain chain = ((RuntimeEndpoint)target).getInvocationChain(operation);
+
                 boolean passByValue = false;
                 Operation targetOp = chain.getTargetOperation();
                 if (!operation.getInterface().isRemotable()) {
                     if (interfaceContractMapper.isCompatibleByReference(operation, targetOp, Compatibility.SUBSET)) {
-                       passByValue = false;
+                        passByValue = false;
                     }
                 } else {
 //                    boolean allowsPBR = chain.allowsPassByReference(); TODO: TUSCANY-3479 this breaks the conformance tests as it needs to consider _both_ ends
                     boolean allowsPBR = false;
-                    if (allowsPBR && interfaceContractMapper.isCompatibleByReference(operation, targetOp, Compatibility.SUBSET)) {
+                    if (allowsPBR && interfaceContractMapper.isCompatibleByReference(operation,
+                                                                                     targetOp,
+                                                                                     Compatibility.SUBSET)) {
                         passByValue = false;
                     } else if (interfaceContractMapper.isCompatibleByValue(operation, targetOp, Compatibility.SUBSET)) {
                         passByValue = true;
@@ -226,19 +161,21 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv
     }
 
     public Invoker createInvoker(Operation operation) {
-        if (isTargetRemote()) {
-            return getDistributedProvider().createInvoker(operation);
+        if (remotable && distributedProvider != null) {
+            return distributedProvider.createInvoker(operation);
         } else {
             Invoker invoker = getInvoker(endpointReference, operation);
             if (invoker == null) {
-                throw new ServiceUnavailableException("Unable to create SCA binding invoker for local target " + component.getName()
-                    + " reference "
-                    + reference.getName()
-                    + " (bindingURI="
-                    + binding.getURI()
-                    + " operation="
-                    + operation.getName()
-                    + ")" );
+                throw new ServiceUnavailableException(
+                                                      "Unable to create SCA binding invoker for local target " + component
+                                                          .getName()
+                                                          + " reference "
+                                                          + reference.getName()
+                                                          + " (bindingURI="
+                                                          + binding.getURI()
+                                                          + " operation="
+                                                          + operation.getName()
+                                                          + ")");
             }
             return invoker;
         }
@@ -247,8 +184,8 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv
     public void start() {
         if (started) {
             return;
-        } 
-        if (getDistributedProvider() != null) {
+        }
+        if (distributedProvider != null) {
             distributedProvider.start();
         }
         started = true;
@@ -257,10 +194,10 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv
     public void stop() {
         if (!started) {
             return;
-        } 
+        }
 
         try {
-            if (getDistributedProvider() != null) {
+            if (distributedProvider != null) {
                 distributedProvider.stop();
             }
         } finally {
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
index 59e787e2d4..14d7284846 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
@@ -19,22 +19,10 @@
 
 package org.apache.tuscany.sca.binding.sca.provider;
 
-import java.net.URI;
-import java.util.Collection;
-
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 
@@ -49,69 +37,39 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider {
     private RuntimeEndpoint endpoint;
     private RuntimeComponentService service;
-    private SCABinding binding;
-    
-    
-    private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
+
     private ServiceBindingProvider distributedProvider;
-    private DistributedSCABinding distributedBinding;
-    
+    private SCABindingMapper scaBindingMapper;
 
     public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) {
         this.endpoint = endpoint;
         this.service = (RuntimeComponentService)endpoint.getService();
-        this.binding = (SCABinding)endpoint.getBinding();
-        
+        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+        this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class);
+
         // if there is potentially a wire to this service that crosses the node boundary
         // then we need to create a remote endpoint 
         if (service.getInterfaceContract().getInterface().isRemotable()) {
 
-            // look to see if a distributed SCA binding implementation has
-            // been included on the classpath. This will be needed by the
-            // provider itself to do it's thing
-            ProviderFactoryExtensionPoint factoryExtensionPoint =
-                extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-            distributedProviderFactory =
-                (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint
-                    .getProviderFactory(DistributedSCABinding.class);
-
-            if (isDistributed(extensionPoints, endpoint)) {
-
-                SCABindingFactory scaBindingFactory =
-                    extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class);
-
-                //  create a nested provider to handle the remote case
-                distributedBinding = scaBindingFactory.createDistributedSCABinding();
-                distributedBinding.setSCABinding(binding);
-                
-                // create a copy of the endpoint and change the binding
-                RuntimeEndpoint ep = null;
-                try {
-                    ep = (RuntimeEndpoint)endpoint.clone();
-                } catch (Exception ex) {
-                    // we know we can clone endpoint 
-                }
-                ep.setBinding(distributedBinding);
-
-                distributedProvider =
-                    distributedProviderFactory.createServiceBindingProvider(ep);
-            } 
+            if (scaBindingMapper.isRemotable()) {
+                distributedProvider = new DelegatingSCAServiceBindingProvider(endpoint, scaBindingMapper);
+            }
         }
     }
-    
+
+    /*
     protected boolean isDistributed(ExtensionPointRegistry extensionPoints, Endpoint endpoint) {
         // find if the node config is for distributed endpoints
         // TODO: temp, need a much better way to do this
-        if (distributedProviderFactory != null) {
-            DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPoints);
-            Collection<EndpointRegistry> eprs = domainRegistryFactory.getEndpointRegistries();
-            if (eprs.size() > 0) {
-                String eprName = eprs.iterator().next().getClass().getName();
-                return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl");
-            }
+        DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPoints);
+        Collection<EndpointRegistry> eprs = domainRegistryFactory.getEndpointRegistries();
+        if (eprs.size() > 0) {
+            String eprName = eprs.iterator().next().getClass().getName();
+            return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl");
         }
         return false;
     }
+    */
 
     public InterfaceContract getBindingInterfaceContract() {
         if (distributedProvider != null) {
@@ -122,6 +80,9 @@ public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider
     }
 
     public boolean supportsOneWayInvocation() {
+        if (distributedProvider != null) {
+            return distributedProvider.supportsOneWayInvocation();
+        }
         return false;
     }
 
@@ -135,21 +96,6 @@ public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider
         if (distributedProvider != null) {
             distributedProvider.stop();
         }
-
-        if (distributedBinding != null) {
-            // reset the binding URI to null so that if the composite containing the component
-            // with the service/binding is restarted the binding will have the correct URI set
-            SCABinding scaBinding = distributedBinding.getSCABinding();
-            try {
-                URI tempURI = new URI(scaBinding.getURI());
-                if (!tempURI.isAbsolute()){
-                    scaBinding.setURI(null);
-                }
-            } catch (Exception ex){
-                scaBinding.setURI(null);
-            }
-        }
-
     }
 
 }
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
new file mode 100644
index 0000000000..03aa44a04e
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
@@ -0,0 +1,50 @@
+/*
+ * 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.provider;
+
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
+
+/**
+ * SCABindingMapper allows us to map binding.sca to any of the bindings available to the runtime 
+ */
+public interface SCABindingMapper {
+
+    /**
+     * Map an endpoint with binding.sca to an endpoint
+     * @param endpoint The endpoint for binding.sca
+     * @return The endpoint for the mapped binding
+     */
+    public RuntimeEndpoint map(RuntimeEndpoint endpoint);
+
+    /**
+     * Map an endpoint reference with binding.sca to an endpoint reference with the mapped binding
+     * @param endpointReference
+     * @return The endpoint reference for the mapped binding
+     */
+    public RuntimeEndpointReference map(RuntimeEndpointReference endpointReference);
+    
+    /**
+     * Check if the remote SCA binding is supported
+     * @return 
+     */
+    boolean isRemotable();
+
+}