Remove org.apache.tuscany.sca.node.Client and merge the methods into org.apache.tuscany.sca.node.Node

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

24 files changed, 438 insertions, 510 deletions

diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 23ed57dec9..779943739e 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
@@ -20,8 +20,8 @@
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 37b3f1b680..6c7c82a4ba 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
@@ -20,8 +20,8 @@
 package org.apache.tuscany.sca.itest.databindings.jaxb.impl;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index df38c948c1..8bacf13063 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
@@ -19,23 +19,21 @@
 
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.io.File;
 
 import junit.framework.Assert;
 
+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;
 
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.Contribution;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -72,7 +70,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCA() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTest(helloServiceSimpleClient);
     }
 
@@ -82,7 +80,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCAArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTestArray(helloServiceSimpleClient);
     }
 
@@ -92,7 +90,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCAList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTestList(helloServiceSimpleClient);
     }
 
@@ -102,7 +100,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCAArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTestArrayList(helloServiceSimpleClient);
     }
 
@@ -112,7 +110,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCAMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTestMap(helloServiceSimpleClient);
     }
 
@@ -122,7 +120,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCAHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTestHashMap(helloServiceSimpleClient);
     }
 
@@ -132,7 +130,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCAVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
         performTestVarArgs(helloServiceSimpleClient);
     }
 
@@ -142,7 +140,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWS() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTest(helloServiceSimpleClient);
     }
 
@@ -152,7 +150,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWSArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTestArray(helloServiceSimpleClient);
     }
 
@@ -162,7 +160,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWSList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTestList(helloServiceSimpleClient);
     }
 
@@ -172,7 +170,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWSArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTestArrayList(helloServiceSimpleClient);
     }
 
@@ -182,7 +180,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWSMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTestMap(helloServiceSimpleClient);
     }
 
@@ -192,7 +190,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWSHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTestHashMap(helloServiceSimpleClient);
     }
 
@@ -202,7 +200,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testWSVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
         performTestVarArgs(helloServiceSimpleClient);
     }
 
@@ -212,7 +210,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocal() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTest(helloServiceSimpleClient);
     }
 
@@ -222,7 +220,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocalArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTestArray(helloServiceSimpleClient);
     }
 
@@ -232,7 +230,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocalList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTestList(helloServiceSimpleClient);
     }
 
@@ -242,7 +240,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocalArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTestArrayList(helloServiceSimpleClient);
     }
 
@@ -252,7 +250,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocalMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTestMap(helloServiceSimpleClient);
     }
 
@@ -262,7 +260,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocalHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTestHashMap(helloServiceSimpleClient);
     }
 
@@ -272,7 +270,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testSCALocalVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = ((Client)node).getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
+        HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
         performTestVarArgs(helloServiceSimpleClient);
     }
 
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 197c0bec7b..6aac75ae08 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
@@ -19,17 +19,16 @@
 
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import junit.framework.Assert;
 import java.io.File;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import junit.framework.Assert;
 
-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.apache.tuscany.sca.node.Contribution;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 
 /**
@@ -68,7 +67,7 @@ public class DocLitBareWsdlTestCase {
     // @Ignore("TUSCANY-2398")
     @Test
     public void testDocLitBareWsdl() throws Exception {
-        AClientService client = ((Client)node).getService(AClientService.class, "AClientComponent");
+        AClientService client = node.getService(AClientService.class, "AClientComponent");
         String name = "Pandu";
         String resp = client.getGreetingsForward(name);
         Assert.assertEquals("Hello " + name, resp);
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index 8fc1465f77..755619908d 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
@@ -19,19 +19,18 @@
 
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import junit.framework.Assert;
 import java.io.File;
 
+import junit.framework.Assert;
+
 import org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsTransformer;
+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;
 
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.Contribution;
-
 
 /**
  * Databinding tests for generics, parameterized and polymorphic types.
@@ -71,7 +70,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCATypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestTypeExplicit(serviceClient);
     }
 
@@ -81,7 +80,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCATypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestTypeUnbound(serviceClient);
     }
 
@@ -91,7 +90,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCATypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestTypeExtends(serviceClient);
     }
 
@@ -101,7 +100,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCARecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestRecursiveTypeBound(serviceClient);
     }
 
@@ -111,7 +110,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCAWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestWildcardUnbound(serviceClient);
     }
 
@@ -121,7 +120,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCAWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestWildcardSuper(serviceClient);
     }
 
@@ -131,7 +130,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCAWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestWildcardExtends(serviceClient);
     }
 
@@ -141,7 +140,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCAPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
         performTestPolymorphic(serviceClient);
     }
 
@@ -151,7 +150,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSTypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestTypeExplicit(serviceClient);
     }
 
@@ -161,7 +160,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSTypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestTypeUnbound(serviceClient);
     }
 
@@ -171,7 +170,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSTypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestTypeExtends(serviceClient);
     }
 
@@ -181,7 +180,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSRecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestRecursiveTypeBound(serviceClient);
     }
 
@@ -191,7 +190,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestWildcardUnbound(serviceClient);
     }
 
@@ -201,7 +200,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestWildcardSuper(serviceClient);
     }
 
@@ -211,7 +210,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestWildcardExtends(serviceClient);
     }
 
@@ -221,7 +220,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testWSPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
         performTestPolymorphic(serviceClient);
     }
 
@@ -231,7 +230,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalTypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestTypeExplicit(serviceClient);
     }
 
@@ -241,7 +240,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalTypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestTypeUnbound(serviceClient);
     }
 
@@ -251,7 +250,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalTypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestTypeExtends(serviceClient);
     }
 
@@ -261,7 +260,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalRecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestRecursiveTypeBound(serviceClient);
     }
 
@@ -271,7 +270,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestWildcardUnbound(serviceClient);
     }
 
@@ -281,7 +280,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestWildcardSuper(serviceClient);
     }
 
@@ -291,7 +290,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestWildcardExtends(serviceClient);
     }
 
@@ -301,7 +300,7 @@ public class GenericsDatabindingTestCase {
      */
     @Test
     public void testSCALocalPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = ((Client)node).getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
