1 files changed, 2 insertions, 112 deletions
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
index 3e03a2deb4..0aac7fe092 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
@@ -22,7 +22,7 @@
            xmlns:scatours="http://scatours"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            xmlns:pp="http://www.example.org/PaymentProcess"
-           name="scatours">
+           name="ui">
            
     <component name="scatours">
         <tuscany:implementation.widget location="scatours.html"/>
@@ -38,116 +38,6 @@
         <reference name="scaToursCart" target="SCAToursComponent/SCAToursCart">
             <tuscany:binding.jsonrpc/>
         </reference>                
-    </component>
-    
-    <component name="SCAToursComponent">
-        <implementation.java class="scatours.SCAToursImpl"/>
-        <service name="SCAToursSearch">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="SCAToursBooking">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <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"/>       
-    </component>
-    
-    <component name="TravelCatalogComponent">
-        <implementation.java class="scatours.travelcatalog.TravelCatalogImpl"/>
-        <service name="TravelCatalogSearch"/>
-        <reference name="hotelSearch" target="HotelComponent/Search">
-            <binding.sca/>
-        </reference>
-        <reference name="flightSearch">
-            <interface.java interface="scatours.common.Search" 
-                            callbackInterface="scatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8080/Flight/Search"/>
-            <callback>
-                <binding.ws uri="http://localhost:8080/Flight/SearchCallback"/>
-            </callback>
-        </reference> 
-        <reference name="carSearch" target="CarComponent/Search">
-            <binding.sca/>
-        </reference>    
-        <reference name="tripSearch" target="TripComponent/Search">
-            <binding.sca/>
-        </reference>     
-        <reference name="currencyConverter" target="CurrencyConverterComponent">
-        </reference>
-        <property name="quoteCurrencyCode">GBP</property>
-    </component>
-    
-    <component name="CurrencyConverterComponent">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
-    </component>    
-    
-    <component name="TripBookingComponent">
-        <implementation.java class="scatours.tripbooking.TripBookingImpl"/>
-        <service name="TripBooking"/>
-        <reference name="hotelBook" target="HotelComponent/Book"/>
-        <reference name="flightBook" target="TripComponent/Book"/>
-        <reference name="carBook" target="CarComponent/Book"/>   
-        <reference name="tripBook" target="TripComponent/Book"/>  
-        <reference name="shoppingCart" target="ShoppingCartComponent/ShoppingCart"/>      
-    </component>    
-        
-    <component name="HotelComponent">
-        <implementation.java class="scatours.hotel.HotelImpl"/>
-        <service name="Search">
-            <binding.sca/>
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="Book"/>
-    </component>  
-    
-    <component name="FlightComponent">
-        <implementation.java class="scatours.flight.FlightImpl"/>
-        <service name="Search">
-            <interface.java interface="scatours.common.Search" 
-                            callbackInterface="scatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8080/Flight/Search"/>
-            <tuscany:binding.jsonrpc/>
-            <callback>
-                <binding.ws uri="http://localhost:8080/Flight/SearchCallback"/>
-            </callback>            
-        </service>
-        <service name="Book"/>
-    </component> 
-    
-    <component name="CarComponent">
-        <implementation.java class="scatours.car.CarImpl"/>
-        <service name="Search">
-            <binding.sca/>
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="Book"/>        
     </component>   
-    
-    <component name="TripComponent">
-        <implementation.java class="scatours.trip.TripImpl"/>
-        <service name="Search">
-            <binding.sca/>
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="Book"/>        
-    </component> 
-    
-    <component name="ShoppingCartComponent">
-        <implementation.java class="scatours.shoppingcart.ShoppingCartImpl"/>
-        <service name="ShoppingCart"/>
-        <reference name="cartStore" target="CartStoreComponent/CartStore"/>     
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference> 
-    </component>    
-    
-    <component name="CartStoreComponent">
-        <implementation.java class="scatours.shoppingcart.CartStoreImpl"/>
-        <service name="CartStore"/>
-    </component> 
-
+   
 </composite>