You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/08/11 08:39:22 UTC

svn commit: r684645 - in /tuscany/sandbox/travelsample: common-contribution/src/scatours/common/Search.java travel-contribution/src/scatours/travel/TravelImpl.java ui-contribution/scatours.html

Author: slaws
Date: Sun Aug 10 23:39:21 2008
New Revision: 684645

URL: http://svn.apache.org/viewvc?rev=684645&view=rev
Log:
Make the search service OneWay

Modified:
    tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java
    tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java
    tuscany/sandbox/travelsample/ui-contribution/scatours.html

Modified: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java?rev=684645&r1=684644&r2=684645&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java (original)
+++ tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java Sun Aug 10 23:39:21 2008
@@ -30,6 +30,6 @@
 public interface Search {
     TripItem[] searchSynch(TripLeg tripLeg);
     
-    // TODO - Use to run searches in parallel @OneWay
+    @OneWay
     void searchAsynch(TripLeg tripLeg);
 }

Modified: tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java?rev=684645&r1=684644&r2=684645&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java (original)
+++ tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java Sun Aug 10 23:39:21 2008
@@ -87,7 +87,9 @@
         
         while (responsesReceived < 3){
             try {
-                this.wait();
+                synchronized (this) {
+                    this.wait();
+                }
             } catch (InterruptedException ex){
                 // do nothing
             }
@@ -114,7 +116,9 @@
         
         responsesReceived++;
         try {
-            this.notifyAll();
+            synchronized (this) {
+                this.notifyAll();
+            }
         } catch (Exception ex) {
         }
     }    

Modified: tuscany/sandbox/travelsample/ui-contribution/scatours.html
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/ui-contribution/scatours.html?rev=684645&r1=684644&r2=684645&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/ui-contribution/scatours.html (original)
+++ tuscany/sandbox/travelsample/ui-contribution/scatours.html Sun Aug 10 23:39:21 2008
@@ -206,7 +206,7 @@
 	<img src="scatours.png" border="0" />
 	<div id="scatours">
         <form name="travelForm"> 
-            <h3><div id="tripId"></h3>
+            <h3>Search for hotels, flights and cars</h3>
             <br/>
             <table border="0">
                 <tr>
@@ -233,16 +233,17 @@
                     <td/>
                 </tr>
             </table>
+            <br/>
             <input type="button" onClick="searchPackages()" value="SearchPackages"> 
             <input type="button" onClick="searchHotels()" value="Search Hotels">
             <input type="button" onClick="searchFlights()" value="Search Flights">
-            <input type="button" onClick="searchHotels()" value="Search Cars"> 
+            <input type="button" onClick="searchCars()" value="Search Cars"> 
         </form>
         <form name="tripForm">
             <h3>Search Results</h3> 
             <div id="searchResponse"></div>
             <br> 
-            <h3>You Trip</h3>
+            <h3><div id="tripId"></h3>
             <div id="tripItems"></div>
             <br>            
             <div id="totalPrice"></div>