svn commit: r805586 - in /tuscany/sandbox/travelsample/contributions: introducing-client/src/main/java/scatours/client/ introducing-client/src/main/java/scatours/client/impl/ introducing-client/src/main/resources/ introducing-tours/src/main/java/com/tu...

[na...@apache.org]

Author: nash
Date: Tue Aug 18 21:19:25 2009
New Revision: 805586

URL: http://svn.apache.org/viewvc?rev=805586&view=rev
Log:
Change introducing-* samples to use .impl packages and xxxImpl names for implementation classes

Added:
    tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/
    tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java
      - copied, changed from r805564, tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java
    tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/
    tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java
      - copied, changed from r805564, tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
    tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
      - copied, changed from r805564, tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java
    tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/
    tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java
      - copied, changed from r805564, tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java
Removed:
    tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java
    tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
    tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java
    tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java
Modified:
    tuscany/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite
    tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
    tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite

Copied: tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java (from r805564, tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java?p2=tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java&p1=tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java&r1=805564&r2=805586&rev=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java Tue Aug 18 21:19:25 2009
@@ -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.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() {

Modified: tuscany/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite?rev=805586&r1=805585&r2=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite Tue Aug 18 21:19:25 2009
@@ -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>

Copied: tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java (from r805564, tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java?p2=tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java&p1=tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java&r1=805564&r2=805586&rev=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java Tue Aug 18 21:19:25 2009
@@ -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) {

Copied: tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java (from r805564, tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java?p2=tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java&p1=tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java&r1=805564&r2=805586&rev=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java Tue Aug 18 21:19:25 2009
@@ -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;

Modified: tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite?rev=805586&r1=805585&r2=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite Tue Aug 18 21:19:25 2009
@@ -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>

Copied: tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java (from r805564, tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java?p2=tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java&p1=tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java&r1=805564&r2=805586&rev=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java Tue Aug 18 21:19:25 2009
@@ -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";

Modified: tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite?rev=805586&r1=805585&r2=805586&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite (original)
+++ tuscany/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite Tue Aug 18 21:19:25 2009
@@ -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>