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

7 files changed, 27 insertions, 27 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
index bd33f12b75..40a16070b2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
@@ -22,10 +22,10 @@
     <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>
+    <version>2.0-SNAPSHOT</version>
     <artifactId>scatours-contribution-payment-groovy</artifactId>
     <name>Apache Tuscany SCA Tours Payment Groovy Contribution</name>
 
@@ -59,7 +59,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/payment-groovy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
index 36e2990be1..63b79a7f63 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
     * 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/">
-    <export.java package="com.tuscanyscatours.payment" />
     <deployable composite="tours:payment" />
+    <export.java package="com.tuscanyscatours.payment" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
index 071c6786d1..d0aef3188c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.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/"
            xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
index 907bcc93f8..440fbd9721 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/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;

@@ -34,32 +34,32 @@ 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-groovy", "./target/classes"),

-                                                       new SCAContribution("payment-groovy-test",

+            NodeFactory.getInstance().createNode(

+                                                       new Contribution("payment-groovy", "./target/classes"),

+                                                       new Contribution("payment-groovy-test",

                                                                            "./target/test-classes"));

 

         paymentNode.start();

@@ -67,7 +67,7 @@ public class PaymentTestCase {
 

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

     }

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index a38ba51ac5..3b8d8ad88a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -19,8 +19,8 @@
 

 package scatours.payment.client.impl;

 

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

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

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

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

 

 import com.tuscanyscatours.payment.Payment;

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
index 378e09009b..666769fef5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/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:paymentClient" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
index 353c1cea04..93482dfb45 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.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="paymentClient">