Update the travelsample with 2.x namespace/api/dependency (not completed yet)

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

1 files changed, 8 insertions, 8 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index b7d76a061f..b2ffc3fc4d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -19,10 +19,10 @@
 

 package scatours.payment.creditcard;

 

-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;

@@ -36,21 +36,21 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
  * 

  */

 public class CreditCardPaymentTestCase {

-    private static SCANode node;

+    private static Node node;

 

     /**

      * @throws java.lang.Exception

      */

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        node = factory.createSCANode(null, new SCAContribution("creditcard-sdo", "./target/classes"));

+        NodeFactory factory = NodeFactory.getInstance();

+        node = factory.createNode(new Contribution("creditcard-sdo", "./target/classes"));

         node.start();

     }

 

     @Test

     public void testCreditCardPayment() {

-        SCAClient client = (SCAClient)node;

+        Node client = (Node)node;

         CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");

 

         CreditCardPaymentFactory factory = CreditCardPaymentFactory.INSTANCE;