6 files changed, 31 insertions, 8 deletions
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
index f2a82bca4b..d7ada5afe7 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
@@ -18,5 +18,5 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.currencyconverter"/>
-</contribution>
-\ No newline at end of file
+    <export.java package="com.tuscanyscatours.common" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/currency-contribution/pom.xml b/sandbox/travelsample/contributions/currency/pom.xml
index 42d3e7ec8e..0a5d00cef8 100644
--- a/sandbox/travelsample/contributions/currency-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/currency/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-currency-contribution</artifactId>
+    <artifactId>scatours-contribution-currency</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
index 6d0efc8c66..24d945b2f4 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.currencyconverter;
+package com.tuscanyscatours.currencyconverter;
 
 import org.osoa.sca.annotations.Remotable;
 
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
index 533e6795d7..13519a4969 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.currencyconverter;
+package com.tuscanyscatours.currencyconverter.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
 import org.osoa.sca.annotations.Service;
 
 /**
diff --git a/sandbox/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b11328f405
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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">
+    <export.java package="com.tuscanyscatours.currencyconverter" />
+    <export.java package="com.tuscanyscatours.currencyconverter.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/currency-converter.composite b/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
index 13d4e9a45c..41d0d325d4 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/currency-converter.composite
+++ b/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
@@ -18,12 +18,11 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">
 
     <component name="CurrencyConverter">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl" />
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />
         <service name="CurrencyConverter"/>
     </component>
 </composite>