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

2 files changed, 7 insertions, 7 deletions

diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index 75ef05bc48..da3844dbf3 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
@@ -20,8 +20,8 @@ package myserver;
 

 import java.io.IOException;

 

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

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

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

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

 

 /**

  * This server program shows how to create and start an SCA runtime that

@@ -31,7 +31,7 @@ public class CallbackServer {
 

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

         

-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

+        Node node = NodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

         node.start();

 

         try {

diff --git a/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index e87667cc3e..1b17e10556 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
@@ -21,8 +21,8 @@ package myserver;
 import java.io.IOException;

 import java.net.Socket;

 

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

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

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

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

 import org.junit.After;

 import org.junit.Before;

 import org.junit.Test;

@@ -32,11 +32,11 @@ import org.junit.Test;
  */

 public class CallbackServerTestCase {

 

-    private SCANode node;

+    private Node node;

 

     @Before

     public void startServer() throws Exception {

-        node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

+        node = NodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

         node.start();

     }