From 46576bda96cf80886ed8bd811e79dee9b1e63f4c Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 27 May 2010 10:12:24 +0000 Subject: Move the travel sample tutorial from 2.x trunk to contrib as its not in the build, doesn't build, and no one is actively working on it. (and even if they were, i wonder if this should be released seperately like the 1.x version and so not in the trunk tree anyway git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948750 13f79535-47bb-0310-9956-ffa450edef68 --- .../contributions/tripbooking/build.xml | 26 ------- .../travelsample/contributions/tripbooking/pom.xml | 74 ------------------ .../tuscanyscatours/tripbooking/TripBooking.java | 32 -------- .../tripbooking/impl/TripBookingImpl.java | 91 ---------------------- .../main/resources/META-INF/sca-contribution.xml | 26 ------- 5 files changed, 249 deletions(-) delete mode 100644 sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml delete mode 100644 sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml delete mode 100644 sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java delete mode 100644 sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java delete mode 100644 sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml (limited to 'sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking') diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml deleted file mode 100644 index e8e7eb7f10..0000000000 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml deleted file mode 100644 index f45f92c464..0000000000 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - scatours - 2.0-SNAPSHOT - ../../pom.xml - 2.0-SNAPSHOT - scatours-contribution-tripbooking - Apache Tuscany SCA Tours Trip Booking Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - ${tuscany.version} - - - - org.apache.tuscany.sca - tuscany-data-api - ${tuscany.version} - - - - org.apache.tuscany.sca - scatours-contribution-common - ${pom.version} - - - - org.apache.tuscany.sca - scatours-contribution-currency - ${pom.version} - - - - org.apache.tuscany.sca - scatours-contribution-shoppingcart - ${pom.version} - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java deleted file mode 100644 index c5eaa95f19..0000000000 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.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 com.tuscanyscatours.tripbooking; - -import org.oasisopen.sca.annotation.Remotable; - -import com.tuscanyscatours.common.TripItem; - -/** - * The TripBooking service interface - */ -@Remotable -public interface TripBooking { - - TripItem bookTrip(String cartId, TripItem trip); -} diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java deleted file mode 100644 index e5846bae5d..0000000000 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java +++ /dev/null @@ -1,91 +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 com.tuscanyscatours.tripbooking.impl; - -import org.oasisopen.sca.ComponentContext; -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Context; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -import com.tuscanyscatours.common.Book; -import com.tuscanyscatours.common.TripItem; -import com.tuscanyscatours.shoppingcart.CartUpdates; -import com.tuscanyscatours.tripbooking.TripBooking; - -/** - * An implementation of the TripBooking service - */ -@Service({TripBooking.class}) -public class TripBookingImpl implements TripBooking { - - @Reference - protected Book hotelBook; - - @Reference - protected Book flightBook; - - @Reference - protected Book carBook; - - @Reference - protected Book tripBook; - - @Reference - protected CartUpdates cartUpdates; - - @Context - protected ComponentContext componentContext; - - public TripItem bookTrip(String cartId, TripItem trip) { - - String bookingCode = ""; - - // book any nested items - TripItem[] nestedItems = trip.getTripItems(); - if (nestedItems != null) { - for (int i = 0; i < nestedItems.length; i++) { - TripItem tripItem = nestedItems[i]; - if (tripItem.getType().equals(TripItem.CAR)) { - tripItem.setBookingCode(carBook.book(tripItem)); - } else if (tripItem.getType().equals(TripItem.FLIGHT)) { - tripItem.setBookingCode(flightBook.book(tripItem)); - } else if (tripItem.getType().equals(TripItem.HOTEL)) { - tripItem.setBookingCode(hotelBook.book(tripItem)); - } else { - tripItem.setBookingCode(tripItem.getType() + " is invalid"); - } - } - } - - // book the top level item if it's a packaged trip - if (trip.getType().equals(TripItem.TRIP)) { - bookingCode = tripBook.book(trip); - trip.setBookingCode(bookingCode); - } - - // add trip to the shopping cart - ServiceReference cart = componentContext.getServiceReference(CartUpdates.class, "cartUpdates"); - // cart.setConversationID(cartId); - cart.getService().addTrip(cartId, trip); - - return trip; - } - -} diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f2f5877e12..0000000000 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -- cgit v1.2.3