Work in progress. Fixed implementation of NodeImpl, now working without dependencies on implementations from other bundles (except RuntimeAssemblyFactory, which will need to be cleaned up too). Started to remove dependencies on host-embedded and port code to NodeFactory and Node, as an interim step to bring them up, before porting them to the OSGi-enabled node launcher.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index ece769236c..1ac33872b7 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
@@ -21,9 +21,9 @@ package myapp;
 import myserver.MyService;

 import myserver.MyServiceCallback;

 

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

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

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

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

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

 import org.osoa.sca.annotations.Reference;

 import org.osoa.sca.annotations.Scope;

 import org.osoa.sca.annotations.Service;

@@ -49,15 +49,15 @@ public class MyClientImpl implements MyClient, MyServiceCallback {
     }

 

     public static void main(String[] args) throws Exception {

-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("myapp.composite", MyClientImpl.class.getClassLoader());

+        Node node = NodeFactory.newInstance().createSCANodeFromClassLoader("myapp.composite", MyClientImpl.class.getClassLoader());

         node.start();

         run(node);

         System.out.println("Closing the domain");

         node.stop();

     }

 

-    public static void run(SCANode node) throws InterruptedException {

-        MyClient myClient = ((SCAClient)node).getService(MyClient.class, "MyClientComponent");

+    public static void run(Node node) throws InterruptedException {

+        MyClient myClient = ((Client)node).getService(MyClient.class, "MyClientComponent");

         myClient.aClientMethod();

         Thread.sleep(5000);  // don't exit before callback arrives

     }