1 files changed, 19 insertions, 19 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
index b38f2a9e9c..59fc9ef68c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
 
 package scatours.payment;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+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;
@@ -33,42 +33,42 @@ import com.tuscanyscatours.payment.Payment;
  * 
  */
 public class PaymentTestCase {
-    private static SCANode paymentNode;
-    private static SCANode creditCardNode;
-    private static SCANode emailGatewayNode;
+    private static Node paymentNode;
+    private static Node creditCardNode;
+    private static Node emailGatewayNode;
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         creditCardNode =
-            SCANodeFactory.newInstance()
-                .createSCANode("creditcard.composite",
-                               new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+            NodeFactory.getInstance()
+                .createNode("creditcard.composite",
+                               new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
 
         creditCardNode.start();
 
         emailGatewayNode =
-            SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
-                                                       new SCAContribution("emailgateway",
+            NodeFactory.getInstance().createNode("emailgateway.composite",
+                                                       new Contribution("emailgateway",
                                                                            "../emailgateway/target/classes"),
-                                                       new SCAContribution("emailgateway-test",
+                                                       new Contribution("emailgateway-test",
                                                                            "../emailgateway/target/test-classes"));
 
         emailGatewayNode.start();
 
         paymentNode =
-            SCANodeFactory.newInstance()
-                .createSCANode(null,
-                               new SCAContribution("payment-bpel-process",
+            NodeFactory.getInstance()
+                .createNode(
+                               new Contribution("payment-bpel-process",
                                                    "../payment-bpel-process/target/classes"),
-                               new SCAContribution("payment-bpel", "./target/classes"),
-                               new SCAContribution("payment-bpel-test", "./target/test-classes"));
+                               new Contribution("payment-bpel", "./target/classes"),
+                               new Contribution("payment-bpel-test", "./target/test-classes"));
 
         paymentNode.start();
     }
 
     @Test
     public void testPayment() {
-        SCAClient client = (SCAClient)paymentNode;
+        Node client = (Node)paymentNode;
         Payment payment = client.getService(Payment.class, "PaymentClient");
         System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
     }