Remove DistributedSCABinding

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

8 files changed, 8 insertions, 165 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index cbfec53f65..5e3fa15b69 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.assembly.xml;
 
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.SCABindingFactory;
 
@@ -33,8 +32,4 @@ public class TestSCABindingFactoryImpl implements SCABindingFactory {
         return new TestSCABindingImpl();
     }
 
-    public DistributedSCABinding createDistributedSCABinding() {
-        return null;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
deleted file mode 100644
index 5cc43d6333..0000000000
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.assembly;
-
-import javax.xml.namespace.QName;
-
-/**
- * Represents an SCA binding used in the distributed runtime.
- * It provides us with a sensibly named type against which
- * distributed sca binding providers can be registered
- *
- * @version $Rev$ $Date$
- */
-public interface DistributedSCABinding extends Binding {
-    QName TYPE = SCABinding.TYPE;
-
-    /**
-     * Return the wrapped SCA binding
-     * @return the SCA binding model element
-     */
-    SCABinding getSCABinding();
-
-    /**
-     * Set the wrapped SCA binding
-     * @param scaBinding the SCA binding model element
-     */
-    void setSCABinding(SCABinding scaBinding);
-
-}
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 176770e553..feae980326 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
@@ -32,6 +32,4 @@ public interface SCABindingFactory {
      */
     SCABinding createSCABinding();
 
-    DistributedSCABinding createDistributedSCABinding();
-
 }
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
deleted file mode 100644
index 8524eb6fc7..0000000000
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.assembly.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * The Distributed SCA binding wrapper for the SCA binding model object. This is currently
- * just used to locate the remote binding extension and pass the SCA binding to the remote
- * extension. It isn't used in the model itself
- *
- * @version $Rev$ $Date$
- */
-public class DistributedSCABindingImpl implements DistributedSCABinding {
-
-    private SCABinding scaBinding;
-
-    public SCABinding getSCABinding() {
-        return scaBinding;
-    }
-
-    public void setSCABinding(SCABinding scaBinding) {
-        this.scaBinding = scaBinding;
-    }
-
-    public String getURI() {
-        return null;
-    }
-
-    public void setURI(String uri) {
-    }
-
-    public String getName() {
-        return null;
-    }
-
-    public void setName(String name) {
-
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public QName getType() {
-        return TYPE;
-    }
-    
-    public WireFormat getRequestWireFormat() {
-        return null;
-    }
-    
-    public void setRequestWireFormat(WireFormat wireFormat) {  
-    }
-    
-    public WireFormat getResponseWireFormat() {
-        return null;
-    }
-    
-    public void setResponseWireFormat(WireFormat wireFormat) {
-    }
-    
-    public OperationSelector getOperationSelector() {
-        return null;
-    }
-    
-    public void setOperationSelector(OperationSelector operationSelector) {
-    }    
-}
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index cf7e744e88..84e5825b50 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.assembly.impl;
 
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.SCABindingFactory;
 
@@ -38,8 +37,4 @@ public class SCABindingFactoryImpl implements SCABindingFactory {
         return new SCABindingImpl();
     }
 
-    public DistributedSCABinding createDistributedSCABinding() {
-        return new DistributedSCABindingImpl();
-    }
-
 }
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 c4466a9d90..734e4137ef 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
@@ -65,10 +65,6 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
 
     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) {
@@ -86,8 +82,10 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
             }
         }
 
+        providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
+        StAXArtifactProcessorExtensionPoint processors =
+            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
         processor = processors.getProcessor(mappedBinding);
-        builder = builders.getBindingBuilder(mappedBinding);
         if (processor == null) {
             logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding);
         }
@@ -104,6 +102,8 @@ public class DefaultSCABindingMapper implements SCABindingMapper {
         } catch (Throwable e) {
             throw new ServiceRuntimeException(e);
         }
+        BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class);
+        builder = builders.getBindingBuilder(mappedBinding);
         remotable = isDistributed() && processor != null;
     }
 
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index 119d66d14d..d968e2891d 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
@@ -69,7 +69,6 @@ public class SCABindingTestCase {
             extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class);
 
         Assert.assertNotNull(factory.createSCABinding());
-        Assert.assertNotNull(factory.createDistributedSCABinding());
     }
 
     @Test
diff --git a/sca-java-2.x/trunk/shades/base/pom.xml b/sca-java-2.x/trunk/shades/base/pom.xml
index d147f3511a..72f2dcdc3a 100644
--- a/sca-java-2.x/trunk/shades/base/pom.xml
+++ b/sca-java-2.x/trunk/shades/base/pom.xml
@@ -59,17 +59,17 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>

+            <artifactId>tuscany-endpoint-hazelcast-client</artifactId>

             <version>${pom.version}</version>

         </dependency>

-        <dependency>

+         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-sca-client-javascript</artifactId>

             <version>${pom.version}</version>

         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-client-rmi</artifactId>

+            <artifactId>tuscany-sca-client-impl</artifactId>

             <version>${pom.version}</version>

         </dependency>

         <dependency>