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, 10 insertions, 10 deletions

diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index f7b940f873..fe3b198a7b 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
@@ -19,9 +19,9 @@
 
 package bigbank.client;
 
-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 bigbank.account.AccountService;
 
@@ -32,11 +32,11 @@ import bigbank.account.AccountService;
 public class BigBankClient {
     public static void main(String[] args) throws Exception {
 
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
+        NodeFactory factory = NodeFactory.newInstance();
+        Node node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
         node.start();
         
-        AccountService accountService = ((SCAClient)node).getService(AccountService.class, "AccountServiceComponent");
+        AccountService accountService = ((Client)node).getService(AccountService.class, "AccountServiceComponent");
 
         System.out.println("Account summary: " + accountService.getAccountReport("Customer_01") );
 
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
index 241347e417..82103612f7 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ b/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
@@ -19,8 +19,8 @@
 
 package bigbank.server;
 
-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 client program shows how to create an SCA runtime, start it,
@@ -36,8 +36,8 @@ public class BigBankServer {
         
         System.out.println("Starting the Sample SCA Spring BigBank server...");
                 
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
+        NodeFactory factory = NodeFactory.newInstance();
+        Node node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
         node.start();
 
         if (timeout < 0) {