7 files changed, 22 insertions, 22 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
index b480cc4aa1..976e2fc0b6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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-spring-scatag/src/main/resources/Payment-context.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
index 83776cde1b..d2f757c8ca 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
@@ -21,7 +21,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sca="http://www.springframework.org/schema/sca"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+                           http://www.springframework.org/schema/sca http://docs.oasis-open.org/ns/opencsa/sca/200912/spring-sca.xsd">
 
     <sca:service name="Payment"
                  type="com.tuscanyscatours.payment.Payment" 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
index 639f1e5662..7b923e397e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
index 29fda50ef3..f2a4ecbcb6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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;
@@ -33,23 +33,23 @@ import com.tuscanyscatours.payment.Payment;
  * 
  */
 public class PaymentTestCase {
-    private static SCANode paymentNode;
-    private static SCANode creditCardNode;
+    private static Node paymentNode;
+    private static Node creditCardNode;
 
     @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();
 
         paymentNode =
-            SCANodeFactory.newInstance().createSCANode(null,
-                                                       new SCAContribution("payment-spring-annotation",
+            NodeFactory.getInstance().createNode(
+                                                       new Contribution("payment-spring-annotation",
                                                                            "./target/classes"),
-                                                       new SCAContribution("payment-spring-annotation-test",
+                                                       new Contribution("payment-spring-annotation-test",
                                                                            "./target/test-classes"));
 
         paymentNode.start();
@@ -57,7 +57,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-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index 4f64b20c4e..3fee35a1db 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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-spring-scatag/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
index b5639eb1f9..d4b14f7c88 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/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/">
-    <import.java package="com.tuscanyscatours.payment"/>
     <deployable composite="scatours:paymentClient" />
+    <import.java package="com.tuscanyscatours.payment"/>
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
index 642cebfd1c..b442a46101 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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">