diff options
Diffstat (limited to '')
13 files changed, 108 insertions, 51 deletions
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java b/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java index 6f3e81e6c2..2ed94333d7 100644 --- a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java +++ b/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java @@ -89,7 +89,14 @@ public class CarImpl implements Search, Book { }
public void searchAsynch(TripLeg tripLeg) {
-
+ System.out.println("Starting car search");
+
+ try {
+ this.wait(4000);
+ } catch(Exception ex){
+ // do nothing
+ }
+
// return available hotels
searchCallback.searchResults(searchSynch(tripLeg));
}
diff --git a/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java b/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java index e9f466516b..e2f945b392 100644 --- a/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java +++ b/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java @@ -116,6 +116,13 @@ public class FlightImpl implements Search, Book { }
public void searchAsynch(TripLeg tripLeg) {
+ System.out.println("Starting flight search");
+
+ try {
+ this.wait(3000);
+ } catch(Exception ex){
+ // do nothing
+ }
// return available hotels
searchCallback.searchResults(searchSynch(tripLeg));
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite index 19acb00020..8e3d6fb2e5 100644 --- a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite +++ b/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite @@ -26,8 +26,11 @@ <component name="HotelComponent"> <implementation.java class="scatours.hotel.HotelImpl"/> <service name="Search"> - <binding.sca/> - <tuscany:binding.jsonrpc/> + <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/> + <!-- tuscany:binding.jsonrpc name="searchjsonrpc"/--> + <callback> + <binding.ws uri="http://localhost:8084/Hotel/SearchCallback"/> + </callback> </service> <service name="Book"/> </component> @@ -37,10 +40,10 @@ <service name="Search"> <interface.java interface="scatours.common.Search" callbackInterface="scatours.common.SearchCallback"/> - <binding.ws uri="http://localhost:8080/Flight/Search"/> - <tuscany:binding.jsonrpc/> + <binding.ws name="searchws" uri="http://localhost:8086/Flight/Search"/> + <tuscany:binding.jsonrpc name="searchjsonrpc"/> <callback> - <binding.ws uri="http://localhost:8080/Flight/SearchCallback"/> + <binding.ws uri="http://localhost:8084/Flight/SearchCallback"/> </callback> </service> <service name="Book"/> @@ -49,8 +52,11 @@ <component name="CarComponent"> <implementation.java class="scatours.car.CarImpl"/> <service name="Search"> - <binding.sca/> - <tuscany:binding.jsonrpc/> + <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/> + <tuscany:binding.jsonrpc name="searchjsonrpc"/> + <callback> + <binding.ws uri="http://localhost:8084/Car/SearchCallback"/> + </callback> </service> <service name="Book"/> </component> 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> diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite index dc7dc0f731..024969edcc 100644 --- a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite +++ b/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite @@ -26,8 +26,11 @@ <component name="TripComponent"> <implementation.java class="scatours.trip.TripImpl"/> <service name="Search"> - <binding.sca/> - <tuscany:binding.jsonrpc/> + <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/> + <tuscany:binding.jsonrpc name="searchjsonrpc"/> + <callback> + <binding.ws uri="http://localhost:8084/Trip/SearchCallback"/> + </callback> </service> <service name="Book"/> </component> diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml index 4f753d2294..f9cc655b83 100644 --- a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -20,6 +20,7 @@ <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:scatours="http://scatours"> <deployable composite="scatours:shoppingcart"/> - <import.java package="scatours.common"/> + <!-- import.java package="scatours.common"/--> + <import.java package="payment"/> <import.java package="scatours.shoppingcart"/> </contribution>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml index b051a2572c..9512c64b56 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -20,16 +20,9 @@ <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:scatours="http://scatours"> <deployable composite="scatours:ui"/> + <import.java package="scatours"/> <import.java package="scatours.common"/> - <import.java package="scatours.currencyconverter"/> - <import.java package="scatours.hotel"/> - <import.java package="scatours.flight"/> - <import.java package="scatours.car"/> - <import.java package="scatours.trip"/> <import.java package="scatours.tripbooking"/> - <import.java package="scatours.travelcatalog"/> - <import.java package="payment.creditcard"/> - <import.java package="payment"/> - <import.java package="scatours.shoppingcart"/> - <import.java package="scatours"/> + <import.java package="scatours.travelcatalog"/> + <import.java package="scatours.shoppingcart"/> </contribution>
\ No newline at end of file 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 0aac7fe092..cd76747cb5 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 @@ -39,5 +39,21 @@ <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> </composite> 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 85eb4a592b..7109bd3d2e 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 @@ -105,7 +105,14 @@ public class HotelImpl implements Search, Book, HotelManagement { }
public void searchAsynch(TripLeg tripLeg) {
-
+ System.out.println("Starting hotel search");
+
+ try {
+ this.wait(1000);
+ } catch(Exception ex){
+ // do nothing
+ }
+
// return available hotels
searchCallback.searchResults(searchSynch(tripLeg));
}
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml index f325b98b4e..d5de488e69 100644 --- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -20,4 +20,5 @@ <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
<import.java package="scatours.common"/>
<export.java package="scatours.shoppingcart"/>
+ <export.java package="payment"/>
</contribution>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java index 410ff10cfe..4919d2a629 100644 --- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java +++ b/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java @@ -83,9 +83,23 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback{ dynamicHotelSearch.getService().searchAsynch(tripLeg);
flightSearch.searchAsynch(tripLeg);
+
+ while (responsesReceived < 2){
+ try {
+ synchronized (this) {
+ this.wait();
+ }
+ } catch (InterruptedException ex){
+ // do nothing
+ System.out.println("waiting for response");
+ }
+ }
+
carSearch.searchAsynch(tripLeg);
tripSearch.searchAsynch(tripLeg);
+ System.out.println("going into wait");
+
while (responsesReceived < 4){
try {
synchronized (this) {
@@ -93,8 +107,9 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback{ }
} catch (InterruptedException ex){
// do nothing
+ System.out.println("waiting for response");
}
- }
+ }
for (TripItem tripItem : searchResults){
tripItem.setId(UUID.randomUUID().toString());
@@ -113,7 +128,7 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback{ public void searchResults(TripItem[] items){
RequestContext requestContext = componentContext.getRequestContext();
Object callbackID = requestContext.getServiceReference().getCallbackID();
- System.out.println(callbackID);
+ System.out.println("Asynch response - " + callbackID);
if (items != null) {
for(int i = 0; i < items.length; i++ ){
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java b/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java index 8f30023330..06aeeb2c63 100644 --- a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java +++ b/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java @@ -95,7 +95,14 @@ public class TripImpl implements Search, Book { }
public void searchAsynch(TripLeg tripLeg) {
-
+ System.out.println("Starting trip search");
+
+ try {
+ this.wait(2000);
+ } catch(Exception ex){
+ // do nothing
+ }
+
// return available hotels
searchCallback.searchResults(searchSynch(tripLeg));
}
|