11 files changed, 62 insertions, 13 deletions
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/pom.xml b/sandbox/travelsample/contributions/feed-logger/pom.xml
index 2b54ba5b7d..2c70e79528 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/feed-logger/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-feed-logger-contribution</artifactId>
+    <artifactId>scatours-contribution-feed-logger</artifactId>
     <name>Apache Tuscany SCA Tours Feed Logger Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/feedlogger/FeedLogger.java b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java
index 8187e34d2c..0f5d18d53b 100644
--- a/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/feedlogger/FeedLogger.java
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package scatours.feedlogger;
+package com.tuscanyscatours.feedlogger;
 
 public interface FeedLogger {
 
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
index aada73fd83..7f1e25a828 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
@@ -17,10 +17,12 @@
  * under the License.
  */
 
-package scatours.feedlogger;
+package com.tuscanyscatours.feedlogger.impl;
 
 import java.util.List;
 
+import com.tuscanyscatours.feedlogger.FeedLogger;
+
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.osoa.sca.annotations.Reference;
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
index 181a1ec77c..556807a0f0 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
@@ -18,5 +18,4 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.feedlogger"/>
-</contribution>
-\ No newline at end of file
+</contribution>
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/feed-logger.composite b/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
index 62f5f2258c..17c24adefb 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/feed-logger.composite
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
@@ -19,14 +19,14 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
-    name="feed-logger">
+    targetNamespace="http://tuscanyscatours.com/"
+    name="feedLogger">
 
     <service name="FeedLogger" promote="FeedLogger">
     </service>
 
     <component name="FeedLogger">
-        <implementation.java class="scatours.feedlogger.FeedLoggerImpl"/>
+        <implementation.java class="com.tuscanyscatours.feedlogger.impl.FeedLoggerImpl"/>
         <reference name="scaToursBlogAtom">
             <tuscany:binding.atom uri="http://scatours.wordpress.com/?feed=atom"/>
         </reference>
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index e81c225276..63042e9deb 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -52,7 +52,7 @@
                 <module>currency-ws</module>
                 <module>databinding-client</module>
                 <module>emailgateway</module>
-                <module>feed-logger-contribution</module>
+                <module>feed-logger</module>
                 <module>flight</module>
                 <module>fullapp-ui</module>
                 <module>fullapp-frontend</module>
diff --git a/sandbox/travelsample/launchers/feed-logger/build.xml b/sandbox/travelsample/launchers/feed-logger/build.xml
new file mode 100644
index 0000000000..e772c2f67a
--- /dev/null
+++ b/sandbox/travelsample/launchers/feed-logger/build.xml
@@ -0,0 +1,48 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-launcher-feed-logger" default="compile">
+    <property environment="env"/> 
+
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+            <src path="src/main/java"/>
+            <classpath>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="run">
+        <java classname="scatours.FeedLoggerLauncher" fork="true">
+            <classpath>
+                <pathelement location="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+</project>
diff --git a/sandbox/travelsample/launchers/feed-logger-launcher/pom.xml b/sandbox/travelsample/launchers/feed-logger/pom.xml
index e6d7e43297..339ad7b975 100644
--- a/sandbox/travelsample/launchers/feed-logger-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/feed-logger/pom.xml
@@ -25,7 +25,7 @@
         <version>1.5</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-feed-logger-launcher</artifactId>
+    <artifactId>scatours-launcher-feed-logger</artifactId>
     <name>Apache Tuscany SCA Tours Feed Logger Launcher</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/LaunchFeedLoggerNode.java b/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
index 02ab6155dd..a92c149d77 100644
--- a/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/LaunchFeedLoggerNode.java
+++ b/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
@@ -26,12 +26,12 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 
 import scatours.feedlogger.FeedLogger;
 
-public class LaunchFeedLoggerNode {
+public class FeedLoggerLauncher {
 
     public static void main(String[] args) throws Exception {
         SCAContribution feedContribution = 
           new SCAContribution("feed-logger", 
-              "../../contributions/feed-logger-contribution/target/classes");
+              "../../contributions/feed-logger/target/classes");
 
         SCANode node = SCANodeFactory.newInstance().createSCANode(
             "feed-logger.composite", feedContribution);
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java b/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/feedlogger/FeedLogger.java
index 8187e34d2c..8187e34d2c 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java
+++ b/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/feedlogger/FeedLogger.java
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index fcbd21048c..a9b4ca8b61 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -44,7 +44,7 @@
                 <module>currency-converter-rmi</module>
                 <module>currency-converter-ws</module>
                 <module>databinding</module>
-                <module>feed-logger-launcher</module>
+                <module>feed-logger</module>
                 <module>interaction</module>
                 <module>introducing</module>
                 <module>introducing-client</module>