Decouple node-impl from sca-client-impl

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

2 files changed, 3 insertions, 14 deletions

diff --git a/java/sca/modules/sca-client-impl/pom.xml b/java/sca/modules/sca-client-impl/pom.xml
index 07475d8553..9a0fe91a7c 100644
--- a/java/sca/modules/sca-client-impl/pom.xml
+++ b/java/sca/modules/sca-client-impl/pom.xml
@@ -38,7 +38,7 @@
         </dependency>

         <dependency>

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

-            <artifactId>tuscany-node-api</artifactId>

+            <artifactId>tuscany-node-impl</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

 

diff --git a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java b/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
index e49f5faf2f..0f4c661f35 100644
--- a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
+++ b/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
@@ -20,28 +20,17 @@
 package org.apache.tuscany.sca.client.impl;

 

 import java.net.URI;

-import java.util.HashMap;

-import java.util.Map;

 

 import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFinder;

 import org.oasisopen.sca.NoSuchDomainException;

 import org.oasisopen.sca.NoSuchServiceException;

 import org.oasisopen.sca.client.SCAClient;

 

 public class SCAClientImpl implements SCAClient {

 

-    private static Map<URI, Node> nodes = new HashMap<URI, Node>();

-

-    public static void addDomain(URI domainName, Node node) {

-        nodes.put(domainName, node);

-    }

-

-    public static Node removeDomain(URI domainName) {

-        return nodes.remove(domainName);

-    }

-

     public <T> T getService(Class<T> serviceInterface, String serviceName, URI domainURI) throws NoSuchServiceException, NoSuchDomainException {

-        Node node = nodes.get(domainURI);

+        Node node = NodeFinder.getNode(domainURI);

         if (node == null) {

             throw new NoSuchDomainException(domainURI.toString());

         }