Apply new naming convention to notification-* launchers

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

25 files changed, 293 insertions, 125 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
diff --git a/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/smsgateway/SMSGateway.java
deleted file mode 100644
index b96d0b2473..0000000000
--- a/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/smsgateway/SMSGateway.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.    
- */
-
-package scatours.smsgateway;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * A gateway to send SMS messages.
- */
-@Remotable
-public interface SMSGateway {
-    boolean sendSMS(String fromNumber, String toNumber, String text);
-}
diff --git a/sandbox/travelsample/launchers/notification-ejb/build.xml b/sandbox/travelsample/launchers/notification-ejb/build.xml
new file mode 100644
index 0000000000..27d9ab92cd
--- /dev/null
+++ b/sandbox/travelsample/launchers/notification-ejb/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-notification-ejb" 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.NotificationEJBLauncher" 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/notification-ejb-launcher/pom.xml b/sandbox/travelsample/launchers/notification-ejb/pom.xml
index 3c3a622e4a..5326eb8deb 100644
--- a/sandbox/travelsample/launchers/notification-ejb-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/notification-ejb/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-notification-ejb-launcher</artifactId>

+    <artifactId>scatours-launcher-notification-ejb</artifactId>

     <name>Apache Tuscany SCA Tours Notification EJB Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/LaunchNotificationEJBNode.java b/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
index 3e367f8835..6b01299ca8 100644
--- a/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/LaunchNotificationEJBNode.java
+++ b/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
@@ -28,18 +28,18 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 

 import scatours.notification.Notification;

 

