Update interaction-* and calendar contributions and launcher to new naming convention

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

2 files changed, 14 insertions, 14 deletions

diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
index 716264650c..c26d63563b 100644
--- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
@@ -18,9 +18,9 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:client="http://client.scatours/">
-    <import.java package="scatours.common"/>
-    <import.java package="scatours.hotel"/>
-    <import.java package="scatours.flight"/>
-    <deployable composite="client:Client" />
+              xmlns:tours="http://com.tuscanyscatours/">
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.flight.impl" />
+    <import.java package="com.tuscanyscatours.hotel.impl" />
+    <deployable composite="tours:service" />
 </contribution>
diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
index 4c693864bb..ceeeacd49d 100644
--- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
@@ -18,29 +18,29 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://service.scatours/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="Service">
      
      <component name="Hotel">
-        <implementation.java class="scatours.hotel.HotelImpl"/>
+        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
         <service name="Search">
-            <interface.java interface="scatours.common.Search" 
-                    callbackInterface="scatours.common.SearchCallback"/>
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
             <binding.ws uri="http://localhost:8081/Hotel/Search"/>
             <callback>
-                <binding.ws uri="http://localhost:8080/Client/SearchCallback"/>
+                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallback"/>
             </callback>            
         </service>
     </component> 
     
      <component name="Flight">
-        <implementation.java class="scatours.flight.FlightImpl"/>
+        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
         <service name="Search">
-            <interface.java interface="scatours.common.Search" 
-                    callbackInterface="scatours.common.SearchCallback"/>
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
             <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/>
             <callback>
-                <binding.ws uri="http://localhost:8080/Client/SearchCallbackConversational"/>
+                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallbackConversational"/>
             </callback>            
         </service>
     </component>