Component name change and separate getting synch results and sending results to callback in Hotel component.

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

2 files changed, 4 insertions, 3 deletions

diff --git a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java b/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
index 8b50d0fd6b..cb5626441a 100644
--- a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
+++ b/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
@@ -115,7 +115,8 @@ public class HotelImpl implements Search, Book, HotelManagement {
         }

     	

         // return available hotels

-        searchCallback.searchResults(searchSynch(tripLeg));  

+        TripItem[] items = searchSynch(tripLeg);

+        searchCallback.searchResults(items);  

     }

     

     public int getPercentComplete(){

diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
index f6483bb55f..2900b764f6 100644
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
@@ -25,10 +25,10 @@
     <component name="InteractionLocalClient">
         <implementation.java class="scatours.client.InteractionLocalClient" />
         <reference name="calendarLocal" 
-                   target="CalendarComponent"/>
+                   target="Calendar"/>
      </component>
      
-    <component name="CalendarComponent">
+    <component name="Calendar">
 		<implementation.java class="calendar.CalendarImpl"/>
     </component>