Call node init() to ensure that the extension point registry is initialized. Remove the local test from the default client impl. This local test will be carried out by the default binding.

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

2 files changed, 4 insertions, 18 deletions

diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
index dabf61e7e3..146d1c4017 100644
--- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
@@ -76,6 +76,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
         super(domainURI);
         
         this.nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance();
+        this.nodeFactory.init();
         this.extensionsRegistry = nodeFactory.getExtensionPoints();
         DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry);
         this.endpointRegistry = domainRegistryFactory.getEndpointRegistry(null, getDomainURI().toString()); // TODO: shouldnt use null for reg uri
@@ -103,12 +104,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
             throw new NoSuchServiceException(serviceName);
         }
         Endpoint endpoint = eps.get(0); // TODO: what should be done with multiple endpoints?
-
-//        Node localNode = findLocalNode(endpoint);
-//        if (localNode != null) {
-//            return localNode.getService(serviceInterface, serviceName);
-//        }
-        
+       
         RuntimeEndpointReference epr;
         try {
             epr = createEndpointReference(endpoint, serviceInterface);
@@ -118,18 +114,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
         return proxyFactory.createProxy(serviceInterface, epr);
         
     }
-
-    private Node findLocalNode(Endpoint endpoint) {
-        for (Node node : nodeFactory.getNodes().values()) {
-            for (Endpoint ep : ((NodeImpl)node).getServiceEndpoints()) {
-                if (endpoint.getURI().equals(ep.getURI())) {
-                    return node;
-                }
-            }
-        }
-        return null;
-    }
-
+    
     private RuntimeEndpointReference createEndpointReference(Endpoint endpoint, Class<?> businessInterface)
         throws CloneNotSupportedException, InvalidInterfaceException {
         Component component = endpoint.getComponent();
diff --git a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
index a51e844ac1..3ffe7df629 100644
--- a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
@@ -52,6 +52,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
         super(domainURI);

         

         this.nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance();

+        this.nodeFactory.init();

         this.extensionsRegistry = nodeFactory.getExtensionPoints();

         if (extensionsRegistry != null) {

             this.extensionsRegistry = nodeFactory.getExtensionPoints();