+        GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
         performTestPolymorphic(serviceClient);
     }
 
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index 56f4911fb7..8ece2c3293 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
@@ -19,17 +19,16 @@
 
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import junit.framework.Assert;
 import java.io.File;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import junit.framework.Assert;
 
-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.apache.tuscany.sca.node.Contribution;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 
 /**
@@ -69,7 +68,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateBoolean(primitivesServiceClient);
     }
 
@@ -79,7 +78,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateBooleanArray(primitivesServiceClient);
     }
 
@@ -89,7 +88,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
     }
 
@@ -99,7 +98,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateByte(primitivesServiceClient);
     }
 
@@ -109,7 +108,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateByteArray(primitivesServiceClient);
     }
 
@@ -119,7 +118,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
     }
 
@@ -129,7 +128,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateShort(primitivesServiceClient);
     }
 
@@ -139,7 +138,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateShortArray(primitivesServiceClient);
     }
 
@@ -149,7 +148,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
     }
 
@@ -159,7 +158,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateInt(primitivesServiceClient);
     }
 
@@ -169,7 +168,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateIntArray(primitivesServiceClient);
     }
 
@@ -179,7 +178,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
     }
 
@@ -189,7 +188,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateLong(primitivesServiceClient);
     }
 
@@ -199,7 +198,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateLongArray(primitivesServiceClient);
     }
 
@@ -209,7 +208,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
     }
 
@@ -219,7 +218,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateFloat(primitivesServiceClient);
     }
 
@@ -229,7 +228,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateFloatArray(primitivesServiceClient);
     }
 
@@ -239,7 +238,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
     }
 
@@ -249,7 +248,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateDouble(primitivesServiceClient);
     }
 
@@ -259,7 +258,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCANegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         performTestNegateDoubleArray(primitivesServiceClient);
     }
 
@@ -269,7 +268,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCAPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
     }
 
@@ -279,7 +278,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateBoolean(primitivesServiceClient);
     }
 
@@ -289,7 +288,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateBooleanArray(primitivesServiceClient);
     }
 
@@ -299,7 +298,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
     }
 
@@ -309,7 +308,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateByte(primitivesServiceClient);
     }
 
@@ -319,7 +318,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateByteArray(primitivesServiceClient);
     }
 
@@ -329,7 +328,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
     }
 
@@ -339,7 +338,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateShort(primitivesServiceClient);
     }
 
@@ -349,7 +348,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateShortArray(primitivesServiceClient);
     }
 
@@ -359,7 +358,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
     }
 
@@ -369,7 +368,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateInt(primitivesServiceClient);
     }
 
@@ -379,7 +378,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateIntArray(primitivesServiceClient);
     }
 
@@ -389,7 +388,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
     }
 
@@ -399,7 +398,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateLong(primitivesServiceClient);
     }
 
@@ -409,7 +408,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateLongArray(primitivesServiceClient);
     }
 
@@ -419,7 +418,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
     }
 
@@ -429,7 +428,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateFloat(primitivesServiceClient);
     }
 
@@ -439,7 +438,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateFloatArray(primitivesServiceClient);
     }
 
@@ -449,7 +448,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
     }
 
@@ -459,7 +458,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateDouble(primitivesServiceClient);
     }
 
@@ -469,7 +468,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         performTestNegateDoubleArray(primitivesServiceClient);
     }
 
@@ -479,7 +478,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testWSPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
     }
 
@@ -489,7 +488,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateBoolean(primitivesServiceClient);
     }
 
@@ -499,7 +498,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateBooleanArray(primitivesServiceClient);
     }
 
@@ -509,7 +508,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateByte(primitivesServiceClient);
     }
 
@@ -519,7 +518,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateByteArray(primitivesServiceClient);
     }
 
@@ -529,7 +528,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateShort(primitivesServiceClient);
     }
 
@@ -539,7 +538,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateShortArray(primitivesServiceClient);
     }
 
@@ -549,7 +548,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateInt(primitivesServiceClient);
     }
 
@@ -559,7 +558,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateIntArray(primitivesServiceClient);
     }
 
@@ -569,7 +568,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateLong(primitivesServiceClient);
     }
 
@@ -579,7 +578,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateLongArray(primitivesServiceClient);
     }
 
@@ -589,7 +588,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateFloat(primitivesServiceClient);
     }
 
@@ -599,7 +598,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateFloatArray(primitivesServiceClient);
     }
 
@@ -609,7 +608,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateDouble(primitivesServiceClient);
     }
 
@@ -619,7 +618,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testSCALocalNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = ((Client)node).getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
         performTestNegateDoubleArray(primitivesServiceClient);
     }
     
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index 9f7d6ad766..dd9a689353 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
@@ -25,7 +25,6 @@ import java.awt.image.PixelGrabber;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -46,26 +45,18 @@ import javax.xml.namespace.QName;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
 
 import junit.framework.Assert;
 
 import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.tuscany.sca.databinding.xml.String2Node;
 import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
+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.Ignore;
 import org.junit.Test;
-import org.xml.sax.InputSource;
-
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.Contribution;
 
 
 /**
@@ -105,7 +96,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewBigInteger() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewBigInteger(serviceClient);
     }
 
@@ -116,7 +107,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewBigIntegerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewBigIntegerArray(serviceClient);
     }
 
@@ -127,7 +118,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewBigDecimal() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewBigDecimal(serviceClient);
     }
 
@@ -138,7 +129,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewBigDecimalArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewBigDecimalArray(serviceClient);
     }
 
@@ -149,7 +140,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewCalendar(serviceClient);
     }
 
@@ -160,7 +151,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewCalendarArray(serviceClient);
     }
 
@@ -171,7 +162,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewDate() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewDate(serviceClient);
     }
 
@@ -182,7 +173,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewDateArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewDateArray(serviceClient);
     }
 
@@ -193,7 +184,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewQName() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewQName(serviceClient);
     }
 
@@ -204,7 +195,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewQNameArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewQNameArray(serviceClient);
     }
 
@@ -215,7 +206,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewURI() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewURI(serviceClient);
     }
 
@@ -226,7 +217,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewURIArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewURIArray(serviceClient);
     }
 
@@ -237,7 +228,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewXMLGregorianCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewXMLGregorianCalendar(serviceClient);
     }
 
@@ -248,7 +239,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewXMLGregorianCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewXMLGregorianCalendarArray(serviceClient);
     }
 
@@ -259,7 +250,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewDuration() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewDuration(serviceClient);
     }
 
@@ -270,7 +261,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewDurationArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewDurationArray(serviceClient);
     }
 
@@ -281,7 +272,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewObject() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewObject(serviceClient);
     }
 
@@ -292,7 +283,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewObjectArray(serviceClient);
     }
 
@@ -303,7 +294,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewImage() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewImage(serviceClient);
     }
 
@@ -314,7 +305,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewImageArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewImageArray(serviceClient);
     }
 
@@ -325,7 +316,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewDataHandler() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewDataHandler(serviceClient);
     }
 
@@ -336,7 +327,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewDataHandlerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewDataHandlerArray(serviceClient);
     }
 
@@ -347,7 +338,7 @@ public class StandardTypesDatabindingTestCase {
     /*@Test
     public void testSCANewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewSource(serviceClient);
     }*/
 
