diff options
5 files changed, 1 insertions, 122 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java index db0377a779..1611c11792 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java @@ -25,7 +25,6 @@ import org.osoa.sca.annotations.OneWay; import org.osoa.sca.annotations.Remotable;
@Remotable
-@Conversational
@Callback(SearchCallback.class)
public interface Search {
TripItem[] searchSynch(TripLeg tripLeg);
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java index ddab27c3dd..ad13d0d352 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java @@ -19,15 +19,10 @@ package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
@Remotable
-@Conversational
public interface SearchCallback {
- @EndsConversation
void searchResults(TripItem[] items);
-
void setPercentComplete(String searchComponent, int percentComplete);
}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java deleted file mode 100644 index 87cea904ac..0000000000 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java +++ /dev/null @@ -1,98 +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.impl; - -import java.util.concurrent.CountDownLatch; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import com.tuscanyscatours.common.Search; -import com.tuscanyscatours.common.SearchCallback; -import com.tuscanyscatours.common.TripItem; -import com.tuscanyscatours.common.TripLeg; - -@Scope("CONVERSATION") -@Service(Runnable.class) -public class InteractionStatefulCallbackClientImpl implements Runnable, SearchCallback { - - @Reference - protected Search flightSearchStatefulCallback; - - @Context - protected ComponentContext componentContext; - - CountDownLatch resultsReceivedCountdown; - - public void run() { - System.out.println("\nCalling flight component using stateful callback interation pattern"); - resultsReceivedCountdown = new CountDownLatch(1); - TripLeg tripLeg = getTestTripLeg(); - - ServiceReference<Search> dynamicFlightSearchStatefulCallback = - componentContext.getServiceReference(Search.class, "flightSearchStatefulCallback"); - dynamicFlightSearchStatefulCallback.setConversationID("SomeUniqeID"); - Search flightSearch = dynamicFlightSearchStatefulCallback.getService(); - - flightSearch.searchAsynch(tripLeg); - - // wait for a while and see how the flight search is getting one - try { - Thread.sleep(1200); - } catch (Exception ex) { - // do nothing - } - System.out.println("Flight search is " + flightSearch.getPercentComplete() + "% complete"); - - // wait for responses to come back - try { - resultsReceivedCountdown.await(); - } catch (InterruptedException ex) { - } - } - - public void searchResults(TripItem[] items) { - System.out.println("Received results in conversation - " + componentContext.getRequestContext() - .getServiceReference().getConversation().getConversationID()); - for (TripItem tripItem : items) { - System.out.println("Found flight - " + tripItem.getName()); - } - resultsReceivedCountdown.countDown(); - } - - public void setPercentComplete(String searchComponent, int percentComplete) { - System.out.println(searchComponent + " search is " + percentComplete + "% complete"); - } - - private TripLeg getTestTripLeg() { - TripLeg tripLeg = new TripLeg(); - tripLeg.setFromLocation("LGW"); - tripLeg.setToLocation("FLR"); - tripLeg.setFromDate("06/12/09"); - tripLeg.setToDate("13/12/09"); - tripLeg.setNoOfPeople("1"); - tripLeg.setId("TRIP27"); - return tripLeg; - } -} diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite index 7caa8e7bb8..1c8552974b 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite @@ -72,19 +72,6 @@ <component name="CartStore"> <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/> <service name="CartStore"/> - </component> - - <!-- Stateful callback interaction --> - <component name="InteractionStatefulCallbackClient"> - <implementation.java class="scatours.client.impl.InteractionStatefulCallbackClientImpl" /> - <reference name="flightSearchStatefulCallback"> - <interface.java interface="com.tuscanyscatours.common.Search" - callbackInterface="com.tuscanyscatours.common.SearchCallback"/> - <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/> - <callback> - <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallbackConversational"/> - </callback> - </reference> - </component> + </component> </composite> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java index 292b10aaf0..b3e0e52f2e 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java @@ -64,10 +64,6 @@ public class InteractionLauncher { ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
conversationalInteraction.run();
- Runnable statefulCallbackInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionStatefulCallbackClient/Runnable");
- statefulCallbackInteraction.run();
-
node1.stop();
node2.stop();
}
|