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

7 files changed, 93 insertions, 93 deletions

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 9df966ebc2..6c3cbe462c 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
@@ -24,10 +24,10 @@ import java.io.File;
 

 

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.After;

 import org.junit.Assert;

 import org.junit.Before;

@@ -35,20 +35,20 @@ import org.junit.Test;
 

 public class ConversationWSDLTestCase {

 

-    private SCANode node; 

+    private Node node; 

     private ConversationalClient conversationalStatelessClientStatefulService;    

 

     @Before

     public void setUp() throws Exception {

-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-        node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

-                                         new SCAContribution("TestContribution", 

+        NodeFactory nodeFactory = NodeFactory.newInstance();

+        node = nodeFactory.createNode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

+                                         new Contribution("TestContribution", 

                                                                      new File("src/main/resources/ConversationalWSDL").toURL().toString()));

                 

          

         node.start();

         

-        conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");

+        conversationalStatelessClientStatefulService = ((Client)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");

         

         

         ConversationalClientStatelessImpl.calls  = new StringBuffer(); 

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index ebd1e55dac..051b6b9fc1 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
@@ -29,17 +29,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class NonConversationalCallbackTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,28 +50,28 @@ public class NonConversationalCallbackTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

     	try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatelessClientStatelessService");

 	

-	    conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatelessClientStatefulService");

 	

-	    conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatefulClientStatelessService");

 	

-	    conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatefulClientStatefulService");

-	    conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatelessClientRequestService");

-	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");

 	        

 	    // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2c16145f54..b9530c132b 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
@@ -30,17 +30,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class RequestScopeTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -51,28 +51,28 @@ public class RequestScopeTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 4166e6acdf..1e5f6adcf1 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
@@ -29,17 +29,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatefulStatefulTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,28 +50,28 @@ public class StatefulStatefulTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 6023b7cd53..8a110477b5 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
@@ -29,17 +29,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatefulStatelessTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,28 +50,28 @@ public class StatefulStatelessTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fb3a3cec6f..79ac9262c6 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
@@ -28,17 +28,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatelessStatefulTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -49,28 +49,28 @@ public class StatelessStatefulTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 5fbe2c3f69..9aebae9ced 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
@@ -28,17 +28,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

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

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

-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.Contribution;

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

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

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatelessStatelessTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -49,28 +49,28 @@ public class StatelessStatelessTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing