From cc8932fb2819fbc8731233494976aec9608ee8cc Mon Sep 17 00:00:00 2001 From: nash Date: Sun, 8 Feb 2009 23:40:18 +0000 Subject: Reorganize scatours-contribution source tree git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@742209 13f79535-47bb-0310-9956-ffa450edef68 --- .../META-INF/sca-contribution.xml | 26 ---- .../src/main/java/scatours/SCAToursBooking.java | 32 ++++ .../src/main/java/scatours/SCAToursCart.java | 34 +++++ .../src/main/java/scatours/SCAToursImpl.java | 162 +++++++++++++++++++++ .../src/main/java/scatours/SCAToursSearch.java | 32 ++++ .../main/resources/META-INF/sca-contribution.xml | 26 ++++ .../src/scatours/SCAToursBooking.java | 32 ---- .../src/scatours/SCAToursCart.java | 34 ----- .../src/scatours/SCAToursImpl.java | 162 --------------------- .../src/scatours/SCAToursSearch.java | 32 ---- 10 files changed, 286 insertions(+), 286 deletions(-) delete mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/META-INF/sca-contribution.xml create mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java create mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java create mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java create mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java create mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursBooking.java delete mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursCart.java delete mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java delete mode 100644 sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursSearch.java diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/META-INF/sca-contribution.xml deleted file mode 100644 index 368e95ebd0..0000000000 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java new file mode 100644 index 0000000000..ac39443e9c --- /dev/null +++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java @@ -0,0 +1,32 @@ +/* + * 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; + + +import org.osoa.sca.annotations.Remotable; + +import scatours.common.TripItem; + +/** + * The SCA Tours trip booking service interface + */ +@Remotable +public interface SCAToursBooking { + String bookTrip(String cartId, TripItem tripId); +} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java new file mode 100644 index 0000000000..61e32ec4a2 --- /dev/null +++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java @@ -0,0 +1,34 @@ +/* + * 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; + +import org.osoa.sca.annotations.Conversational; +import org.osoa.sca.annotations.Remotable; + +import scatours.common.TripItem; + +/** + * The ShoppingCart service interface + */ +@Remotable +public interface SCAToursCart{ + String newCart(); + TripItem[] getTrips(String cartId); + void checkout(String cartId); +} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java new file mode 100644 index 0000000000..bfbf05ce02 --- /dev/null +++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java @@ -0,0 +1,162 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +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 scatours.common.TripItem; +import scatours.common.TripLeg; +//import scatours.paymentprocess.PaymentProcess; +import scatours.shoppingcart.ShoppingCart; +import scatours.travelcatalog.TravelCatalogSearch; +import scatours.tripbooking.TripBooking; + +/** + * An implementation of the Trip service + */ +@Scope("COMPOSITE") +@Service(interfaces={SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class}) +public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCart{ + + @Reference + protected TravelCatalogSearch travelCatalogSearch; + + @Reference + protected TripBooking tripBooking; + + @Reference + protected ShoppingCart shoppingCart; + + @Context + protected ComponentContext componentContext; + + private Map carts = new HashMap(); + private Map trips = new HashMap(); + //private Map searchItemsCache = new HashMap(); + + // SCAToursSearch methods + + public TripItem[] search(TripLeg tripLeg) { + + TripItem[] searchItems = travelCatalogSearch.search(tripLeg); + + //for (int i =0; i< searchItems.length; i++){ + // searchItemsCache.put(searchItems[i].getId(), searchItems[i]); + //} + return searchItems; + } + + // SCAToursBooking methods + + public String bookTrip(String cartId, TripItem trip){ + TripItem bookedTrip = tripBooking.bookTrip(cartId, trip); + carts.get(cartId).addTrip(bookedTrip); + return bookedTrip.getBookingCode(); + } + + // SCAToursCart methods + + public String newCart(){ + String cartId = UUID.randomUUID().toString(); + ServiceReference shoppingCart = componentContext.getServiceReference(ShoppingCart.class, + "shoppingCart"); + shoppingCart.setConversationID(cartId); + carts.put(cartId, shoppingCart.getService()); + + return cartId; + } + + public TripItem[] getTrips(String cartId){ + return carts.get(cartId).getTrips(); + } + + public void checkout(String cartId){ + shoppingCart.checkout("Fred"); + } + +/* + public String addTrip(String cartId){ + String tripId = UUID.randomUUID().toString(); + ServiceReference tripReference = componentContext.getServiceReference(TripBooking.class, + "tripBooking"); + tripReference.setConversationID(tripId); + trips.put(tripId, tripReference.getService()); + + carts.get(cartId).addItem(tripId); + return tripId; + } + + public void removeTrip(String cartId, String tripId) { + carts.get(cartId).removeItem(tripId); + } + + public void addTripItem(String cartId, String tripId, String tripItemId){ + TripItem item = searchItemsCache.get(tripItemId); + TripItem itemCopy = new TripItem(item); + itemCopy.setTripId(tripId); + trips.get(tripId).addTripItem(itemCopy); + } + + public void removeTripItem(String cartId, String tripId, String tripItemId){ + trips.get(tripId).removeTripItem(tripItemId); + } + + public TripItem[] getTripItems(String cartId) { + List returnTripItems = new ArrayList(); + + for( String tripId : carts.get(cartId).getItems()){ + returnTripItems.addAll(Arrays.asList(trips.get(tripId).getTripItems())); + } + + return returnTripItems.toArray(new TripItem[returnTripItems.size()]); + } + + public double getTotalPrice(String cartId){ + double total = 0.0; + + for( String tripId : carts.get(cartId).getItems()){ + total += trips.get(tripId).getTripPrice(); + } + + return total; + } + + public void checkout(String cartId){ + // get users credentials. Hard coded for now but should + // come from the security context + String customerId = "Fred Bloggs"; + float amount = (float)getTotalPrice(cartId); + + paymentProcess.makePayment(customerId, amount); + } + +*/ +} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java new file mode 100644 index 0000000000..f0f435fc06 --- /dev/null +++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java @@ -0,0 +1,32 @@ +/* + * 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; + +import org.osoa.sca.annotations.Remotable; + +import scatours.common.TripItem; +import scatours.common.TripLeg; + +/** + * The Trip service interface + */ +@Remotable +public interface SCAToursSearch { + TripItem[] search(TripLeg tripLeg); +} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..368e95ebd0 --- /dev/null +++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,26 @@ + + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursBooking.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursBooking.java deleted file mode 100644 index ac39443e9c..0000000000 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursBooking.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; - - -import org.osoa.sca.annotations.Remotable; - -import scatours.common.TripItem; - -/** - * The SCA Tours trip booking service interface - */ -@Remotable -public interface SCAToursBooking { - String bookTrip(String cartId, TripItem tripId); -} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursCart.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursCart.java deleted file mode 100644 index 61e32ec4a2..0000000000 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursCart.java +++ /dev/null @@ -1,34 +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; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.Remotable; - -import scatours.common.TripItem; - -/** - * The ShoppingCart service interface - */ -@Remotable -public interface SCAToursCart{ - String newCart(); - TripItem[] getTrips(String cartId); - void checkout(String cartId); -} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java deleted file mode 100644 index bfbf05ce02..0000000000 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java +++ /dev/null @@ -1,162 +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; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -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 scatours.common.TripItem; -import scatours.common.TripLeg; -//import scatours.paymentprocess.PaymentProcess; -import scatours.shoppingcart.ShoppingCart; -import scatours.travelcatalog.TravelCatalogSearch; -import scatours.tripbooking.TripBooking; - -/** - * An implementation of the Trip service - */ -@Scope("COMPOSITE") -@Service(interfaces={SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class}) -public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCart{ - - @Reference - protected TravelCatalogSearch travelCatalogSearch; - - @Reference - protected TripBooking tripBooking; - - @Reference - protected ShoppingCart shoppingCart; - - @Context - protected ComponentContext componentContext; - - private Map carts = new HashMap(); - private Map trips = new HashMap(); - //private Map searchItemsCache = new HashMap(); - - // SCAToursSearch methods - - public TripItem[] search(TripLeg tripLeg) { - - TripItem[] searchItems = travelCatalogSearch.search(tripLeg); - - //for (int i =0; i< searchItems.length; i++){ - // searchItemsCache.put(searchItems[i].getId(), searchItems[i]); - //} - return searchItems; - } - - // SCAToursBooking methods - - public String bookTrip(String cartId, TripItem trip){ - TripItem bookedTrip = tripBooking.bookTrip(cartId, trip); - carts.get(cartId).addTrip(bookedTrip); - return bookedTrip.getBookingCode(); - } - - // SCAToursCart methods - - public String newCart(){ - String cartId = UUID.randomUUID().toString(); - ServiceReference shoppingCart = componentContext.getServiceReference(ShoppingCart.class, - "shoppingCart"); - shoppingCart.setConversationID(cartId); - carts.put(cartId, shoppingCart.getService()); - - return cartId; - } - - public TripItem[] getTrips(String cartId){ - return carts.get(cartId).getTrips(); - } - - public void checkout(String cartId){ - shoppingCart.checkout("Fred"); - } - -/* - public String addTrip(String cartId){ - String tripId = UUID.randomUUID().toString(); - ServiceReference tripReference = componentContext.getServiceReference(TripBooking.class, - "tripBooking"); - tripReference.setConversationID(tripId); - trips.put(tripId, tripReference.getService()); - - carts.get(cartId).addItem(tripId); - return tripId; - } - - public void removeTrip(String cartId, String tripId) { - carts.get(cartId).removeItem(tripId); - } - - public void addTripItem(String cartId, String tripId, String tripItemId){ - TripItem item = searchItemsCache.get(tripItemId); - TripItem itemCopy = new TripItem(item); - itemCopy.setTripId(tripId); - trips.get(tripId).addTripItem(itemCopy); - } - - public void removeTripItem(String cartId, String tripId, String tripItemId){ - trips.get(tripId).removeTripItem(tripItemId); - } - - public TripItem[] getTripItems(String cartId) { - List returnTripItems = new ArrayList(); - - for( String tripId : carts.get(cartId).getItems()){ - returnTripItems.addAll(Arrays.asList(trips.get(tripId).getTripItems())); - } - - return returnTripItems.toArray(new TripItem[returnTripItems.size()]); - } - - public double getTotalPrice(String cartId){ - double total = 0.0; - - for( String tripId : carts.get(cartId).getItems()){ - total += trips.get(tripId).getTripPrice(); - } - - return total; - } - - public void checkout(String cartId){ - // get users credentials. Hard coded for now but should - // come from the security context - String customerId = "Fred Bloggs"; - float amount = (float)getTotalPrice(cartId); - - paymentProcess.makePayment(customerId, amount); - } - -*/ -} diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursSearch.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursSearch.java deleted file mode 100644 index f0f435fc06..0000000000 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursSearch.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; - -import org.osoa.sca.annotations.Remotable; - -import scatours.common.TripItem; -import scatours.common.TripLeg; - -/** - * The Trip service interface - */ -@Remotable -public interface SCAToursSearch { - TripItem[] search(TripLeg tripLeg); -} -- cgit v1.2.3