From 07c7e97cb86927128620f43c297600b534866857 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 11 Jun 2009 17:35:55 +0000 Subject: Start adding some simple scenarios that explore SCA interaction patterns git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@783854 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/calendar/Calendar.java | 3 - .../interaction-client-contribution/pom.xml | 6 + .../java/scatours/client/InteractionClient.java | 119 ++++++++++++++++++++ .../scatours/client/InteractionLocalClient.java | 53 +++++++++ .../scatours/client/InteractionRemoteClient.java | 60 ++++++++++ .../client/InteractionRequestResponseClient.java | 42 +++++++ .../src/main/java/scatours/client/TestClient.java | 122 --------------------- .../main/resources/META-INF/sca-contribution.xml | 3 +- .../src/main/resources/client.composite | 30 +++-- .../src/main/resources/client.composite | 1 + .../main/java/scatours/LaunchIntactionNode.java | 11 +- 11 files changed, 315 insertions(+), 135 deletions(-) create mode 100644 sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionClient.java create mode 100644 sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java create mode 100644 sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java create mode 100644 sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java delete mode 100644 sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/TestClient.java (limited to 'sandbox/travelsample') diff --git a/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java b/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java index 4259c5fa8b..f8c3a6c624 100644 --- a/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java +++ b/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java @@ -18,9 +18,6 @@ */ package calendar; -/** - * The Add service interface - */ public interface Calendar { String getEndDate(String startDate, int duration); diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml b/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml index 65f40dbdfa..4b00b8cc97 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml +++ b/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml @@ -52,6 +52,12 @@ scatours-hotel-contribution 1.0-SNAPSHOT + + + org.apache.tuscany.sca + scatours-currency-contribution + 1.0-SNAPSHOT + diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionClient.java new file mode 100644 index 0000000000..9953d4b1a5 --- /dev/null +++ b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionClient.java @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package scatours.client; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import calendar.Calendar; + +import scatours.common.Search; +import scatours.common.SearchCallback; +import scatours.common.TripItem; +import scatours.common.TripLeg; + +@Service(Runnable.class) +public class InteractionClient implements Runnable, SearchCallback { + @Reference + protected Search hotelSearchRemoteRequestResponse; + + @Reference + protected Calendar calendarLocalRequestResponse; + + public InteractionClient() { + } + + // Runnable method + + public void run() { + System.out.println("Calling hotel component over remote binding"); + runRemoteRequestResponse(); + + System.out.println("Calling calendar component over local binding"); + runLocalRequestReponse(); + } + + private void runRemoteRequestResponse() { + TripLeg tripLeg = getTestTripLeg(); + TripItem[] tripItems = hotelSearchRemoteRequestResponse.searchSynch(tripLeg); + for (TripItem tripItem : tripItems){ + System.out.println("Found hotel - " + tripItem.getName()); + } + } + + private void runLocalRequestReponse() { + TripLeg tripLeg = getTestTripLeg(); + String toDate = calendarLocalRequestResponse.getEndDate(tripLeg.getFromDate(), 10); + tripLeg.setToDate(toDate); + System.out.println("Calculated trip end date - " + toDate); + } + + private void runRemoteOneWay() { + + } + + private void runConversational() { + + } + + private void runCallback() { + + } + + private void runStatefulCallback() { + + } + + private TripLeg getTestTripLeg(){ + TripLeg tripLeg = new TripLeg(); + tripLeg.setFromLocation("LGW"); + tripLeg.setToLocation("FLR"); + tripLeg.setFromDate("06/12/09 00:00"); + tripLeg.setToDate("13/12/09 00:00"); + tripLeg.setNoOfPeople("1"); + tripLeg.setId("TRIP27"); + + return tripLeg; + } + + // SearchCallback methods + + public void searchResults(TripItem[] items){ +/* + RequestContext requestContext = componentContext.getRequestContext(); + Object callbackID = requestContext.getServiceReference().getCallbackID(); + System.out.println(callbackID); + + if (items != null) { + for(int i = 0; i < items.length; i++ ){ + searchResults.add(items[i]); + } + } + + responsesReceived++; + try { + synchronized (this) { + this.notifyAll(); + } + } catch (Exception ex) { + } +*/ + } +} diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java new file mode 100644 index 0000000000..fb1a7c29d5 --- /dev/null +++ b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package scatours.client; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import calendar.Calendar; + +import scatours.common.TripLeg; + +@Service(Runnable.class) +public class InteractionLocalClient implements Runnable { + + @Reference + protected Calendar calendarLocal; + + public void run() { + System.out.println("\nCalling calendar component over local binding"); + TripLeg tripLeg = getTestTripLeg(); + String toDate = calendarLocal.getEndDate(tripLeg.getFromDate(), 10); + tripLeg.setToDate(toDate); + System.out.println("Calculated trip end date - " + toDate);; + } + + private TripLeg getTestTripLeg(){ + TripLeg tripLeg = new TripLeg(); + tripLeg.setFromLocation("LGW"); + tripLeg.setToLocation("FLR"); + tripLeg.setFromDate("06/12/09 00:00"); + tripLeg.setToDate("13/12/09 00:00"); + tripLeg.setNoOfPeople("1"); + tripLeg.setId("TRIP27"); + return tripLeg; + } +} diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java new file mode 100644 index 0000000000..2f198797a1 --- /dev/null +++ b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package scatours.client; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import scatours.common.Search; +import scatours.common.SearchCallback; +import scatours.common.TripItem; +import scatours.common.TripLeg; + +@Service(Runnable.class) +public class InteractionRemoteClient implements Runnable, SearchCallback{ + + @Reference + protected Search hotelSearchRemote; + + public void run() { + System.out.println("\nCalling hotel component over remote binding"); + TripLeg tripLeg = getTestTripLeg(); + TripItem[] tripItems = hotelSearchRemote.searchSynch(tripLeg); + for (TripItem tripItem : tripItems){ + System.out.println("Found hotel - " + tripItem.getName()); + } + } + + public void searchResults(TripItem[] items){ + // we are calling the hotel component synchronously here + // so the callback interface is not used + } + + private TripLeg getTestTripLeg(){ + TripLeg tripLeg = new TripLeg(); + tripLeg.setFromLocation("LGW"); + tripLeg.setToLocation("FLR"); + tripLeg.setFromDate("06/12/09 00:00"); + tripLeg.setToDate("13/12/09 00:00"); + tripLeg.setNoOfPeople("1"); + tripLeg.setId("TRIP27"); + return tripLeg; + } +} diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java new file mode 100644 index 0000000000..20cb8fd740 --- /dev/null +++ b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package scatours.client; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import calendar.Calendar; + +import scatours.common.TripLeg; +import scatours.currencyconverter.CurrencyConverter; + +@Service(Runnable.class) +public class InteractionRequestResponseClient implements Runnable { + + @Reference + protected CurrencyConverter currencyConverterRequestResponse; + + public void run() { + System.out.println("\nCalling currency converter component using request response pattern"); + double convertedAmount = currencyConverterRequestResponse.convert("GBP", "USD", 10.0); + System.out.println("10 GBP = " + convertedAmount + " USD"); + } + +} diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/TestClient.java deleted file mode 100644 index 3b53cb8a4a..0000000000 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/TestClient.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package scatours.client; - -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import calendar.Calendar; - -import scatours.common.Search; -import scatours.common.SearchCallback; -import scatours.common.TripItem; -import scatours.common.TripLeg; -import scatours.hotel.HotelInfo; -import scatours.hotel.HotelManagement; - -@Service(Runnable.class) -public class TestClient implements SearchCallback { - @Reference - protected Search hotelSearchRemoteRequestResponse; - - @Reference - protected Calendar calendarLocalRequestResponse; - - public TestClient() { - } - - // Runnable method - - public void run() { - System.out.println("Calling hotel component over remote binding"); - runRemoteRequestResponse(); - - System.out.println("Calling calendar component over local binding"); - runLocalRequestReponse(); - } - - private void runRemoteRequestResponse() { - TripLeg tripLeg = getTestTripLeg(); - TripItem[] tripItems = hotelSearchRemoteRequestResponse.searchSynch(tripLeg); - for (TripItem tripItem : tripItems){ - System.out.println("Found hotel - " + tripItem.getName()); - } - } - - private void runLocalRequestReponse() { - TripLeg tripLeg = getTestTripLeg(); - String toDate = calendarLocalRequestResponse.getEndDate(tripLeg.getFromDate(), 10); - tripLeg.setToDate(toDate); - System.out.println("Calculated trip end date - " + toDate); - } - - private void runRemoteOneWay() { - - } - - private void runConversational() { - - } - - private void runCallbac() { - - } - - private void runStatefulCallback() { - - } - - private TripLeg getTestTripLeg(){ - TripLeg tripLeg = new TripLeg(); - tripLeg.setFromLocation("LGW"); - tripLeg.setToLocation("FLR"); - tripLeg.setFromDate("06/12/09 00:00"); - tripLeg.setToDate("13/12/09 00:00"); - tripLeg.setNoOfPeople("1"); - tripLeg.setId("TRIP27"); - - return tripLeg; - } - - // SearchCallback methods - - public void searchResults(TripItem[] items){ -/* - RequestContext requestContext = componentContext.getRequestContext(); - Object callbackID = requestContext.getServiceReference().getCallbackID(); - System.out.println(callbackID); - - if (items != null) { - for(int i = 0; i < items.length; i++ ){ - searchResults.add(items[i]); - } - } - - responsesReceived++; - try { - synchronized (this) { - this.notifyAll(); - } - } catch (Exception ex) { - } -*/ - } -} diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml index 9eed690aaf..848e0bea5b 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -19,7 +19,8 @@ --> - + + 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 1b76fbaefb..c2ff2c9a89 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 @@ -21,17 +21,33 @@ targetNamespace="http://client.scatours/" name="Client"> - - - - - - + + + - + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite index c44d0666b5..36ce4392a9 100644 --- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite +++ b/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite @@ -27,4 +27,5 @@ + diff --git a/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java b/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java index fe08cac367..1c9b20ab5a 100644 --- a/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java +++ b/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java @@ -37,6 +37,7 @@ public class LaunchIntactionNode { try { SCANode node1 = SCANodeFactory.newInstance().createSCANode("client.composite", new SCAContribution("common", "../../contributions/common-contribution/target/classes"), + new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"), new SCAContribution("calendar", "../../contributions/calendar-contribution/target/classes"), new SCAContribution("client", "../../contributions/interaction-client-contribution/target/classes")); @@ -48,8 +49,14 @@ public class LaunchIntactionNode { node2.start(); node1.start(); - Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable"); - runner.run(); + Runnable localInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionLocalClient/Runnable"); + localInteraction.run(); + + Runnable remoteInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable"); + remoteInteraction.run(); + + Runnable requestResponseInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable"); + requestResponseInteraction.run(); node1.stop(); node2.stop(); -- cgit v1.2.3