@@ -359,7 +350,7 @@ public class StandardTypesDatabindingTestCase {
     @Ignore("TUSCANY-2387")
     public void testSCANewSourceArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewSourceArray(serviceClient);
     }*/
 
@@ -370,7 +361,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewUUID() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewUUID(serviceClient);
     }
 
@@ -381,7 +372,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCANewUUIDArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
         performTestNewUUIDArray(serviceClient);
     }
 
@@ -392,7 +383,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewBigInteger() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewBigInteger(serviceClient);
     }
 
@@ -403,7 +394,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewBigIntegerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewBigIntegerArray(serviceClient);
     }
 
@@ -414,7 +405,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewBigDecimal() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewBigDecimal(serviceClient);
     }
 
@@ -425,7 +416,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewBigDecimalArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewBigDecimalArray(serviceClient);
     }
 
@@ -436,7 +427,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewCalendar(serviceClient);
     }
 
@@ -447,7 +438,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewCalendarArray(serviceClient);
     }
 
@@ -458,7 +449,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewDate() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewDate(serviceClient);
     }
 
@@ -469,7 +460,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewDateArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewDateArray(serviceClient);
     }
 
@@ -480,7 +471,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewQName() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewQName(serviceClient);
     }
 
@@ -491,7 +482,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewQNameArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewQNameArray(serviceClient);
     }
 
@@ -502,7 +493,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewURI() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewURI(serviceClient);
     }
 
@@ -513,7 +504,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewURIArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewURIArray(serviceClient);
     }
 
@@ -524,7 +515,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewXMLGregorianCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewXMLGregorianCalendar(serviceClient);
     }
 
@@ -535,7 +526,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewXMLGregorianCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewXMLGregorianCalendarArray(serviceClient);
     }
 
@@ -546,7 +537,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewDuration() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewDuration(serviceClient);
     }
 
@@ -557,7 +548,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewDurationArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewDurationArray(serviceClient);
     }
 
@@ -568,7 +559,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewObject() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewObject(serviceClient);
     }
 
@@ -579,7 +570,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewObjectArray(serviceClient);
     }
 
@@ -590,7 +581,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewImage() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewImage(serviceClient);
     }
 
@@ -601,7 +592,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewImageArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewImageArray(serviceClient);
     }
 
@@ -612,7 +603,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewDataHandler() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewDataHandler(serviceClient);
     }
 
@@ -623,7 +614,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewDataHandlerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewDataHandlerArray(serviceClient);
     }
 
@@ -635,7 +626,7 @@ public class StandardTypesDatabindingTestCase {
     // @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
     public void testWSNewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewSource(serviceClient);
     }*/
 
@@ -647,7 +638,7 @@ public class StandardTypesDatabindingTestCase {
     @Ignore("TUSCANY-2386")
     public void testWSNewSourceArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewSourceArray(serviceClient);
     }*/
 
@@ -658,7 +649,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewUUID() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewUUID(serviceClient);
     }
 
@@ -669,7 +660,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testWSNewUUIDArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
         performTestNewUUIDArray(serviceClient);
     }
 
@@ -680,7 +671,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewBigInteger() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewBigInteger(serviceClient);
     }
 
@@ -691,7 +682,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewBigIntegerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewBigIntegerArray(serviceClient);
     }
 
@@ -702,7 +693,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewBigDecimal() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewBigDecimal(serviceClient);
     }
 
@@ -713,7 +704,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewBigDecimalArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewBigDecimalArray(serviceClient);
     }
 
@@ -724,7 +715,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewCalendar(serviceClient);
     }
 
@@ -735,7 +726,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewCalendarArray(serviceClient);
     }
 
@@ -746,7 +737,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewDate() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewDate(serviceClient);
     }
 
@@ -757,7 +748,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewDateArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewDateArray(serviceClient);
     }
 
@@ -768,7 +759,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewQName() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewQName(serviceClient);
     }
 
@@ -779,7 +770,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewQNameArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewQNameArray(serviceClient);
     }
 
@@ -790,7 +781,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewURI() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewURI(serviceClient);
     }
 
