9 files changed, 31 insertions, 31 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
index b2eba45a6b..91e6dd8856 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/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-trip</artifactId>
     <name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
index ec90524518..a0aec4b777 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
@@ -21,10 +21,10 @@ package com.tuscanyscatours.trip.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 import com.tuscanyscatours.common.Book;
 import com.tuscanyscatours.common.Search;
@@ -36,7 +36,7 @@ import com.tuscanyscatours.common.TripLeg;
  * An implementation of the Trip service
  */
 @Scope("STATELESS")
-@Service(interfaces = {Search.class, Book.class})
+@Service({Search.class, Book.class})
 public class TripImpl implements Search, Book {
 
     private List<TripInfo> trips = new ArrayList<TripInfo>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
index 7f2efe2de7..278d66acd1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/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">
    <import.java package="com.tuscanyscatours.common"/>
    <export.java package="com.tuscanyscatours.trip.impl"/>
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
index fd2cc073ec..29e2058023 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
@@ -19,10 +19,10 @@
 
 package scatours.trip;
 
-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,15 +34,15 @@ import com.tuscanyscatours.common.TripItem;
  * 
  */
 public class TripTestCase {
-    private static SCANode tripNode;
+    private static Node tripNode;
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         try {
             tripNode =
-                SCANodeFactory.newInstance().createSCANode("trip.composite",
-                                                           new SCAContribution("trip", "./target/classes"),
-                                                           new SCAContribution("trip-test", "./target/test-classes"));
+                NodeFactory.getInstance().createNode("trip.composite",
+                                                           new Contribution("trip", "./target/classes"),
+                                                           new Contribution("trip-test", "./target/test-classes"));
 
             tripNode.start();
         } catch (Exception ex) {
@@ -52,7 +52,7 @@ public class TripTestCase {
 
     @Test
     public void testPayment() {
-        SCAClient client = (SCAClient)tripNode;
+        Node client = (Node)tripNode;
         Book booking = client.getService(Book.class, "Trip/Book");
         TripItem tripItem =
             new TripItem("1234", "5678", TripItem.TRIP, "FS1DEC06", "Florence and Siena pre-packaged tour", "FLR",
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
index 8d7ff59b0c..c16e387ad7 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
@@ -17,14 +17,14 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
              targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
+             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
              xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <!-- PolicySets -->
     <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
         <tuscany:jdkLogger name="myLogger">
             <logLevel>FINER</logLevel>
         </tuscany:jdkLogger>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
index 06c449633c..d96a5ed8e2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.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://scatours"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="packagedtrip">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
index 42fca6278f..f45f92c464 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/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-tripbooking</artifactId>
     <name>Apache Tuscany SCA Tours Trip Booking Contribution</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
index 0693d40465..c5eaa95f19 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
@@ -18,7 +18,7 @@
  */
 package com.tuscanyscatours.tripbooking;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 import com.tuscanyscatours.common.TripItem;
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
index 5d1e1f2db5..e5846bae5d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
@@ -18,11 +18,11 @@
  */
 package com.tuscanyscatours.tripbooking.impl;
 
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 import com.tuscanyscatours.common.Book;
 import com.tuscanyscatours.common.TripItem;
@@ -32,7 +32,7 @@ import com.tuscanyscatours.tripbooking.TripBooking;
 /**
  * An implementation of the TripBooking service
  */
-@Service(interfaces = {TripBooking.class})
+@Service({TripBooking.class})
 public class TripBookingImpl implements TripBooking {
 
     @Reference
@@ -82,7 +82,7 @@ public class TripBookingImpl implements TripBooking {
 
         // add trip to the shopping cart
         ServiceReference<CartUpdates> cart = componentContext.getServiceReference(CartUpdates.class, "cartUpdates");
-        cart.setConversationID(cartId);
+        // cart.setConversationID(cartId);
         cart.getService().addTrip(cartId, trip);
 
         return trip;