some tidying

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718005 13f79535-47bb-0310-9956-ffa450edef68

18 files changed, 5 insertions, 705 deletions

diff --git a/sandbox/travelsample/gettingstarted/pom.xml b/sandbox/travelsample/gettingstarted/pom.xml
index dec1c4ecc2..71c0de3f23 100644
--- a/sandbox/travelsample/gettingstarted/pom.xml
+++ b/sandbox/travelsample/gettingstarted/pom.xml
@@ -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>
diff --git a/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java b/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
index 79f274fa65..2eaf621599 100644
--- a/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
+++ b/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
@@ -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;
diff --git a/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java b/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
index 54dcb4e52a..bb9d9cce15 100644
--- a/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
+++ b/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
@@ -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;
diff --git a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java b/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java
index 727b55dd69..2896997326 100644
--- a/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java
+++ b/sandbox/travelsample/scatours-contribution/src/scatours/SCAToursImpl.java
@@ -42,7 +42,6 @@ import scatours.common.TripItem;
 import scatours.common.TripLeg;
 import scatours.currencyconverter.CurrencyConverter;
 import scatours.travelcatalog.TravelCatalogSearch;
-import scatours.trip.Trip;
 import scatours.tripbooking.TripBooking;
 
 /**
diff --git a/sandbox/travelsample/shoppingcart-contribution/pom.xml b/sandbox/travelsample/shoppingcart-contribution/pom.xml
index a013d86272..f0e6b92575 100644
--- a/sandbox/travelsample/shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/shoppingcart-contribution/pom.xml
@@ -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> 
 
diff --git a/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java b/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
index cbd50e5b35..b2d9fe1063 100644
--- a/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
+++ b/sandbox/travelsample/shoppingcart-contribution/src/scatours/travel/TravelImpl.java
@@ -41,14 +41,13 @@ import scatours.common.SearchCallback;
 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 @@ public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{
     @Reference 
     protected Search carSearch;
     
-    @Reference
-    protected Trip trip;
         
     @Property
     public String quoteCurrencyCode = "USD";
@@ -74,7 +71,6 @@ public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{
     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 @@ public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{
         }
     }    
 
-    // 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();
-    }
+
 }
diff --git a/sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml
deleted file mode 100644
index 687c894496..0000000000
--- a/sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.currencyconverter"/>
-   <import.java package="scatours.trip"/>
-   <export.java package="scatours.travel"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/travel-contribution/pom.xml b/sandbox/travelsample/travel-contribution/pom.xml
deleted file mode 100644
index f7331045f2..0000000000
--- a/sandbox/travelsample/travel-contribution/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent>
-    <artifactId>scatours-travel-contribution</artifactId>
-    <name>Apache Tuscany SCA Tours Travel Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency> 
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-trip-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}/src</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-                  <exclude>src/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-    </build>
-</project>
diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java
deleted file mode 100644
index fec3ceb366..0000000000
--- a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java
+++ /dev/null
@@ -1,38 +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.travel;
-
-
-import org.osoa.sca.annotations.Remotable;
-
-import scatours.common.TripItem;
-
-/**
- * The TravelBooking service interface
- */
-@Remotable
-public interface TravelBooking {
-       
-    String newTrip();
-    void addTripItem(String tripId, String id);
-    void removeTripItem(String tripId, String id);
-    TripItem[] getTripItems(String tripId);
-    double getTotalPrice(String tripId);
-    void purchaseTrip(String tripId);
-}
diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java
deleted file mode 100644
index cbd50e5b35..0000000000
--- a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java
+++ /dev/null
@@ -1,171 +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.travel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-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{
-    
-    @Reference
-    protected CurrencyConverter currencyConverter;
-    
-    @Reference 
-    protected Search hotelSearch;
-    
-    @Reference 
-    protected Search flightSearch;
-    
-    @Reference 
-    protected Search carSearch;
-    
-    @Reference
-    protected Trip trip;
-        
-    @Property
-    public String quoteCurrencyCode = "USD";
-    
-    @Context
-    protected ComponentContext componentContext;    
-    
-    private int responsesReceived = 0;
-    
-    private List<TripItem> searchResults = new ArrayList<TripItem>();
-    private Map<String,Trip> trips = new HashMap<String,Trip>();
-    
-    // TravelSearch methods
-    
-    public TripItem[] search(TripLeg tripLeg) {
-        
-        searchResults.clear();
-        responsesReceived = 0;
-        
-        ServiceReference<Search> dynamicHotelSearch = 
-            componentContext.getServiceReference(Search.class, "hotelSearch");
-        
-        dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());        
-        dynamicHotelSearch.getService().searchAsynch(tripLeg);
-        
-        flightSearch.searchAsynch(tripLeg);
-        carSearch.searchAsynch(tripLeg);
-        
-        while (responsesReceived < 3){
-            try {
-                synchronized (this) {
-                    this.wait();
-                }
-            } catch (InterruptedException ex){
-                // do nothing
-            }
-        }
-        
-        for (TripItem tripItem : searchResults){
-            tripItem.setId(UUID.randomUUID().toString());
-            tripItem.setTripId(tripLeg.getId());
-            tripItem.setPrice(currencyConverter.convert(tripItem.getCurrency(), 
-                                                        quoteCurrencyCode, 
-                                                        tripItem.getPrice()));
-            tripItem.setCurrency(quoteCurrencyCode);
-        }
-        
-        return searchResults.toArray(new TripItem[searchResults.size()]);
-    }
-    
-    // SearchCallback methods
-    
-    public void searchResults(TripItem[] items){
-        RequestContext requestContext = componentContext.getRequestContext();
-        Object callbackID = requestContext.getServiceReference().getCallbackID();
-        System.out.println(callbackID);
-        
-        for(int i = 0; i < items.length; i++ ){
-            searchResults.add(items[i]);
-        }
-        
-        responsesReceived++;
-        try {
-            synchronized (this) {
-                this.notifyAll();
-            }
-        } catch (Exception ex) {
-        }
-    }    
-
-    // 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();
-    }
-}
diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.java
deleted file mode 100644
index d1aeed2906..0000000000
--- a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.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.travel;
-
-import org.osoa.sca.annotations.Remotable;
-
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-
-/**
- * The Trip service interface
- */
-@Remotable
-public interface TravelSearch {
-    TripItem[] search(TripLeg tripLeg);
-}
diff --git a/sandbox/travelsample/travelcatalog-contribution/pom.xml b/sandbox/travelsample/travelcatalog-contribution/pom.xml
index dcf883209d..01389b5462 100644
--- a/sandbox/travelsample/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/travelcatalog-contribution/pom.xml
@@ -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> 
 