@@ -801,7 +792,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewURIArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewURIArray(serviceClient);
     }
 
@@ -812,7 +803,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewXMLGregorianCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewXMLGregorianCalendar(serviceClient);
     }
 
@@ -823,7 +814,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewXMLGregorianCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewXMLGregorianCalendarArray(serviceClient);
     }
 
@@ -834,7 +825,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewDuration() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewDuration(serviceClient);
     }
 
@@ -845,7 +836,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewDurationArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewDurationArray(serviceClient);
     }
 
@@ -856,7 +847,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewObject() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewObject(serviceClient);
     }
 
@@ -867,7 +858,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewObjectArray(serviceClient);
     }
 
@@ -878,7 +869,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewImage() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewImage(serviceClient);
     }
 
@@ -889,7 +880,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewImageArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewImageArray(serviceClient);
     }
 
@@ -900,7 +891,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewDataHandler() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewDataHandler(serviceClient);
     }
 
@@ -911,7 +902,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewDataHandlerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewDataHandlerArray(serviceClient);
     }
 
@@ -922,7 +913,7 @@ public class StandardTypesDatabindingTestCase {
     /*@Test
     public void testSCALocalNewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewSource(serviceClient);
     }*/
 
@@ -933,7 +924,7 @@ public class StandardTypesDatabindingTestCase {
     /*@Test
     public void testSCALocalNewSourceArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewSourceArray(serviceClient);
     }*/
 
@@ -944,7 +935,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewUUID() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewUUID(serviceClient);
     }
 
@@ -955,7 +946,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testSCALocalNewUUIDArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            ((Client)node).getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
         performTestNewUUIDArray(serviceClient);
     }
 
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index b680c98081..3351e9c441 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
@@ -19,30 +19,27 @@
 
 package org.apache.tuscany.sca.itest.databindings.jaxb.topdown;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.io.File;
 
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
-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.apache.tuscany.sca.node.Contribution;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.Ignore;
 
 /**
  * @version $Rev$ $Date$
  */
 public class DatabindingTestCase {
 
-    private static Client client;
     private static Node node;
 
     /**
@@ -55,7 +52,6 @@ public class DatabindingTestCase {
         node = factory.createNode(new File("src/main/resources/wsdl/wrapped/helloservice.composite").toURI().toURL().toString(),
                 new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString()));
         node.start();
-        client = (Client)node;
         }catch(Throwable e) {
             e.printStackTrace();
         }
@@ -75,7 +71,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2W() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTest(helloServiceClient);
     }
 
@@ -85,7 +81,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2WArray() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTestArray(helloServiceClient);
     }
 
@@ -95,7 +91,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2WList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTestList(helloServiceClient);
     }
 
@@ -105,7 +101,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2WArrayList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTestArrayList(helloServiceClient);
     }
 
@@ -115,7 +111,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2WMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTestMap(helloServiceClient);
     }
 
@@ -125,7 +121,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2WHashMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTestHashMap(helloServiceClient);
     }
 
@@ -135,7 +131,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2WVarArgs() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
         performTestVarArgs(helloServiceClient);
     }
 
@@ -145,7 +141,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2W() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTest(helloServiceClient);
     }
 
@@ -155,7 +151,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2WArray() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTestArray(helloServiceClient);
     }
 
@@ -165,7 +161,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2WList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTestList(helloServiceClient);
     }
 
@@ -175,7 +171,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2WArrayList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTestArrayList(helloServiceClient);
     }
 
@@ -185,7 +181,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2WMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTestMap(helloServiceClient);
     }
 
@@ -195,7 +191,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2WHashMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTestHashMap(helloServiceClient);
     }
 
@@ -205,7 +201,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testJ2WVarArgs() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
         performTestVarArgs(helloServiceClient);
     }
 
@@ -215,7 +211,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2J() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTest(helloServiceClient);
     }
 
@@ -225,7 +221,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2JArray() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTestArray(helloServiceClient);
     }
 
@@ -235,7 +231,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2JList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTestList(helloServiceClient);
     }
 
@@ -245,7 +241,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2JArrayList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTestArrayList(helloServiceClient);
     }
 
@@ -255,7 +251,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2JMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTestMap(helloServiceClient);
     }
 
@@ -265,7 +261,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2JHashMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTestHashMap(helloServiceClient);
     }
 
@@ -275,7 +271,7 @@ public class DatabindingTestCase {
      */
     @Test
     public void testW2JVarArgs() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
+        HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
         performTestVarArgs(helloServiceClient);
     }
 
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 0266976866..8430d5e978 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
@@ -19,25 +19,23 @@
 
 package org.apache.tuscany.sca.itest.databindings.jaxb.topdown;
 
-import junit.framework.Assert;
 import java.io.File;
 
