From 38ebe24c08241e09ac0c1c5e257a25583a868566 Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 1 Jun 2009 19:00:22 +0000 Subject: Move redundant modules into contrib git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780781 13f79535-47bb-0310-9956-ffa450edef68 --- .../travelcatalog-contribution/pom.xml | 74 ------------ .../scatours/travelcatalog/TravelCatalogImpl.java | 132 --------------------- .../travelcatalog/TravelCatalogSearch.java | 32 ----- .../main/resources/META-INF/sca-contribution.xml | 24 ---- 4 files changed, 262 deletions(-) delete mode 100644 sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml delete mode 100644 sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java delete mode 100644 sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java delete mode 100644 sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml (limited to 'sandbox/travelsample/shared-contributions/travelcatalog-contribution') diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml deleted file mode 100644 index 54e521d76b..0000000000 --- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5-SNAPSHOT - - - scatours-travelcatalog-contribution - Apache Tuscany SCA Tours Travel Catalog Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-data-api - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - scatours-common-contribution - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - scatours-currency-contribution - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - scatours-tripbooking-contribution - 1.5-SNAPSHOT - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java deleted file mode 100644 index 4ad2c80c8f..0000000000 --- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java +++ /dev/null @@ -1,132 +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.travelcatalog; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import scatours.common.Search; -import scatours.common.SearchCallback; -import scatours.common.TripItem; -import scatours.common.TripLeg; -import scatours.currencyconverter.CurrencyConverter; - -/** - * An implementation of the Trip service - */ -@Scope("COMPOSITE") -@Service(interfaces={TravelCatalogSearch.class}) -public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback{ - - @Reference - protected Search hotelSearch; - - @Reference - protected Search flightSearch; - - @Reference - protected Search carSearch; - - @Reference - protected Search tripSearch; - - @Property - public String quoteCurrencyCode = "USD"; - - @Reference - protected CurrencyConverter currencyConverter; - - @Context - protected ComponentContext componentContext; - - private int responsesReceived = 0; - - private List searchResults = new ArrayList(); - - // TravelSearch methods - - public TripItem[] search(TripLeg tripLeg) { - - searchResults.clear(); - responsesReceived = 0; - - ServiceReference dynamicHotelSearch = - componentContext.getServiceReference(Search.class, "hotelSearch"); - - dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId()); - dynamicHotelSearch.getService().searchAsynch(tripLeg); - - flightSearch.searchAsynch(tripLeg); - carSearch.searchAsynch(tripLeg); - tripSearch.searchAsynch(tripLeg); - - while (responsesReceived < 4){ - try { - synchronized (this) { - this.wait(); - } - } catch (InterruptedException ex){ - // do nothing - } - } - - for (TripItem tripItem : searchResults){ - tripItem.setId(UUID.randomUUID().toString()); - tripItem.setTripId(tripLeg.getId()); - tripItem.setPrice(currencyConverter.convert(tripItem.getCurrency(), - quoteCurrencyCode, - tripItem.getPrice())); - tripItem.setCurrency(quoteCurrencyCode); - } - - return searchResults.toArray(new TripItem[searchResults.size()]); - } - - // 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/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java deleted file mode 100644 index df22724de2..0000000000 --- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java +++ /dev/null @@ -1,32 +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.travelcatalog; - -import org.osoa.sca.annotations.Remotable; - -import scatours.common.TripItem; -import scatours.common.TripLeg; - -/** - * The Trip service interface - */ -@Remotable -public interface TravelCatalogSearch { - TripItem[] search(TripLeg tripLeg); -} diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 286b9c2a05..0000000000 --- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - \ No newline at end of file -- cgit v1.2.3