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

9 files changed, 31 insertions, 31 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
index a8a873e132..f8c27ca09b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/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-java</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Contribution</name>
 
@@ -52,7 +52,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-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index bc76f411f3..906e392459 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -23,12 +23,12 @@ import java.util.Collection;
 import java.util.HashMap;

 import java.util.Map;

 

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

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

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

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

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

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

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

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

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

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

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

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

 

 import com.tuscanyscatours.customer.Customer;

 import com.tuscanyscatours.customer.CustomerNotFoundException;

@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
 @Service(CustomerRegistry.class)

 @Scope("COMPOSITE")

 @EagerInit

-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")

+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")

 public class CustomerRegistryImpl implements CustomerRegistry {

     private volatile static int idGenerator = 0;

     private Map<String, Customer> customers = new HashMap<String, Customer>();

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
index 8c6ca806d2..d4aa8125e7 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
@@ -19,7 +19,7 @@
 

 package com.tuscanyscatours.emailgateway;

 

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

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

 

 /**

  * A gateway to send e-mail

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index a6a162d5c3..1ae87d00cc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -19,7 +19,7 @@
 

 package com.tuscanyscatours.emailgateway.impl;

 

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

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

 

 import com.tuscanyscatours.emailgateway.EmailGateway;

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 988605f7cd..f384a9ac2a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -19,9 +19,9 @@
 

 package com.tuscanyscatours.payment.impl;

 

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

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

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

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

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

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

 

 import com.tuscanyscatours.customer.Customer;

 import com.tuscanyscatours.customer.CustomerNotFoundException;

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
index f8ff7b4623..52b8928c7e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/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:scatours="http://tuscanyscatours.com/">

-    <export.java package="com.tuscanyscatours.payment" />

     <deployable composite="scatours:payment" />

+    <export.java package="com.tuscanyscatours.payment" />

 </contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
index dc47395e9b..a5f3379087 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">

+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"

+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">

 

     <!-- Policy Intents Defined by the SCA Runtime -->

     <intent name="authorization" constrains="sca:implementation"/>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
index b4dcd328b1..b90c94b845 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/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/"

            name="payment">

            

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
index ead8b87db0..b5345d6be8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/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.Ignore;

@@ -31,22 +31,22 @@ import org.junit.Test;
 import com.tuscanyscatours.payment.Payment;

 

 public class PaymentTestCase {

-    private static SCANode node;

+    private static Node node;

 

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

         node =

-            SCANodeFactory.newInstance()

-                .createSCANode(null,

-                               new SCAContribution("payment", "./target/classes"),

-                               new SCAContribution("creditcard",

+            NodeFactory.getInstance()

+                .createNode(

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

+                               new Contribution("creditcard",

                                                    "../../contributions/creditcard-payment-jaxb/target/classes"));

         node.start();

     }

 

     @Test

     public void testPayment() {

-        SCAClient client = (SCAClient)node;

+        Node client = (Node)node;

         Payment payment = client.getService(Payment.class, "Payment");

 

         System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));