Add the changes and configuration necessary to allow the full travel sample to run under the control of the domain manager. The domain manager changes rely on some changes in order to run. Namely TUSCANY-3070/3075/3062.

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

2 files changed, 20 insertions, 26 deletions

diff --git a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/META-INF/sca-contribution.xml
index 7f689a2b1a..88b1c66441 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -21,12 +21,13 @@
    xmlns:scatours="http://scatours">
    <deployable composite="scatours:frontend"/>
    <import.java package="scatours"/>
-   <import.java package="scatours.tripbooking"/>
-   <import.java package="scatours.travelcatalog"/>
    <import.java package="scatours.common"/>
    <import.java package="scatours.hotel"/>
    <import.java package="scatours.flight"/>
    <import.java package="scatours.car"/>
    <import.java package="scatours.trip"/>
    <import.java package="scatours.currencyconverter"/>
+   <import.java package="scatours.tripbooking"/>
+   <import.java package="scatours.travelcatalog"/> 
+   <import.java package="scatours.shoppingcart"/>  
 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/scatours.composite
index 3225f1ddf1..f3e445312a 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/scatours.composite
@@ -23,41 +23,34 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="frontend">
     
-    <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 name="hotelSearch">
+            <binding.ws uri="http://localhost:8086/Hotel/Search"/>
+            <callback>
+                <binding.ws uri="http://localhost:8084/Hotel/SearchCallback"/>
+            </callback>
         </reference>
         <reference name="flightSearch">
             <interface.java interface="scatours.common.Search" 
                             callbackInterface="scatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8080/Flight/Search"/>
+            <binding.ws uri="http://localhost:8086/Flight/Search"/>
             <callback>
-                <binding.ws uri="http://localhost:8080/Flight/SearchCallback"/>
+                <binding.ws uri="http://localhost:8084/Flight/SearchCallback"/>
             </callback>
         </reference> 
-        <reference name="carSearch" target="CarComponent/Search">
-            <binding.sca/>
+        <reference name="carSearch">
+            <binding.ws uri="http://localhost:8086/Car/Search"/>
+            <callback>
+                <binding.ws uri="http://localhost:8084/Car/SearchCallback"/>
+            </callback>
         </reference>    
-        <reference name="tripSearch" target="TripComponent/Search">
-            <binding.sca/>
+        <reference name="tripSearch">
+            <binding.ws uri="http://localhost:8085/Trip/Search"/>
+            <callback>
+                <binding.ws uri="http://localhost:8084/Trip/SearchCallback"/>
+            </callback>
         </reference>     
         <reference name="currencyConverter" target="CurrencyConverterComponent">
         </reference>