+import junit.framework.Assert;
+
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-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.apache.tuscany.sca.node.Contribution;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.Ignore;
 
 /**
  * @version $Rev$ $Date$
  */
 public class PrimitivesDatabindingTestCase {
 
-    private static Client domain;
     private static Node node;
 
     /**
@@ -49,7 +47,6 @@ public class PrimitivesDatabindingTestCase {
         node = factory.createNode(new File("src/main/resources/wsdl/wrapped/primitivesservice.composite").toURI().toURL().toString(),
                 new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString()));
         node.start();
-        domain = (Client)node;
     }
 
     /**
@@ -66,7 +63,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateBoolean(primitivesServiceClient);
     }
 
@@ -76,7 +73,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateBooleanArray(primitivesServiceClient);
     }
 
@@ -86,7 +83,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
     }
 
@@ -96,7 +93,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateByte(primitivesServiceClient);
     }
 
@@ -106,7 +103,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateByteArray(primitivesServiceClient);
     }
 
@@ -116,7 +113,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
     }
 
@@ -126,7 +123,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateShort(primitivesServiceClient);
     }
 
@@ -136,7 +133,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateShortArray(primitivesServiceClient);
     }
 
@@ -146,7 +143,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
     }
 
@@ -156,7 +153,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateInt(primitivesServiceClient);
     }
 
@@ -166,7 +163,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateIntArray(primitivesServiceClient);
     }
 
@@ -176,7 +173,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
     }
 
@@ -186,7 +183,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateLong(primitivesServiceClient);
     }
 
@@ -196,7 +193,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateLongArray(primitivesServiceClient);
     }
 
@@ -206,7 +203,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
     }
 
@@ -216,7 +213,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateFloat(primitivesServiceClient);
     }
 
@@ -226,7 +223,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateFloatArray(primitivesServiceClient);
     }
 
@@ -236,7 +233,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
     }
 
@@ -246,7 +243,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateDouble(primitivesServiceClient);
     }
 
@@ -256,7 +253,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         performTestNegateDoubleArray(primitivesServiceClient);
     }
 
@@ -266,7 +263,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2WPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
     }
 
@@ -276,7 +273,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateBoolean(primitivesServiceClient);
     }
 
@@ -286,7 +283,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateBooleanArray(primitivesServiceClient);
     }
 
@@ -296,7 +293,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
     }
 
@@ -306,7 +303,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateByte(primitivesServiceClient);
     }
 
@@ -316,7 +313,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateByteArray(primitivesServiceClient);
     }
 
@@ -326,7 +323,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
     }
 
@@ -336,7 +333,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateShort(primitivesServiceClient);
     }
 
@@ -346,7 +343,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateShortArray(primitivesServiceClient);
     }
 
@@ -356,7 +353,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
     }
 
@@ -366,7 +363,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateInt(primitivesServiceClient);
     }
 
@@ -376,7 +373,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateIntArray(primitivesServiceClient);
     }
 
@@ -386,7 +383,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
     }
 
@@ -396,7 +393,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateLong(primitivesServiceClient);
     }
 
@@ -406,7 +403,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateLongArray(primitivesServiceClient);
     }
 
@@ -416,7 +413,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
     }
 
@@ -426,7 +423,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateFloat(primitivesServiceClient);
     }
 
@@ -436,7 +433,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateFloatArray(primitivesServiceClient);
     }
 
@@ -446,7 +443,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
     }
 
@@ -456,7 +453,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateDouble(primitivesServiceClient);
     }
 
@@ -466,7 +463,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         performTestNegateDoubleArray(primitivesServiceClient);
     }
 
@@ -476,7 +473,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testJ2WPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
     }
 
@@ -486,7 +483,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateBoolean(primitivesServiceClient);
     }
 
@@ -496,7 +493,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateBooleanArray(primitivesServiceClient);
     }
 
@@ -506,7 +503,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
     }
 
@@ -516,7 +513,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateByte(primitivesServiceClient);
     }
 
@@ -526,7 +523,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateByteArray(primitivesServiceClient);
     }
 
@@ -536,7 +533,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
     }
 
@@ -546,7 +543,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateShort(primitivesServiceClient);
     }
 
@@ -556,7 +553,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateShortArray(primitivesServiceClient);
     }
 
@@ -566,7 +563,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
     }
 
@@ -576,7 +573,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateInt(primitivesServiceClient);
     }
 
@@ -586,7 +583,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateIntArray(primitivesServiceClient);
     }
 
@@ -596,7 +593,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
     }
 
@@ -606,7 +603,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateLong(primitivesServiceClient);
     }
 
@@ -616,7 +613,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateLongArray(primitivesServiceClient);
     }
 
@@ -626,7 +623,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
     }
 
@@ -636,7 +633,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateFloat(primitivesServiceClient);
     }
 
@@ -646,7 +643,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateFloatArray(primitivesServiceClient);
     }
 
@@ -656,7 +653,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
     }
 
@@ -666,7 +663,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateDouble(primitivesServiceClient);
     }
 
@@ -676,7 +673,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         performTestNegateDoubleArray(primitivesServiceClient);
     }
 
@@ -686,7 +683,7 @@ public class PrimitivesDatabindingTestCase {
      */
     @Test
     public void testW2JPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
+        PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
         Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
     }
 
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index e7d94a7200..7499978c0e 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
@@ -25,7 +25,6 @@ import java.awt.image.PixelGrabber;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -46,34 +45,25 @@ import javax.xml.namespace.QName;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
 
 import junit.framework.Assert;
 
 import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.tuscany.sca.databinding.xml.String2Node;
 import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
 import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-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.apache.tuscany.sca.node.Contribution;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.junit.Ignore;
 
 /**
  * @version $Rev$ $Date$
  */
 public class StandardTypesDatabindingTestCase {
 
-    private static Client domain;
     private static Node node;
 
     /**
@@ -85,7 +75,6 @@ public class StandardTypesDatabindingTestCase {
         node = factory.createNode(new File("src/main/resources/wsdl/wrapped/standard-types-service.composite").toURI().toURL().toString(),
                 new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString()));
         node.start();
-        domain = (Client)node;
     }
 
     /**
@@ -103,7 +92,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewBigInteger() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewBigInteger(serviceClient);
     }
 
@@ -114,7 +103,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewBigIntegerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewBigIntegerArray(serviceClient);
     }
 
@@ -125,7 +114,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewBigDecimal() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewBigDecimal(serviceClient);
     }
 
@@ -136,7 +125,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewBigDecimalArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewBigDecimalArray(serviceClient);
     }
 
@@ -147,7 +136,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewCalendar(serviceClient);
     }
 
@@ -158,7 +147,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewCalendarArray(serviceClient);
     }
 
@@ -169,7 +158,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewDate() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewDate(serviceClient);
     }
 
@@ -180,7 +169,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewDateArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewDateArray(serviceClient);
     }
 
@@ -191,7 +180,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewQName() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewQName(serviceClient);
     }
 
@@ -202,7 +191,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewQNameArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewQNameArray(serviceClient);
     }
 
@@ -213,7 +202,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewURI() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewURI(serviceClient);
     }
 
@@ -224,7 +213,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewURIArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewURIArray(serviceClient);
     }
 
@@ -235,7 +224,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewXMLGregorianCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewXMLGregorianCalendar(serviceClient);
     }
 
@@ -246,7 +235,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewXMLGregorianCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewXMLGregorianCalendarArray(serviceClient);
     }
 
@@ -257,7 +246,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewDuration() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewDuration(serviceClient);
     }
 
@@ -268,7 +257,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewDurationArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewDurationArray(serviceClient);
     }
 
@@ -279,7 +268,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewObject() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewObject(serviceClient);
     }
 
@@ -290,7 +279,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewObjectArray(serviceClient);
     }
 
@@ -301,7 +290,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewImage() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewImage(serviceClient);
     }
 
@@ -312,7 +301,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewImageArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewImageArray(serviceClient);
     }
 
@@ -323,7 +312,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewDataHandler() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewDataHandler(serviceClient);
     }
 
@@ -334,7 +323,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewDataHandlerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewDataHandlerArray(serviceClient);
     }
 
@@ -346,7 +335,7 @@ public class StandardTypesDatabindingTestCase {
     //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
     public void testW2WNewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewSource(serviceClient);
     }*/
 
@@ -358,7 +347,7 @@ public class StandardTypesDatabindingTestCase {
     @Ignore("TUSCANY-2452")
     public void testW2WNewSourceArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewSourceArray(serviceClient);
     }*/
 
@@ -369,7 +358,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewUUID() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewUUID(serviceClient);
     }
 
