Copy into trunk from sandbox

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

10 files changed, 625 insertions, 0 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/build.xml
new file mode 100644
index 0000000000..0d03b5401d
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/build.xml
@@ -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.
+-->
+
+<project name="scatours-contribution-interaction-client" default="compile">
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../calendar/target/scatours-contribution-calendar.jar"/>
+        <pathelement path="../common/target/scatours-contribution-common.jar"/>
+        <pathelement path="../currency/target/scatours-contribution-currency.jar"/>
+        <pathelement path="../shoppingcart/target/scatours-contribution-shoppingcart.jar"/>
+    </path>
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
new file mode 100644
index 0000000000..3005f3512c
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
@@ -0,0 +1,72 @@
+<?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>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-contribution-interaction-client</artifactId>
+    <name>Apache Tuscany SCA Tours Interaction Client Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>${tuscany.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-common</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-calendar</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-hotel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-currency</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-shoppingcart</artifactId>
+            <version>${pom.version}</version>
+        </dependency>        
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
new file mode 100644
index 0000000000..290e6e6aee
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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 org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.shoppingcart.CartStore;
+
+@Scope("COMPOSITE")
+@Service(Runnable.class)
+public class InteractionConversationClientImpl implements Runnable {
+
+    @Reference
+    protected CartStore cartStoreConversation;
+
+    public void run() {
+        System.out.println("\nCalling cart store using the conversational interaction pattern");
+
+        // add some trip items to the cart store
+        TripItem tripItem = getTestTripItem();
+        cartStoreConversation.addTrip(tripItem);
+
+        tripItem.setDescription("2nd trip item");
+        cartStoreConversation.addTrip(tripItem);
+
+        tripItem.setDescription("3rd trip item");
+        cartStoreConversation.addTrip(tripItem);
+
+        System.out.println("Trip items now in cart");
+        TripItem[] tripItems = cartStoreConversation.getTrips();
+        for (TripItem item : tripItems) {
+            System.out.println("Item - " + item.getDescription());
+        }
+
+        System.out.println("Reset the cart");
+        cartStoreConversation.reset();
+
+        System.out.println("Trip items now in cart");
+        tripItems = cartStoreConversation.getTrips();
+        for (TripItem item : tripItems) {
+            System.out.println("Item - " + item.getDescription());
+        }
+    }
+
+    private TripItem getTestTripItem() {
+        TripItem tripItem = new TripItem();
+        tripItem.setLocation("FLR");
+        tripItem.setFromDate("06/12/09 00:00");
+        tripItem.setToDate("13/12/09 00:00");
+        tripItem.setDescription("1st trip item");
+        return tripItem;
+    }
+}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java
new file mode 100644
index 0000000000..ca3cb2874a
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java
@@ -0,0 +1,53 @@
+/*
+ * 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 org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.calendar.Calendar;
+import com.tuscanyscatours.common.TripLeg;
+
+@Service(Runnable.class)
+public class InteractionLocalClientImpl implements Runnable {
+
+    @Reference
+    protected Calendar calendarLocal;
+
+    public void run() {
+        System.out.println("\nCalling calendar component over a local binding");
+        TripLeg tripLeg = getTestTripLeg();
+        String toDate = calendarLocal.getEndDate(tripLeg.getFromDate(), 10);
+        tripLeg.setToDate(toDate);
+        System.out.println("Calculated trip end date - " + toDate);
+        ;
+    }
+
+    private TripLeg getTestTripLeg() {
+        TripLeg tripLeg = new TripLeg();
+        tripLeg.setFromLocation("LGW");
+        tripLeg.setToLocation("FLR");
+        tripLeg.setFromDate("06/12/09 00:00");
+        tripLeg.setToDate("13/12/09 00:00");
+        tripLeg.setNoOfPeople("1");
+        tripLeg.setId("TRIP27");
+        return tripLeg;
+    }
+}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
new file mode 100644
index 0000000000..9689ce8e0c
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
@@ -0,0 +1,78 @@
+/*
+ * 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.util.concurrent.CountDownLatch;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+
+@Scope("COMPOSITE")
+@Service(Runnable.class)
+public class InteractionOneWayCallbackClientImpl implements Runnable, SearchCallback {
+
+    @Reference
+    protected Search hotelSearchOneWayCallback;
+
+    CountDownLatch resultsReceivedCountdown;
+
+    public void run() {
+        System.out.println("\nCalling hotel component using both one way and callback interation patterns");
+        resultsReceivedCountdown = new CountDownLatch(1);
+        TripLeg tripLeg = getTestTripLeg();
+        hotelSearchOneWayCallback.searchAsynch(tripLeg);
+
+        // start other searched here while the hotel search progresses
+
+        // wait for responses to come back
+        try {
+            resultsReceivedCountdown.await();
+        } catch (InterruptedException ex) {
+        }
+    }
+
+    public void searchResults(TripItem[] items) {
+        for (TripItem tripItem : items) {
+            System.out.println("Found hotel - " + tripItem.getName());
+        }
+        resultsReceivedCountdown.countDown();
+    }
+
+    public void setPercentComplete(String searchComponent, int percentComplete) {
+        // Not used in this sample
+    }
+
+    private TripLeg getTestTripLeg() {
+        TripLeg tripLeg = new TripLeg();
+        tripLeg.setFromLocation("LGW");
+        tripLeg.setToLocation("FLR");
+        tripLeg.setFromDate("06/12/09 00:00");
+        tripLeg.setToDate("13/12/09 00:00");
+        tripLeg.setNoOfPeople("1");
+        tripLeg.setId("TRIP27");
+        return tripLeg;
+    }
+}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
new file mode 100644
index 0000000000..1fd9d9cbe8
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
@@ -0,0 +1,64 @@
+/*
+ * 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 org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+
+@Service(Runnable.class)
+public class InteractionRemoteClientImpl implements Runnable, SearchCallback {
+
+    @Reference
+    protected Search hotelSearchRemote;
+
+    public void run() {
+        System.out.println("\nCalling hotel component over a remote binding");
+        TripLeg tripLeg = getTestTripLeg();
+        TripItem[] tripItems = hotelSearchRemote.searchSynch(tripLeg);
+        for (TripItem tripItem : tripItems) {
+            System.out.println("Found hotel - " + tripItem.getName());
+        }
+    }
+
+    public void searchResults(TripItem[] items) {
+        // we are calling the hotel component synchronously here
+        // so the callback interface is not used
+    }
+
+    public void setPercentComplete(String searchComponent, int percentComplete) {
+        // Not used in this sample
+    }
+
+    private TripLeg getTestTripLeg() {
+        TripLeg tripLeg = new TripLeg();
+        tripLeg.setFromLocation("LGW");
+        tripLeg.setToLocation("FLR");
+        tripLeg.setFromDate("06/12/09 00:00");
+        tripLeg.setToDate("13/12/09 00:00");
+        tripLeg.setNoOfPeople("1");
+        tripLeg.setId("TRIP27");
+        return tripLeg;
+    }
+}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
new file mode 100644
index 0000000000..d1438434ae
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
@@ -0,0 +1,39 @@
+/*
+ * 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 org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
+
+@Service(Runnable.class)
+public class InteractionRequestResponseClientImpl implements Runnable {
+
+    @Reference
+    protected CurrencyConverter currencyConverterRequestResponse;
+
+    public void run() {
+        System.out.println("\nCalling currency converter component using request response interation pattern");
+        double exchangeRate = currencyConverterRequestResponse.getExchangeRate("GBP", "USD");
+        System.out.println("GBP to USD exchange rate is " + exchangeRate);
+    }
+
+}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java
new file mode 100644
index 0000000000..87cea904ac
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java
@@ -0,0 +1,98 @@
+/*
+ * 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.util.concurrent.CountDownLatch;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+
+@Scope("CONVERSATION")
+@Service(Runnable.class)
+public class InteractionStatefulCallbackClientImpl implements Runnable, SearchCallback {
+
+    @Reference
+    protected Search flightSearchStatefulCallback;
+
+    @Context
+    protected ComponentContext componentContext;
+
+    CountDownLatch resultsReceivedCountdown;
+
+    public void run() {
+        System.out.println("\nCalling flight component using stateful callback interation pattern");
+        resultsReceivedCountdown = new CountDownLatch(1);
+        TripLeg tripLeg = getTestTripLeg();
+
+        ServiceReference<Search> dynamicFlightSearchStatefulCallback =
+            componentContext.getServiceReference(Search.class, "flightSearchStatefulCallback");
+        dynamicFlightSearchStatefulCallback.setConversationID("SomeUniqeID");
+        Search flightSearch = dynamicFlightSearchStatefulCallback.getService();
+
+        flightSearch.searchAsynch(tripLeg);
+
+        // wait for a while and see how the flight search is getting one
+        try {
+            Thread.sleep(1200);
+        } catch (Exception ex) {
+            // do nothing
+        }
+        System.out.println("Flight search is " + flightSearch.getPercentComplete() + "% complete");
+
+        // wait for responses to come back
+        try {
+            resultsReceivedCountdown.await();
+        } catch (InterruptedException ex) {
+        }
+    }
+
+    public void searchResults(TripItem[] items) {
+        System.out.println("Received results in conversation - " + componentContext.getRequestContext()
+            .getServiceReference().getConversation().getConversationID());
+        for (TripItem tripItem : items) {
+            System.out.println("Found flight - " + tripItem.getName());
+        }
+        resultsReceivedCountdown.countDown();
+    }
+
+    public void setPercentComplete(String searchComponent, int percentComplete) {
+        System.out.println(searchComponent + " search is " + percentComplete + "% complete");
+    }
+
+    private TripLeg getTestTripLeg() {
+        TripLeg tripLeg = new TripLeg();
+        tripLeg.setFromLocation("LGW");
+        tripLeg.setToLocation("FLR");
+        tripLeg.setFromDate("06/12/09");
+        tripLeg.setToDate("13/12/09");
+        tripLeg.setNoOfPeople("1");
+        tripLeg.setId("TRIP27");
+        return tripLeg;
+    }
+}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..283a1588df
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,30 @@
+<?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"
+              xmlns:tours="http://tucsanyscatours.com/">
+    <import.java package="com.tuscanyscatours.calendar" />
+    <import.java package="com.tuscanyscatours.calendar.impl" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.currencyconverter" />
+    <import.java package="com.tuscanyscatours.currencyconverter.impl" />
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <import.java package="com.tuscanyscatours.shoppingcart.impl" />
+    <deployable composite="tours:client" />
+</contribution>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
new file mode 100644
index 0000000000..7caa8e7bb8
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
@@ -0,0 +1,90 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://tuscanyscatours.com/"
+    name="Client">
+
+    <!-- Local interaction -->
+    <component name="InteractionLocalClient">
+        <implementation.java class="scatours.client.impl.InteractionLocalClientImpl" />
+        <reference name="calendarLocal" 
+                   target="Calendar"/>
+     </component>
+     
+    <component name="Calendar">
+		<implementation.java class="com.tuscanyscatours.calendar.impl.CalendarImpl"/>
+    </component> 
+    
+    <!-- Remote interaction -->
+    <component name="InteractionRemoteClient">
+        <implementation.java class="scatours.client.impl.InteractionRemoteClientImpl" />
+        <reference name="hotelSearchRemote">
+            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
+        </reference>
+    </component>
+     
+    <!-- Request response interaction -->
+    <component name="InteractionRequestResponseClient">
+        <implementation.java class="scatours.client.impl.InteractionRequestResponseClientImpl" />
+        <reference name="currencyConverterRequestResponse" target="CurrencyConverter"/>
+    </component>
+     
+    <component name="CurrencyConverter">
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
+    </component> 
+    
+    <!-- One way and callback interaction -->
+    <component name="InteractionOneWayCallbackClient">
+        <implementation.java class="scatours.client.impl.InteractionOneWayCallbackClientImpl" />
+        <reference name="hotelSearchOneWayCallback">
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
+            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
+            <callback>
+                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallback"/>
+            </callback>
+        </reference>
+     </component>
+     
+     <!-- Conversational interaction -->
+     <component name="InteractionConversationClient">
+        <implementation.java class="scatours.client.impl.InteractionConversationClientImpl" />
+        <reference name="cartStoreConversation" target="CartStore"/>
+     </component>
+              
+    <component name="CartStore">
+        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
+        <service name="CartStore"/>
+    </component> 
+    
+    <!-- Stateful callback interaction -->
+    <component name="InteractionStatefulCallbackClient">
+        <implementation.java class="scatours.client.impl.InteractionStatefulCallbackClientImpl" />
+        <reference name="flightSearchStatefulCallback">
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
+            <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/>
+            <callback>
+                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallbackConversational"/>
+            </callback>
+        </reference>
+     </component>    
+
+</composite>