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

7 files changed, 204 insertions, 218 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);
     }