@@ -380,7 +369,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2WNewUUIDArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
         performTestNewUUIDArray(serviceClient);
     }
 
@@ -391,7 +380,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewBigInteger() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewBigInteger(serviceClient);
     }
 
@@ -402,7 +391,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewBigIntegerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewBigIntegerArray(serviceClient);
     }
 
@@ -413,7 +402,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewBigDecimal() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewBigDecimal(serviceClient);
     }
 
@@ -424,7 +413,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewBigDecimalArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewBigDecimalArray(serviceClient);
     }
 
@@ -435,7 +424,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewCalendar(serviceClient);
     }
 
@@ -446,7 +435,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewCalendarArray(serviceClient);
     }
 
@@ -457,7 +446,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewDate() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewDate(serviceClient);
     }
 
@@ -468,7 +457,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewDateArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewDateArray(serviceClient);
     }
 
@@ -479,7 +468,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewQName() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewQName(serviceClient);
     }
 
@@ -490,7 +479,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewQNameArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewQNameArray(serviceClient);
     }
 
@@ -501,7 +490,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewURI() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewURI(serviceClient);
     }
 
@@ -512,7 +501,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewURIArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewURIArray(serviceClient);
     }
 
@@ -523,7 +512,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewXMLGregorianCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewXMLGregorianCalendar(serviceClient);
     }
 
@@ -534,7 +523,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewXMLGregorianCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewXMLGregorianCalendarArray(serviceClient);
     }
 
@@ -545,7 +534,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewDuration() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewDuration(serviceClient);
     }
 
@@ -556,7 +545,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewDurationArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewDurationArray(serviceClient);
     }
 
@@ -567,7 +556,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewObject() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewObject(serviceClient);
     }
 
@@ -578,7 +567,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewObjectArray(serviceClient);
     }
 
@@ -589,7 +578,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewImage() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewImage(serviceClient);
     }
 
@@ -600,7 +589,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewImageArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewImageArray(serviceClient);
     }
 
@@ -611,7 +600,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewDataHandler() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewDataHandler(serviceClient);
     }
 
@@ -622,7 +611,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewDataHandlerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewDataHandlerArray(serviceClient);
     }
 
@@ -634,7 +623,7 @@ public class StandardTypesDatabindingTestCase {
     //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
     public void testJ2WNewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewSource(serviceClient);
     }*/
 
@@ -646,7 +635,7 @@ public class StandardTypesDatabindingTestCase {
     @Ignore("TUSCANY-2452")
     public void testJ2WNewSourceArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewSourceArray(serviceClient);
     }*/
 
@@ -657,7 +646,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewUUID() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewUUID(serviceClient);
     }
 
@@ -668,7 +657,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testJ2WNewUUIDArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
         performTestNewUUIDArray(serviceClient);
     }
 
@@ -679,7 +668,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewBigInteger() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewBigInteger(serviceClient);
     }
 
@@ -690,7 +679,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewBigIntegerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewBigIntegerArray(serviceClient);
     }
 
@@ -701,7 +690,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewBigDecimal() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewBigDecimal(serviceClient);
     }
 
@@ -712,7 +701,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewBigDecimalArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewBigDecimalArray(serviceClient);
     }
 
@@ -723,7 +712,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewCalendar(serviceClient);
     }
 
@@ -734,7 +723,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewCalendarArray(serviceClient);
     }
 
@@ -745,7 +734,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewDate() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewDate(serviceClient);
     }
 
@@ -756,7 +745,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewDateArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewDateArray(serviceClient);
     }
 
@@ -767,7 +756,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewQName() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewQName(serviceClient);
     }
 
@@ -778,7 +767,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewQNameArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewQNameArray(serviceClient);
     }
 
@@ -789,7 +778,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewURI() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewURI(serviceClient);
     }
 
@@ -800,7 +789,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewURIArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewURIArray(serviceClient);
     }
 
@@ -811,7 +800,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewXMLGregorianCalendar() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewXMLGregorianCalendar(serviceClient);
     }
 
