Fix naming inconsistencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815338 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 8 insertions, 9 deletions

diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml b/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml
index cb1fdbecc0..e5d88b7d2e 100644
--- a/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-databinding-client-contribution</artifactId>
+    <artifactId>scatours-contribution-databinding-client</artifactId>
     <name>Apache Tuscany SCA Tours Databinding Client Contribution</name>
 
     <dependencies>
@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-payment-java-contribution</artifactId>
+            <artifactId>scatours-contribution-payment-java</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java
index 1595eb4a01..8f69ce9d5f 100644
--- a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java
+++ b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java
@@ -24,7 +24,7 @@ import java.math.BigDecimal;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-import payment.Payment;
+import com.tuscanyscatours.payment.Payment;
 
 @Service(Runnable.class)
 public class TestClient {
diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml
index e90a37cae2..3513bb437e 100644
--- a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -20,7 +20,6 @@
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:client="http://client.scatours/">
     <export namespace="http://client.scatours/" />
-    <import.java package="com.tuscanyscatours" />
-    <import.java package="payment" />
+    <import.java package="com.tuscanyscatours.payment" />
     <deployable composite="client:Client" />
 </contribution>
diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite
index 83320d2ac1..e19697290c 100644
--- a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite
@@ -23,6 +23,6 @@
 
     <component name="TestClient">
         <implementation.java class="scatours.client.TestClient" />
-        <reference name="payment" target="PaymentComponent" />
-     </component>
+        <reference name="payment" target="Payment" />
+    </component>
 </composite>
diff --git a/sandbox/travelsample/contributions/payment-bpel/pom.xml b/sandbox/travelsample/contributions/payment-bpel/pom.xml
index 41cf6fc0b0..91405ec67a 100644
--- a/sandbox/travelsample/contributions/payment-bpel/pom.xml
+++ b/sandbox/travelsample/contributions/payment-bpel/pom.xml
@@ -73,14 +73,14 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-emailgateway-contribution</artifactId>
+            <artifactId>scatours-contribution-emailgateway</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>
+            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>