Merge itest changes from sca-equinox branch into trunk

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

1 files changed, 6 insertions, 6 deletions

diff --git a/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index b6e0444d2d..10fbac4e20 100644
--- a/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/java/sca/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
@@ -24,9 +24,9 @@ import java.io.ByteArrayInputStream;
 import junit.framework.Assert;
 import helloworld.HelloWorldService;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.ws.security.util.Base64;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -39,18 +39,18 @@ import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 
 public class BasicAuthTestCase {
-    private static SCANode node;
+    private static Node node;
     private static HelloWorldService service;
 
     @BeforeClass
     public static void init() throws Exception {
         try {
-            SCANodeFactory factory = SCANodeFactory.newInstance();
+            NodeFactory factory = NodeFactory.newInstance();
             node = factory.createSCANodeFromClassLoader("helloworld.composite", 
                                                         BasicAuthTestCase.class.getClassLoader());
             node.start();
             
-            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+            service = ((Client)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
         } catch (Exception ex) {
             ex.printStackTrace();
         }