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

5 files changed, 14 insertions, 14 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
index 56eafd7c07..082d3e0fe5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
@@ -22,9 +22,9 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>scatours</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
+    </parent><version>2.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-creditcard-payment-sdo</artifactId>
     <name>Apache Tuscany SCA Tours Credit Card Payment Contribution SDO</name>
 
@@ -69,7 +69,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index ed817a58bb..13dc7428d1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -19,7 +19,7 @@
 

 package com.tuscanyscatours.payment.creditcard.impl;

 

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.Service;

 

 import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

 import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
index ab31664247..34f5ec3d0e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:tours="http://tuscanyscatours.com/">
     <deployable composite="tours:creditcard" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
index f5cd7c2506..392af83d2e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
            targetNamespace="http://tuscanyscatours.com/"
            name="creditcard">
 
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;