Apply the new naming conventions to the fullapp contributions and launchers

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

2 files changed, 37 insertions, 10 deletions

diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..45344f051d
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,28 @@
+<?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"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:bespoketrip" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.hotel" />
+    <import.java package="com.tuscanyscatours.hotel.impl" />
+    <import.java package="com.tuscanyscatours.flight.impl" />
+    <import.java package="com.tuscanyscatours.car.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
index 8e3d6fb2e5..d746337917 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
@@ -18,13 +18,12 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
+           targetNamespace="http://tuscanyscatours.com/"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="bespoketrip">
     
-    <component name="HotelComponent">
-        <implementation.java class="scatours.hotel.HotelImpl"/>
+    <component name="Hotel">
+        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
         <service name="Search">
             <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
             <!-- tuscany:binding.jsonrpc name="searchjsonrpc"/-->
@@ -35,11 +34,11 @@
         <service name="Book"/>
     </component>  
     
-    <component name="FlightComponent">
-        <implementation.java class="scatours.flight.FlightImpl"/>
+    <component name="Flight">
+        <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 name="searchws" uri="http://localhost:8086/Flight/Search"/>
             <tuscany:binding.jsonrpc name="searchjsonrpc"/>
             <callback>
@@ -49,8 +48,8 @@
         <service name="Book"/>
     </component> 
     
-    <component name="CarComponent">
-        <implementation.java class="scatours.car.CarImpl"/>
+    <component name="Car">
+        <implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
         <service name="Search">
             <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
             <tuscany:binding.jsonrpc name="searchjsonrpc"/>