@@ -822,7 +811,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewXMLGregorianCalendarArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewXMLGregorianCalendarArray(serviceClient);
     }
 
@@ -833,7 +822,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewDuration() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewDuration(serviceClient);
     }
 
@@ -844,7 +833,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewDurationArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewDurationArray(serviceClient);
     }
 
@@ -855,7 +844,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewObject() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewObject(serviceClient);
     }
 
@@ -866,7 +855,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewObjectArray(serviceClient);
     }
 
@@ -877,7 +866,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewImage() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewImage(serviceClient);
     }
 
@@ -888,7 +877,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewImageArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewImageArray(serviceClient);
     }
 
@@ -899,7 +888,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewDataHandler() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewDataHandler(serviceClient);
     }
 
@@ -910,7 +899,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewDataHandlerArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewDataHandlerArray(serviceClient);
     }
 
@@ -922,7 +911,7 @@ public class StandardTypesDatabindingTestCase {
     //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
     public void testW2JNewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewSource(serviceClient);
     }*/
 
@@ -934,7 +923,7 @@ public class StandardTypesDatabindingTestCase {
     @Ignore("TUSCANY-2452")
     public void testW2JNewSourceArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewSourceArray(serviceClient);
     }*/
 
@@ -945,7 +934,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewUUID() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewUUID(serviceClient);
     }
 
