svn commit: r908434 - in /tuscany/sca-java-2.x/trunk/modules: sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java

[slaws]

Author: slaws
Date: Wed Feb 10 10:12:41 2010
New Revision: 908434

URL: http://svn.apache.org/viewvc?rev=908434&view=rev
Log:
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. 

Modified:
    
tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
    
tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java?rev=908434&r1=908433&r2=908434&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
 Wed Feb 10 10:12:41 2010
@@ -76,6 +76,7 @@
         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 @@
             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 @@
         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();

Modified: 
tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java?rev=908434&r1=908433&r2=908434&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
 Wed Feb 10 10:12:41 2010
@@ -52,6 +52,7 @@
         super(domainURI);
         
         this.nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance();
+        this.nodeFactory.init();
         this.extensionsRegistry = nodeFactory.getExtensionPoints();
         if (extensionsRegistry != null) {
             this.extensionsRegistry = nodeFactory.getExtensionPoints();