From 59519f89775fc0bb8673d8d3024f4658af153ab6 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 18 Aug 2009 21:19:25 +0000 Subject: Change introducing-* samples to use .impl packages and xxxImpl names for implementation classes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@805586 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/scatours/client/TestClient.java | 47 ---------------------- .../java/scatours/client/impl/TestClientImpl.java | 47 ++++++++++++++++++++++ .../src/main/resources/client.composite | 2 +- .../java/com/tuscanyscatours/ShoppingCart.java | 40 ------------------ .../main/java/com/tuscanyscatours/TripBooking.java | 35 ---------------- .../com/tuscanyscatours/impl/ShoppingCartImpl.java | 42 +++++++++++++++++++ .../com/tuscanyscatours/impl/TripBookingImpl.java | 38 +++++++++++++++++ .../src/main/resources/tours.composite | 4 +- .../main/java/com/goodvaluetrips/TripProvider.java | 26 ------------ .../com/goodvaluetrips/impl/TripProviderImpl.java | 28 +++++++++++++ .../src/main/resources/trips.composite | 2 +- 11 files changed, 159 insertions(+), 152 deletions(-) delete mode 100644 sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java create mode 100644 sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java delete mode 100644 sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java delete mode 100644 sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java create mode 100644 sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java create mode 100644 sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java delete mode 100644 sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java create mode 100644 sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java diff --git a/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java deleted file mode 100644 index 64a1487f72..0000000000 --- a/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java +++ /dev/null @@ -1,47 +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 java.math.BigDecimal; - -import com.tuscanyscatours.Bookings; -import com.tuscanyscatours.Checkout; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(Runnable.class) -public class TestClient { - @Reference - protected Bookings bookings; - - @Reference - protected Checkout checkout; - - public TestClient() { - } - - public void run() { - String bookingCode = bookings.newBooking("FS1APR4", 1); - System.out.println("Booking code is " + bookingCode); - - checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10"); - } -} diff --git a/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java b/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java new file mode 100644 index 0000000000..7a8258795b --- /dev/null +++ b/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java @@ -0,0 +1,47 @@ +/* + * 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.math.BigDecimal; + +import com.tuscanyscatours.Bookings; +import com.tuscanyscatours.Checkout; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +@Service(Runnable.class) +public class TestClientImpl { + @Reference + protected Bookings bookings; + + @Reference + protected Checkout checkout; + + public TestClientImpl() { + } + + public void run() { + String bookingCode = bookings.newBooking("FS1APR4", 1); + System.out.println("Booking code is " + bookingCode); + + checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10"); + } +} diff --git a/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite b/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite index 05c2755114..3a404eb10d 100644 --- a/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite +++ b/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite @@ -22,7 +22,7 @@ name="Client"> - + diff --git a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java deleted file mode 100644 index db551501e1..0000000000 --- a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java +++ /dev/null @@ -1,40 +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; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -public class ShoppingCart implements Checkout, Updates { - private static List bookedTrips = new ArrayList(); - - public void makePayment(BigDecimal amount, String cardInfo) { - System.out.print("Charged $" + amount + " to card " + cardInfo + " for " + - (bookedTrips.size() > 1 ? "trips" : "trip")); - for (String trip : bookedTrips){ - System.out.print(" " + trip); - } - System.out.println(); - bookedTrips.clear(); - } - public void addTrip(String resCode) { - bookedTrips.add(resCode); - } -} diff --git a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java deleted file mode 100644 index e64d60545e..0000000000 --- a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java +++ /dev/null @@ -1,35 +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; - -import org.osoa.sca.annotations.Reference; - -public class TripBooking implements Bookings { - @Reference - protected com.goodvaluetrips.Trips mytrips; - - @Reference - protected Updates cart; - - public String newBooking(String trip, int people) { - String resCode = mytrips.checkAvailability(trip, people); - cart.addTrip(resCode); - return "GV" + resCode; - } -} diff --git a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java new file mode 100644 index 0000000000..7d2fe8f951 --- /dev/null +++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.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 com.tuscanyscatours.impl; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import com.tuscanyscatours.Checkout; +import com.tuscanyscatours.Updates; + +public class ShoppingCartImpl implements Checkout, Updates { + private static List bookedTrips = new ArrayList(); + + public void makePayment(BigDecimal amount, String cardInfo) { + System.out.print("Charged $" + amount + " to card " + cardInfo + " for " + + (bookedTrips.size() > 1 ? "trips" : "trip")); + for (String trip : bookedTrips){ + System.out.print(" " + trip); + } + System.out.println(); + bookedTrips.clear(); + } + public void addTrip(String resCode) { + bookedTrips.add(resCode); + } +} diff --git a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java new file mode 100644 index 0000000000..cd1573380c --- /dev/null +++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java @@ -0,0 +1,38 @@ +/* + * 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.impl; + +import com.goodvaluetrips.Trips; +import com.tuscanyscatours.Bookings; +import com.tuscanyscatours.Updates; +import org.osoa.sca.annotations.Reference; + +public class TripBookingImpl implements Bookings { + @Reference + protected Trips mytrips; + + @Reference + protected Updates cart; + + public String newBooking(String trip, int people) { + String resCode = mytrips.checkAvailability(trip, people); + cart.addTrip(resCode); + return "GV" + resCode; + } +} diff --git a/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite b/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite index f166a1635d..6d47793aa4 100644 --- a/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite +++ b/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite @@ -22,7 +22,7 @@ name="Tours"> - + @@ -35,7 +35,7 @@ - + diff --git a/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java deleted file mode 100644 index d30046aaef..0000000000 --- a/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java +++ /dev/null @@ -1,26 +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.goodvaluetrips; - -public class TripProvider implements Trips { - public String checkAvailability(String trip, int people) { - // call non-SCA code to reserve trip and return booking code - return "6R98Y"; - } -} diff --git a/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java new file mode 100644 index 0000000000..06f93f2637 --- /dev/null +++ b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java @@ -0,0 +1,28 @@ +/* + * 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.goodvaluetrips.impl; + +import com.goodvaluetrips.Trips; + +public class TripProviderImpl implements Trips { + public String checkAvailability(String trip, int people) { + // call non-SCA code to reserve trip and return booking code + return "6R98Y"; + } +} diff --git a/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite b/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite index ab173e5ef7..8d1db35b1f 100644 --- a/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite +++ b/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite @@ -22,7 +22,7 @@ name="Trips"> - + -- cgit v1.2.3