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

1 files changed, 9 insertions, 11 deletions

diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
index cd76747cb5..acc92c10b2 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
@@ -18,10 +18,8 @@
  * 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"
-           xmlns:pp="http://www.example.org/PaymentProcess"
            name="ui">
            
     <component name="scatours">
@@ -29,19 +27,19 @@
         <service name="Widget">
             <tuscany:binding.http uri="/scatours"/>
         </service>
-        <reference name="scaToursCatalog" target="SCAToursComponent/SCAToursSearch">
+        <reference name="scaToursCatalog" target="SCATours/SCAToursSearch">
             <tuscany:binding.jsonrpc/>
         </reference> 
-        <reference name="scaToursBooking" target="SCAToursComponent/SCAToursBooking">
+        <reference name="scaToursBooking" target="SCATours/SCAToursBooking">
             <tuscany:binding.jsonrpc/>
         </reference>
-        <reference name="scaToursCart" target="SCAToursComponent/SCAToursCart">
+        <reference name="scaToursCart" target="SCATours/SCAToursCart">
             <tuscany:binding.jsonrpc/>
         </reference>                
     </component>   
     
-    <component name="SCAToursComponent">
-        <implementation.java class="scatours.SCAToursImpl"/>
+    <component name="SCATours">
+        <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/>
         <service name="SCAToursSearch">
             <tuscany:binding.jsonrpc/>
         </service>
@@ -51,9 +49,9 @@
         <service name="SCAToursCart">
             <tuscany:binding.jsonrpc/>
         </service>        
-        <reference name="travelCatalogSearch" target="TravelCatalogComponent/TravelCatalogSearch"/>
-        <reference name="tripBooking" target="TripBookingComponent/TripBooking"/>
-        <reference name="shoppingCart" target="ShoppingCartComponent/ShoppingCart"/>       
+        <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/>
+        <reference name="tripBooking" target="TripBooking"/>
+        <reference name="shoppingCart" target="ShoppingCart"/>       
     </component>    
    
 </composite>