Allows the distributed flag to be overriden

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

2 files changed, 7 insertions, 13 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
index a61eb4a594..6f843ff2d6 100644
--- 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
@@ -60,7 +60,7 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
     protected StAXArtifactProcessorExtensionPoint processors;
     protected QName defaultMappedBinding;
     protected QName defaultLocalBinding;
-    // protected boolean supportsDistributedSCA;
+    protected boolean alwaysDistributed;
 
     public DefaultSCABindingMapper(ExtensionPointRegistry registry, Map<String, String> attributes) {
         this.registry = registry;
@@ -68,7 +68,9 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
         processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
         defaultMappedBinding = getDefaultMappedBinding(attributes);
         defaultLocalBinding = new QName(Base.SCA11_TUSCANY_NS, "binding.local");
-        // supportsDistributedSCA = isDistributed();
+        if (attributes != null && "true".equalsIgnoreCase(attributes.get("alwaysDistributed"))) {
+            alwaysDistributed = true;
+        }
     }
 
     protected QName getDefaultMappedBinding(Map<String, String> attributes) {
@@ -246,7 +248,7 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
      */
     protected QName chooseBinding(RuntimeEndpoint endpoint) {
         DomainRegistry domainRegistry = endpoint.getCompositeContext().getEndpointRegistry();
-        boolean distributed = domainRegistry.isDistributed();
+        boolean distributed = alwaysDistributed || domainRegistry.isDistributed();
         InterfaceContract interfaceContract = endpoint.getService().getInterfaceContract();
         if(interfaceContract != null
            && interfaceContract.getInterface() != null
@@ -266,7 +268,7 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
      */
     protected QName chooseBinding(RuntimeEndpointReference endpointReference) {
         DomainRegistry domainRegistry = endpointReference.getCompositeContext().getEndpointRegistry();
-        boolean distributed = domainRegistry.isDistributed();
+        boolean distributed = alwaysDistributed || domainRegistry.isDistributed();
         if(endpointReference.getTargetEndpoint().isRemote()) {
             RuntimeComponentReference ref = (RuntimeComponentReference)endpointReference.getReference();
             if(ref.getInterfaceContract() != null && !ref.getInterfaceContract().getInterface().isRemotable()) {
diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
index 77c7cc0cbe..8a8865889d 100644
--- a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
+++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
@@ -38,6 +38,7 @@ public class MyMapper extends DefaultSCABindingMapper {
 
     public MyMapper(ExtensionPointRegistry registry, Map<String, String> attributes) {
         super(registry, attributes);
+        alwaysDistributed = true;
     }
 
     @Override
@@ -68,13 +69,4 @@ public class MyMapper extends DefaultSCABindingMapper {
         return bindingType;
     }
 
-    /*
-     * Probably others don't need to override this is they have a remotable endpoint registry, this itest
-     * doesn't so just fiddle the test  
-     */
-    @Override
-    protected boolean isDistributed() {
-        return true;
-    }
-
 }