4 files changed, 63 insertions, 6 deletions
diff --git a/sandbox/travelsample/launchers/notification-corba/build.xml b/sandbox/travelsample/launchers/notification-corba/build.xml
new file mode 100644
index 0000000000..b931f708d1
--- /dev/null
+++ b/sandbox/travelsample/launchers/notification-corba/build.xml
@@ -0,0 +1,56 @@
+<!--
+ * 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-notification-corba" 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-nameserver">
+        <exec executable="${env.JAVA_HOME}/bin/tnameserv">
+            <arg value="-ORBInitialPort"/>
+            <arg value="5080"/>
+        </exec>
+    </target>
+
+    <target name="run">
+        <java classname="scatours.NotificationCORBALauncher" fork="true">
+            <classpath>
+                <pathelement location="target/classes"/>
+                <pathelement location="${env.TUSCANY_HOST_CORBA}/tuscany-host-corba-jse.jar"/>
+                <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/notification-corba-launcher/pom.xml b/sandbox/travelsample/launchers/notification-corba/pom.xml
index 68cceed970..abe8fdf4de 100644
--- a/sandbox/travelsample/launchers/notification-corba-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/notification-corba/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification-corba-launcher</artifactId>
+    <artifactId>scatours-launcher-notification-corba</artifactId>
     <name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>
 
     <dependencies>
@@ -55,7 +55,8 @@
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-	<dependency>
+
+        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse-tns</artifactId>
             <version>1.6-SNAPSHOT</version>
diff --git a/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/LaunchNotificationCORBANode.java b/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
index eec08b92c0..6b3147dce9 100644
--- a/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/LaunchNotificationCORBANode.java
+++ b/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
@@ -26,15 +26,15 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 
 import scatours.notification.Notification;
 
-public class LaunchNotificationCORBANode {
+public class NotificationCORBALauncher {
 
     public static void main(String[] args) throws Exception {
         SCAContribution notificationContribution = 
-            new SCAContribution("notification", 
-              "../../contributions/notification-contribution/target/classes");
+          new SCAContribution("notification", 
+            "../../contributions/notification/target/classes");
         SCAContribution notificationCORBAContribution = 
           new SCAContribution("notification-corba", 
-            "../../contributions/notification-corba-contribution/target/classes");
+            "../../contributions/notification-corba/target/classes");
 
         SCANode node = SCANodeFactory.newInstance().createSCANode(
             "notification-corba.composite", notificationContribution, notificationCORBAContribution);
diff --git a/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/notification/Notification.java b/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/notification/Notification.java
index 79706fcc9d..79706fcc9d 100644
--- a/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/notification/Notification.java
+++ b/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/notification/Notification.java