@@ -956,7 +945,7 @@ public class StandardTypesDatabindingTestCase {
     @Test
     public void testW2JNewUUIDArray() throws Exception {
         StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
+            node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
         performTestNewUUIDArray(serviceClient);
     }
 
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index fed509df98..968d420fc8 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
@@ -18,8 +18,8 @@
  */
 package context.access;
 
-import org.springframework.beans.BeansException;   
-import org.springframework.context.ApplicationContext;   
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
 public class SCAApplicationContextProvider implements ApplicationContextAware {
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index ecb085858d..544b39ad58 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
@@ -18,12 +18,12 @@
  */
 package spring.annotations;
 
+import org.oasisopen.sca.annotation.ComponentName;
 import org.oasisopen.sca.annotation.Destroy;
 import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Reference;
 import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.ComponentName;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 import calculator.AddService;
 import calculator.CalculatorService;
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index 4503294f10..a346e290b9 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
@@ -20,13 +20,12 @@
 package context.access;
 
 import java.io.File;
-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.apache.tuscany.sca.node.Contribution;
 import org.springframework.context.ApplicationContext;
 
-import context.access.SCAApplicationContextProvider;
 import calculator.CalculatorService;
 
 /**
@@ -47,7 +46,7 @@ public class CalculatorClient {
             System.out.println("CalculatorServiceBean is now available for use...");
               
         CalculatorService calculatorService = 
-            ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+            node.getService(CalculatorService.class, "CalculatorServiceComponent");
                 
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
         System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index 254b8100e1..c029b06a8c 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
@@ -21,10 +21,10 @@ package context.imports;
 
 import java.io.File;
 
-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.apache.tuscany.sca.node.Contribution;
+
 import calculator.CalculatorService;
 
 /**
@@ -40,7 +40,7 @@ public class CalculatorClient {
         node.start(); 
               
         CalculatorService calculatorService = 
-            ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+            node.getService(CalculatorService.class, "CalculatorServiceComponent");
         
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
         System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index 9ff1b74567..83875e0b0a 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
@@ -21,10 +21,10 @@ package context.multiple;
 import java.io.File;
 
 import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 import org.springframework.context.ApplicationContext;
+
 import context.access.SCAApplicationContextProvider;
 
 /**
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 8b12dd7af7..19892597c1 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
@@ -22,10 +22,11 @@ package implementation.policies;
 import java.io.File;
 
 import javax.security.auth.login.Configuration;
-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 calculator.CalculatorService;
 
 
@@ -48,7 +49,7 @@ public class CalculatorClient {
         node.start();
               
         CalculatorService calculatorService = 
-            ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+            node.getService(CalculatorService.class, "CalculatorServiceComponent");
 
         // Calculate
         System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +
@@ -59,7 +60,7 @@ public class CalculatorClient {
         System.out.println("3 / 2=" + calculatorService.divide(3, 2));
         
         calculatorService = 
-            ((Client)node).getService(CalculatorService.class, "AnotherCalculatorServiceComponent");
+            node.getService(CalculatorService.class, "AnotherCalculatorServiceComponent");
 
         // Calculate
         System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 73b151bf7a..53cc094aca 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
@@ -20,12 +20,10 @@
 package org.apache.tuscany.sca.itest.spring;
 
 import java.io.File;
+
 import junit.framework.TestCase;
-import java.net.MalformedURLException;
 
-import org.apache.tuscany.sca.node.Client;
 import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 
@@ -48,7 +46,7 @@ public abstract class AbstractSCATestCase<T> extends TestCase {
     	node = factory.createNode(new File("src/main/resources/" + contributionLocation + compositeName).toURI().toURL().toString(),
                 new Contribution("TestContribution", new File("src/main/resources/" + contributionLocation).toURI().toURL().toString()));      
     	node.start();
-        service = ((Client)node).getService(getServiceClass(), "ClientComponent");
+        service = node.getService(getServiceClass(), "ClientComponent");
     }
 
     abstract protected Class<T> getServiceClass();
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index 13b84c8c73..c2dfbf247f 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
@@ -21,10 +21,10 @@ package spring.annotations;
 
 import java.io.File;
 
-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 calculator.CalculatorService;
 
 
@@ -41,7 +41,7 @@ public class CalculatorClient {
         node.start(); 
               
         CalculatorService calculatorService = 
-            ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+            node.getService(CalculatorService.class, "CalculatorServiceComponent");
         
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
         System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
diff --git a/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index 879f50fe08..1f771ea4ce 100644
--- a/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
@@ -19,22 +19,21 @@
 
 package org.apache.tuscany.sca.itest.oneway;
 
+import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import java.io.File;
 
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
 import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;
 import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;
-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.apache.tuscany.sca.node.Contribution;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -87,7 +86,7 @@ public class OneWayTestCase {
     @Test
     public void testOneWay() throws Exception {
         OneWayClient client =
-            ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");
+            node.getService(OneWayClient.class, "OneWayClientComponent");
 
         int count = 100;
 
@@ -123,7 +122,7 @@ public class OneWayTestCase {
     @Test
     public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {
         OneWayClient client =
-            ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
+            node.getService(OneWayClient.class, "OneWayClientComponentSCABinding");
             
         // We need to modify the JDK Logger for the NonBlockingInterceptor so we
         // can check that it logs a message for the @OneWay invocation that throws
diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
deleted file mode 100644
index 3c740d89a4..0000000000
--- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.node;
-
-import org.oasisopen.sca.ServiceReference;
-
-
-/**
- * Provides client access to the services in a domain.
- *
- * @version $Rev$ $Date$
- */
-public interface Client {
-
-    /**
-     * Cast a type-safe reference to a CallableReference. Converts a type-safe
-     * reference to an equivalent CallableReference; if the target refers to a
-     * service then a ServiceReference will be returned, if the target refers to
-     * a callback then a CallableReference will be returned.
-     *
-     * @param target a reference proxy provided by the SCA runtime
-     * @param <B> the Java type of the business interface for the reference
-     * @param <R> the type of reference to be returned
-     * @return a CallableReference equivalent for the proxy
-     * @throws IllegalArgumentException if the supplied instance is not a
-     *             reference supplied by the SCA runtime
-     */
-    <B, R extends ServiceReference<B>> R cast(B target) throws IllegalArgumentException;
-
-    /**
-     * Returns a proxy for a service provided by a component in the SCA domain.
-     *
-     * @param businessInterface the interface that will be used to invoke the
-     *            service
-     * @param serviceName the name of the service
-     * @param <B> the Java type of the business interface for the service
-     * @return an object that implements the business interface
-     */
-    <B> B getService(Class<B> businessInterface, String serviceName);
-
-    /**
-     * Returns a ServiceReference for a service provided by a component in the
-     * SCA domain.
-     *
-     * @param businessInterface the interface that will be used to invoke the
-     *            service
-     * @param serviceName the name of the service
-     * @param <B> the Java type of the business interface for the service
-     * @return a ServiceReference for the designated service
-     */
-    <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName);
-
-}
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
index b02919fb8f..b30cc3bb64 100644
--- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
+++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
@@ -19,9 +19,8 @@
 
 package org.apache.tuscany.sca.node;
 
-import java.util.List;
-
 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
+import org.oasisopen.sca.ServiceReference;
 
 
 
@@ -32,7 +31,7 @@ import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
  *
  * @version $Rev$ $Date$
  */
-public interface Node extends Client {
+public interface Node {
     String DEFAULT_DOMAIN_URI = NodeConfiguration.DEFAULT_DOMAIN_URI;
     String DEFAULT_NODE_URI = NodeConfiguration.DEFAULT_NODE_URI;
     /**
@@ -46,5 +45,41 @@ public interface Node extends Client {
      */
     void stop();
 
-    List<String> getServiceNames();
+    /**
+     * Cast a type-safe reference to a CallableReference. Converts a type-safe
+     * reference to an equivalent CallableReference; if the target refers to a
+     * service then a ServiceReference will be returned, if the target refers to
+     * a callback then a CallableReference will be returned.
+     *
+     * @param target a reference proxy provided by the SCA runtime
+     * @param <B> the Java type of the business interface for the reference
+     * @param <R> the type of reference to be returned
+     * @return a CallableReference equivalent for the proxy
+     * @throws IllegalArgumentException if the supplied instance is not a
+     *             reference supplied by the SCA runtime
+     */
+    <B, R extends ServiceReference<B>> R cast(B target) throws IllegalArgumentException;
+
+    /**
+     * Returns a proxy for a service provided by a component in the SCA domain.
+     *
+     * @param businessInterface the interface that will be used to invoke the
+     *            service
+     * @param serviceName the name of the service
+     * @param <B> the Java type of the business interface for the service
+     * @return an object that implements the business interface
+     */
+    <B> B getService(Class<B> businessInterface, String serviceName);
+
+    /**
+     * Returns a ServiceReference for a service provided by a component in the
+     * SCA domain.
+     *
+     * @param businessInterface the interface that will be used to invoke the
+     *            service
+     * @param serviceName the name of the service
+     * @param <B> the Java type of the business interface for the service
+     * @return a ServiceReference for the designated service
+     */
+    <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName);    
 }
diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index 69f09e55da..05a2a43f2d 100644
--- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
@@ -62,7 +62,7 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory {
         NodeFactory.instance = factory;
     }
 
-    public static class NodeProxy implements Node, Client {
+    public static class NodeProxy implements Node {
         private Object node;
 
         private NodeProxy(Object node) {
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index f6d86231fc..648cfe9121 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -44,7 +44,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.core.invocation.ProxyFactory;
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.node.Client;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
 import org.apache.tuscany.sca.node.management.NodeManager;
@@ -63,7 +62,7 @@ import org.oasisopen.sca.ServiceUnavailableException;
 /**
  * An SCA Node that is managed by the NodeManager
  */
-public class NodeImpl implements Node, Client {
+public class NodeImpl implements Node {
     private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
     private ProxyFactory proxyFactory;
     private CompositeActivator compositeActivator;
diff --git a/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 24c279948b..53c793806e 100644
--- a/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java
@@ -19,7 +19,6 @@
 
 package calculator;
 
-import org.apache.tuscany.sca.node.Client;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 
@@ -32,7 +31,7 @@ public class CalculatorClient {
 
         Node node = NodeFactory.newInstance().createNode((String)null, new String[] {"target/classes"}).start();
         
-        CalculatorService calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        CalculatorService calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent");
         
         // Calculate
         System.out.println("3 + 2=" + calculatorService.add(3, 2));