4 files changed, 15 insertions, 44 deletions
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7b3f7b6a0e..0000000000
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.currencyconverter"/>
-   <export.java package="scatours.travelcatalog"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/contributions/travelcatalog/pom.xml
index 10d992f227..81d3cb56d0 100644
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/travelcatalog/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-travelcatalog-contribution</artifactId>
+    <artifactId>scatours-contribution-travelcatalog</artifactId>
     <name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>
 
     <dependencies>
@@ -43,19 +43,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-tripbooking-contribution</artifactId>
+            <artifactId>scatours-contribution-currency</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
index 480fb96f7e..e558439f82 100644
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java
+++ b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.travelcatalog;
+package com.tuscanyscatours.travelcatalog;
 
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
 
 /**
- * The Trip service interface
+ * The TravelCatalogSearch service interface
  */
 @Remotable
 public interface TravelCatalogSearch {
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
index 124bdbf73c..31e035bcdc 100644
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
+++ b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.travelcatalog;
+package com.tuscanyscatours.travelcatalog.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,14 +32,15 @@ import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import scatours.currencyconverter.CurrencyConverter;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
+import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
 
 /**
- * An implementation of the Trip service
+ * An implementation of the travel catalog service
  */
 @Scope("COMPOSITE")
 @Service(interfaces={TravelCatalogSearch.class})