Merge itest changes from sca-equinox branch into trunk

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

8 files changed, 94 insertions, 94 deletions

diff --git a/java/sca/itest/conversations-ws/pom.xml b/java/sca/itest/conversations-ws/pom.xml
index 6b0fab3c8f..2789d3eee7 100644
--- a/java/sca/itest/conversations-ws/pom.xml
+++ b/java/sca/itest/conversations-ws/pom.xml
@@ -45,7 +45,7 @@
         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>2.0-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>         

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 9df966ebc2..6c3cbe462c 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/java/sca/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/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index ebd1e55dac..051b6b9fc1 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/java/sca/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/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2c16145f54..b9530c132b 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/java/sca/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/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 4166e6acdf..1e5f6adcf1 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/java/sca/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/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 6023b7cd53..8a110477b5 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/java/sca/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/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fb3a3cec6f..79ac9262c6 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/java/sca/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/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 5fbe2c3f69..9aebae9ced 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/java/sca/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