Remove SCAClient as its not in the latest spec and update all the places it was used to use SCAClientFactory.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
index f6c6dca6ec..135c6a79c7 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.EndpointRegistry;

 import org.oasisopen.sca.NoSuchDomainException;

 import org.oasisopen.sca.NoSuchServiceException;

-import org.oasisopen.sca.client.SCAClient;

+import org.oasisopen.sca.client.SCAClientFactory;

 

 public class DomainNode {

 

@@ -60,7 +60,7 @@ public class DomainNode {
     public DomainNode(String configURI, String[] contributionLocations) {

         this.domainRegistryURI = configURI;

         initDomainName(configURI);

-        nodeFactory = NodeFactory.getInstance(domainName);

+        nodeFactory = NodeFactory.getInstance(domainRegistryURI);

         for (String loc : contributionLocations) {

             addContribution(loc);

         }

@@ -127,7 +127,7 @@ public class DomainNode {
 

     public <T> T getService(Class<T> interfaze, String uri) throws NoSuchServiceException {

         try {

-            return SCAClient.getService(interfaze, getDomainName() + "/" + uri);

+            return SCAClientFactory.newInstance(URI.create(getDomainConfigURI())).getService(interfaze, uri);

         } catch (NoSuchDomainException e) {

             throw new IllegalStateException(e);

         }