Apply new naming convention to notification-* launchers

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

4 files changed, 5 insertions, 35 deletions

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