15 files changed, 13 insertions, 6 deletions
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/pom.xml b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml
index 1b15360cea..9fb34dba76 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml
@@ -25,8 +25,8 @@
         <version>1.4</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
-    <artifactId>scatours-chapter-09-creditcard-payment-contribution</artifactId>
-    <name>Apache Tuscany SCA Tours Chapter 09 Credit Card Payment Contribution</name>
+    <artifactId>scatours-chapter-09-creditcard-payment-sdo-contribution</artifactId>
+    <name>Apache Tuscany SCA Tours Chapter 09 SDO-based Credit Card Payment Contribution</name>
 
     <dependencies>
         <dependency>
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/java/payment/creditcard/CreditCardPayment.java b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/CreditCardPayment.java
index 5b333648f4..5b333648f4 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/java/payment/creditcard/CreditCardPayment.java
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/CreditCardPayment.java
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java
index 178268eac1..178268eac1 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/java/payment/creditcard/impl/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl
index f73279e7d8..f73279e7d8 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/resources/creditcard.composite b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
index 938385dbf9..938385dbf9 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/main/resources/creditcard.composite
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 041e4e4847..041e4e4847 100644
--- a/sandbox/travelsample/chapter-09/creditcard-payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-09/pom.xml b/sandbox/travelsample/chapter-09/pom.xml
index a7d174c987..8fac6c9a59 100644
--- a/sandbox/travelsample/chapter-09/pom.xml
+++ b/sandbox/travelsample/chapter-09/pom.xml
@@ -39,7 +39,7 @@
                 <module>node</module>
                 <module>ui-contribution</module>
                 <module>payment-contribution</module>
-                <module>creditcard-payment-contribution</module>
+                <module>creditcard-payment-sdo-contribution</module>
             </modules>
         </profile>
 
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
index 218be91b71..0a40fd2413 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
@@ -25,18 +25,25 @@
         <version>1.4</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
-    <artifactId>scatours-creditcardpayment-contribution</artifactId>
+    <artifactId>scatours-credit-cardpayment-jaxb-contribution</artifactId>
     <name>Apache Tuscany SCA Tours Credit Card Payment Contribution</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
+            <artifactId>tuscany-node-api</artifactId>
             <version>1.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.4</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             <version>1.4</version>
             <scope>runtime</scope>
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
index 450485e466..450485e466 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
index c194d78982..c194d78982 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 0c25509ab3..0c25509ab3 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/resources/creditcard.composite b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
index d0721a8bae..d0721a8bae 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/resources/creditcard.composite
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
diff --git a/sandbox/travelsample/shared-contributions/pom.xml b/sandbox/travelsample/shared-contributions/pom.xml
index 73159492e5..648c067f92 100644
--- a/sandbox/travelsample/shared-contributions/pom.xml
+++ b/sandbox/travelsample/shared-contributions/pom.xml
@@ -39,7 +39,7 @@
                 <module>calendar-contribution</module>
                 <module>car-contribution</module>
                 <module>common-contribution</module>
-                <module>creditcardpayment-contribution</module>
+                <module>creditcard-payment-jaxb-contribution</module>
                 <module>currency-contribution</module>
                 <module>emailgateway-contribution</module>
                 <module>flight-contribution</module>