diff options
Diffstat (limited to 'sandbox/travelsample/contributions')
7 files changed, 21 insertions, 14 deletions
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/impl/TestClientImpl.java index 64a1487f72..7a8258795b 100644 --- a/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java +++ b/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java @@ -17,7 +17,7 @@ * under the License.
*/
-package scatours.client;
+package scatours.client.impl;
import java.math.BigDecimal;
@@ -28,14 +28,14 @@ import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service;
@Service(Runnable.class)
-public class TestClient {
+public class TestClientImpl {
@Reference
protected Bookings bookings;
@Reference
protected Checkout checkout;
- public TestClient() {
+ public TestClientImpl() {
}
public void run() {
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">
<component name="TestClient">
- <implementation.java class="scatours.client.TestClient" />
+ <implementation.java class="scatours.client.impl.TestClientImpl" />
<reference name="bookings" target="TripBooking/Bookings" />
<reference name="checkout" target="ShoppingCart/Checkout" />
</component>
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/impl/ShoppingCartImpl.java index db551501e1..7d2fe8f951 100644 --- a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java +++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java @@ -16,13 +16,15 @@ * specific language governing permissions and limitations
* under the License.
*/
-package com.tuscanyscatours;
+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 ShoppingCart implements Checkout, Updates {
+public class ShoppingCartImpl implements Checkout, Updates {
private static List<String> bookedTrips = new ArrayList<String>();
public void makePayment(BigDecimal amount, String cardInfo) {
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/impl/TripBookingImpl.java index e64d60545e..cd1573380c 100644 --- a/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java +++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java @@ -16,13 +16,16 @@ * specific language governing permissions and limitations
* under the License.
*/
-package com.tuscanyscatours;
+package com.tuscanyscatours.impl;
+import com.goodvaluetrips.Trips;
+import com.tuscanyscatours.Bookings;
+import com.tuscanyscatours.Updates;
import org.osoa.sca.annotations.Reference;
-public class TripBooking implements Bookings {
+public class TripBookingImpl implements Bookings {
@Reference
- protected com.goodvaluetrips.Trips mytrips;
+ protected Trips mytrips;
@Reference
protected Updates cart;
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">
<component name="TripBooking">
- <implementation.java class="com.tuscanyscatours.TripBooking" />
+ <implementation.java class="com.tuscanyscatours.impl.TripBookingImpl" />
<service name="Bookings">
<interface.java interface="com.tuscanyscatours.Bookings" />
</service>
@@ -35,7 +35,7 @@ </component>
<component name="ShoppingCart">
- <implementation.java class="com.tuscanyscatours.ShoppingCart"/>
+ <implementation.java class="com.tuscanyscatours.impl.ShoppingCartImpl"/>
<service name="Checkout">
<interface.java interface="com.tuscanyscatours.Checkout" />
</service>
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/impl/TripProviderImpl.java index d30046aaef..06f93f2637 100644 --- a/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java +++ b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java @@ -16,9 +16,11 @@ * specific language governing permissions and limitations
* under the License.
*/
-package com.goodvaluetrips;
+package com.goodvaluetrips.impl;
-public class TripProvider implements Trips {
+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">
<component name="TripProvider">
- <implementation.java class="com.goodvaluetrips.TripProvider" />
+ <implementation.java class="com.goodvaluetrips.impl.TripProviderImpl" />
<service name="Trips">
<interface.java interface="com.goodvaluetrips.Trips" />
</service>
|