Switch to SCANode API

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

2 files changed, 7 insertions, 15 deletions

diff --git a/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java b/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
index 9d180bf52e..614b56d489 100644
--- a/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
+++ b/java/sca/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
@@ -19,7 +19,9 @@
 
 package calculator;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
 
 /**
  * This client program shows how to create an SCA runtime, start it,
@@ -28,10 +30,11 @@ import org.apache.tuscany.sca.host.embedded.SCADomain;
 public class CalculatorClient {
     public static void main(String[] args) throws Exception {
 
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
+        SCANode2 node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("Calculator.composite", CalculatorClient.class.getClassLoader());
+        node.start();
         
         CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+            ((SCAClient) node).getService(CalculatorService.class, "CalculatorServiceComponent");
 
         // Calculate
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
@@ -39,7 +42,7 @@ public class CalculatorClient {
         System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
         System.out.println("3 / 2=" + calculatorService.divide(3, 2));
 
-        scaDomain.close();
+        node.stop();
     }
 
 }
diff --git a/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java b/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
index 3258d73758..a8db7f73f3 100644
--- a/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
+++ b/java/sca/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
@@ -18,25 +18,14 @@
  */

 package org.apache.tuscany.sca.tools.inspector;

 

-import java.io.ByteArrayOutputStream;

 import java.io.File;

-import java.io.OutputStream;

-import java.lang.reflect.Field;

-import java.util.Map;

 

 import junit.framework.TestCase;

 

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.MonitorFactory;

-import org.apache.tuscany.sca.monitor.Problem;

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

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

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

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

-import org.apache.tuscany.sca.node.impl.NodeImpl;

-import org.apache.tuscany.sca.tools.inspector.RegistryInspector;

 

 import calculator.CalculatorService;