diff --git a/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
index f51004df3b..524507589d 100644
--- a/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
+++ b/sandbox/travelsample/travelcatalog-contribution/src/scatours/travelcatalog/TravelCatalogImpl.java
@@ -41,7 +41,6 @@ import scatours.common.SearchCallback;
 import scatours.common.TripItem;
 import scatours.common.TripLeg;
 import scatours.currencyconverter.CurrencyConverter;
-import scatours.trip.Trip;
 
 /**
  * An implementation of the Trip service
diff --git a/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
deleted file mode 100644
index 6f55d961fd..0000000000
--- a/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.currencyconverter"/>
-   <export.java package="scatours.trip"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/trip-contribution/build.xml b/sandbox/travelsample/trip-contribution/build.xml
deleted file mode 100644
index b4fbc726cf..0000000000
--- a/sandbox/travelsample/trip-contribution/build.xml
+++ /dev/null
@@ -1,61 +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.    
--->
-<project name="gettingstarted" default="compile">
-	<property environment="env"/> 
-	
-    <target name="compile">
-    	<mkdir dir="target/classes"/>
-        <javac srcdir="src" destdir="target/classes" 
-        	           debug="on" source="1.5" target="1.5">
-            <classpath>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>   	
-    </target>
-	
-    <target name="run">
-        <java classname="client.CurrencyConverterClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target> 	
-	
-    <target name="runtrip">
-        <java classname="client.TripClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="runtripws">
-        <java classname="client.TripWsClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target>   	
-</project>
diff --git a/sandbox/travelsample/trip-contribution/pom.xml b/sandbox/travelsample/trip-contribution/pom.xml
deleted file mode 100644
index b3cc2a5b5f..0000000000
--- a/sandbox/travelsample/trip-contribution/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent>
-    <artifactId>scatours-trip-contribution</artifactId>
-    <name>Apache Tuscany SCA Tours Trip Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}/src</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-                  <exclude>src/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-    </build>
-</project>
diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/Trip.java b/sandbox/travelsample/trip-contribution/src/scatours/trip/Trip.java
deleted file mode 100644
index 3555def0be..0000000000
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/Trip.java
+++ /dev/null
@@ -1,48 +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.trip;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Remotable;
-
-import scatours.common.TripItem;
-
-/**
- * The Trip service interface
- */
-@Remotable
-@Conversational
-public interface Trip {
-       
-    void startTrip(String id);
-
-    void addTripItem(TripItem tripItem);
-    
-    void removeTripItem(String id);
-    
-    TripItem[] getTripItems();
-    
-    double getTripPrice();
-    
-    @EndsConversation
-    void purchaseTrip();
-}
diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java b/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
deleted file mode 100644
index 9e536acbdd..0000000000
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
+++ /dev/null
@@ -1,90 +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.trip;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-import scatours.common.TripItem;
-
-/**
- * An implementation of the Trip service
- */
-@Scope("CONVERSATION")
-@Service(interfaces={Trip.class})
-public class TripImpl implements Trip{
-
-    @ConversationID
-    protected String conversationId;
-    
-    private Map<String, TripItem> tripItems = new HashMap<String, TripItem>();
-     
-    // Trip methods
-    
-    @Init
-    public void initTrip() {
-        //TODO
-        System.out.println("Trip init");
-    }
-    
-    @Destroy
-    public void destroyTrip() {
-        //TODO
-        System.out.println("Trip destroy");
-    }
-    
-    public void startTrip(String id){
-        tripItems.clear();
-    }
-    
-    public void addTripItem(TripItem tripItem){
-        tripItems.put(tripItem.getId(), tripItem);
-    }
-    
-    public void removeTripItem(String id){
-        tripItems.remove(id);
-    }  
-    
-    public TripItem[] getTripItems() {
-        return tripItems.values().toArray(new TripItem[tripItems.size()]);
-    }
-    
-    public double getTripPrice(){ 
-        double totalPrice = 0.0;
-        
-        for (TripItem tripItem : tripItems.values()){
-            totalPrice += tripItem.getPrice();
-        }
-        
-        return totalPrice;
-    }
-    
-    public void purchaseTrip() {
-        // TODO
-    }
-}