-public class LaunchNotificationEJBNode {

+public class NotificationEJBLauncher {

 

     public static void main(String[] args) throws Exception {

-      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");

-      System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");

+        System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");

+        System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");

 

-      SCAContribution notificationContribution = 

-            new SCAContribution("notification", 

-              "../../contributions/notification-contribution/target/classes");

+        SCAContribution notificationContribution = 

+          new SCAContribution("notification", 

+            "../../contributions/notification/target/classes");

         SCAContribution notificationEJBContribution = 

           new SCAContribution("notification-ejb", 

-            "../../contributions/notification-ejb-contribution/target/classes");

+            "../../contributions/notification-ejb/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

             "notification-ejb.composite", notificationContribution, notificationEJBContribution);

diff --git a/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/notification/Notification.java b/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/notification/Notification.java
index 79706fcc9d..79706fcc9d 100644
--- a/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/notification/Notification.java
+++ b/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/notification/Notification.java
diff --git a/sandbox/travelsample/launchers/notification-jms/build.xml b/sandbox/travelsample/launchers/notification-jms/build.xml
new file mode 100644
index 0000000000..1a0130aa82
--- /dev/null
+++ b/sandbox/travelsample/launchers/notification-jms/build.xml
@@ -0,0 +1,57 @@
+<!--

+ * 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-jms" 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-broker">

+        <java classname="scatours.JMSBrokerLauncher" fork="true">

+            <classpath>

+                <pathelement location="target/classes"/>

+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+            </classpath>

+        </java>

+    </target>

+

+    <target name="run">

+        <java classname="scatours.NotificationJMSLauncher" 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/notification-jms-launcher/pom.xml b/sandbox/travelsample/launchers/notification-jms/pom.xml
index 66930213f6..7574ed8cf3 100644
--- a/sandbox/travelsample/launchers/notification-jms-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/notification-jms/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-notification-jms-launcher</artifactId>

+    <artifactId>scatours-launcher-notification-jms</artifactId>

     <name>Apache Tuscany SCA Tours Notification JMS Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
index fee4c357a1..7d063ca865 100644
--- a/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java
+++ b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
@@ -20,7 +20,7 @@ package scatours;
 
 import org.apache.activemq.broker.BrokerService;
 
-public class LaunchJMSBroker {
+public class JMSBrokerLauncher {
 
     public static void main(String[] args) throws Exception {
       final BrokerService jmsBroker = new BrokerService();
diff --git a/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchNotificationJMSNode.java b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
index 2715a56fba..c0d6b5742e 100644
--- a/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchNotificationJMSNode.java
+++ b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
@@ -26,15 +26,15 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 

 import scatours.notification.Notification;

 

-public class LaunchNotificationJMSNode {

+public class NotificationJMSLauncher {

 

     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 notificationJMSContribution = 

           new SCAContribution("notification-jms", 

-            "../../contributions/notification-jms-contribution/target/classes");

+            "../../contributions/notification-jms/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

             "notification-jms.composite", notificationContribution, notificationJMSContribution);

diff --git a/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/notification/Notification.java b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java
index 79706fcc9d..79706fcc9d 100644
--- a/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/notification/Notification.java
+++ b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java
diff --git a/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/smsgateway/SMSGateway.java
deleted file mode 100644
index b96d0b2473..0000000000
--- a/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/smsgateway/SMSGateway.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.    
- */
-
-package scatours.smsgateway;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * A gateway to send SMS messages.
- */
-@Remotable
-public interface SMSGateway {
-    boolean sendSMS(String fromNumber, String toNumber, String text);
-}
diff --git a/sandbox/travelsample/launchers/notification-rmi/build.xml b/sandbox/travelsample/launchers/notification-rmi/build.xml
new file mode 100644
index 0000000000..70b5b18f77
--- /dev/null
+++ b/sandbox/travelsample/launchers/notification-rmi/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-notification-rmi" 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.NotificationRMILauncher" 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/notification-rmi-launcher/pom.xml b/sandbox/travelsample/launchers/notification-rmi/pom.xml
index a589727d6f..da85e9d9d3 100644
--- a/sandbox/travelsample/launchers/notification-rmi-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/notification-rmi/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-notification-rmi-launcher</artifactId>

+    <artifactId>scatours-launcher-notification-rmi</artifactId>

     <name>Apache Tuscany SCA Tours Notification RMI Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/LaunchNotificationRMINode.java b/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
index 96792b1343..6fdb064c16 100644
--- a/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/LaunchNotificationRMINode.java
+++ b/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
@@ -26,15 +26,15 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 

 import scatours.notification.Notification;

 

-public class LaunchNotificationRMINode {

+public class NotificationRMILauncher {

 

     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 notificationRMIContribution = 

           new SCAContribution("notification-rmi", 

-            "../../contributions/notification-rmi-contribution/target/classes");

+            "../../contributions/notification-rmi/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

             "notification-rmi.composite", notificationContribution, notificationRMIContribution);

diff --git a/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/notification/Notification.java b/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java
index 79706fcc9d..79706fcc9d 100644
--- a/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/notification/Notification.java
+++ b/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java
diff --git a/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/smsgateway/SMSGateway.java
deleted file mode 100644
index b96d0b2473..0000000000
--- a/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/smsgateway/SMSGateway.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.    
- */
-
-package scatours.smsgateway;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * A gateway to send SMS messages.
- */
-@Remotable
-public interface SMSGateway {
-    boolean sendSMS(String fromNumber, String toNumber, String text);
-}
diff --git a/sandbox/travelsample/launchers/notification-ws/build.xml b/sandbox/travelsample/launchers/notification-ws/build.xml
new file mode 100644
index 0000000000..8be5783cb3
--- /dev/null
+++ b/sandbox/travelsample/launchers/notification-ws/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-notification-ws" 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.NotificationWSLauncher" 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/notification-ws-launcher/pom.xml b/sandbox/travelsample/launchers/notification-ws/pom.xml
index 42b28b16c6..40a6b13ed5 100644
--- a/sandbox/travelsample/launchers/notification-ws-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/notification-ws/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-notification-ws-launcher</artifactId>

+    <artifactId>scatours-launcher-notification-ws</artifactId>

     <name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/LaunchNotificationWSNode.java b/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
index fd0f2519e3..08af2c3b58 100644
--- a/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/LaunchNotificationWSNode.java
+++ b/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
@@ -26,15 +26,15 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 

 import scatours.notification.Notification;

 

-public class LaunchNotificationWSNode {

+public class NotificationWSLauncher {

 

     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 notificationWSContribution = 

           new SCAContribution("notification-ws", 

-            "../../contributions/notification-ws-contribution/target/classes");

+            "../../contributions/notification-ws/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

             "notification-ws.composite", notificationContribution, notificationWSContribution);

diff --git a/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/notification/Notification.java b/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java
index 79706fcc9d..79706fcc9d 100644
--- a/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/notification/Notification.java
+++ b/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index 3ffe665142..edfccff641 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -54,11 +54,11 @@
                 <module>fullapp-domain</module>
                 <module>fullapp-nodes</module>
                 <module>help-pages</module>
-                <module>notification-ws-launcher</module>
-                <module>notification-corba-launcher</module>
-                <module>notification-ejb-launcher</module>
-                <module>notification-jms-launcher</module>
-                <module>notification-rmi-launcher</module>
+                <module>notification-ws</module>
+                <module>notification-corba</module>
+                <module>notification-ejb</module>
+                <module>notification-jms</module>
+                <module>notification-rmi</module>
                 <module>policy</module>
             </modules>
         </profile>