tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r718005 - in /tuscany/sandbox/travelsample: gettingstarted/ gettingstarted/src/client/ scatours-contribution/src/scatours/ shoppingcart-contribution/ shoppingcart-contribution/src/scatours/travel/ travel-contribution/ travelcatalog-contribu...
Date Sun, 16 Nov 2008 11:05:31 GMT
Author: slaws
Date: Sun Nov 16 03:05:30 2008
New Revision: 718005

URL: http://svn.apache.org/viewvc?rev=718005&view=rev
Log:
some tidying 

Removed:
    tuscany/sandbox/travelsample/travel-contribution/
    tuscany/sandbox/travelsample/trip-contribution/
Modified:
    tuscany/sandbox/travelsample/gettingstarted/pom.xml
    tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
    tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
    tuscany/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java
    tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml
    tuscany/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
    tuscany/sandbox/travelsample/travelcatalog-contribution/pom.xml
    tuscany/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java

Modified: tuscany/sandbox/travelsample/gettingstarted/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/pom.xml?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/pom.xml (original)
+++ tuscany/sandbox/travelsample/gettingstarted/pom.xml Sun Nov 16 03:05:30 2008
@@ -31,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>

Modified: tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java Sun
Nov 16 03:05:30 2008
@@ -18,7 +18,6 @@
  */
 package client;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;

Modified: tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java Sun Nov 16 03:05:30
2008
@@ -18,7 +18,6 @@
  */
 package client;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;

Modified: tuscany/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java (original)
+++ tuscany/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java Sun
Nov 16 03:05:30 2008
@@ -42,7 +42,6 @@
 import scatours.common.TripLeg;
 import scatours.currencyconverter.CurrencyConverter;
 import scatours.travelcatalog.TravelCatalogSearch;
-import scatours.trip.Trip;
 import scatours.tripbooking.TripBooking;
 
 /**

Modified: tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml Sun Nov 16 03:05:30 2008
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-trip-contribution</artifactId>
+            <artifactId>scatours-tripbooking-contribution</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency> 
 

Modified: tuscany/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
(original)
+++ tuscany/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
Sun Nov 16 03:05:30 2008
@@ -41,14 +41,13 @@
 import scatours.common.TripItem;
 import scatours.common.TripLeg;
 import scatours.currencyconverter.CurrencyConverter;
-import scatours.trip.Trip;
 
 /**
  * An implementation of the Trip service
  */
 @Scope("COMPOSITE")
 @Service(interfaces={TravelSearch.class, TravelBooking.class})
-public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{
+public class TravelImpl implements TravelSearch, SearchCallback{
     
     @Reference
     protected CurrencyConverter currencyConverter;
@@ -62,8 +61,6 @@
     @Reference 
     protected Search carSearch;
     
-    @Reference
-    protected Trip trip;
         
     @Property
     public String quoteCurrencyCode = "USD";
@@ -74,7 +71,6 @@
     private int responsesReceived = 0;
     
     private List<TripItem> searchResults = new ArrayList<TripItem>();
-    private Map<String,Trip> trips = new HashMap<String,Trip>();
     
     // TravelSearch methods
     
@@ -134,38 +130,5 @@
         }
     }    
 
-    // TravelBooking methods
-    
-    public String newTrip(){
-        String tripId = UUID.randomUUID().toString();
-        ServiceReference<Trip> tripReference = componentContext.getServiceReference(Trip.class,

-                                                                                    "trip");
-        tripReference.setConversationID(tripId);
-        trips.put(tripId, tripReference.getService());
-        return tripId;
-    }
-    
-    public void addTripItem(String tripId, String id){
-        for (TripItem tripItem : searchResults) {
-            if (tripItem.getId().equals(id)){
-                trips.get(tripId).addTripItem(tripItem);
-            }
-        }
-    }
-    
-    public void removeTripItem(String tripId, String id){
-        trips.get(tripId).removeTripItem(id);
-    } 
-    
-    public TripItem[] getTripItems(String tripId) {
-        return trips.get(tripId).getTripItems();
-    }
-    
-    public double getTotalPrice(String tripId){ 
-        return trips.get(tripId).getTripPrice();
-    }
-    
-    public void purchaseTrip(String tripId) {
-        trips.get(tripId).purchaseTrip();
-    }
+
 }

Modified: tuscany/sandbox/travelsample/travelcatalog-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/travelcatalog-contribution/pom.xml?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/travelcatalog-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/travelcatalog-contribution/pom.xml Sun Nov 16 03:05:30 2008
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-trip-contribution</artifactId>
+            <artifactId>scatours-tripbooking-contribution</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency> 
 

Modified: tuscany/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java?rev=718005&r1=718004&r2=718005&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
(original)
+++ tuscany/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
Sun Nov 16 03:05:30 2008
@@ -41,7 +41,6 @@
 import scatours.common.TripItem;
 import scatours.common.TripLeg;
 import scatours.currencyconverter.CurrencyConverter;
-import scatours.trip.Trip;
 
 /**
  * An implementation of the Trip service



Mime
View raw message