Apply new naming convention to notification-* contributions

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

4 files changed, 9 insertions, 32 deletions

diff --git a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 27cf45a116..0000000000
--- a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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">

-   <import.java package="scatours.notification"/>

-   <import.java package="scatours.smsgateway"/>

-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/notification-rmi-contribution/pom.xml b/sandbox/travelsample/contributions/notification-rmi/pom.xml
index ecf070279a..3edec653fd 100644
--- a/sandbox/travelsample/contributions/notification-rmi-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/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</artifactId>

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

     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway RMI Service</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
index 27cf45a116..373d1494f6 100644
--- a/sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,7 @@
     * under the License.    

 -->

 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

-   <import.java package="scatours.notification"/>

-   <import.java package="scatours.smsgateway"/>

-</contribution>
\ No newline at end of file
+    <import.java package="com.tuscanyscatours.notification" />

+    <import.java package="com.tuscanyscatours.notification.impl" />

+    <import.java package="com.tuscanyscatours.smsgateway" />

+</contribution>

diff --git a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/notification-rmi.composite b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
index c6de1fae52..e80c381b55 100644
--- a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/notification-rmi.composite
+++ b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
@@ -18,19 +18,18 @@
     * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="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="notification">
 
     <component name="Notification">
-        <implementation.java class="scatours.notification.NotificationImpl" />
+        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
         <service name="Notification">
-            <interface.java interface="scatours.notification.Notification"/>
+            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
         </service>
 
         <reference name="smsGateway">
-            <interface.java interface="scatours.smsgateway.SMSGateway"/>
+            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
             <tuscany:binding.rmi host="localhost" port="8099" serviceName="SMSGatewayRMI"/>
         </reference>
     </component>