From c0be84658ad4dc4d9df3b7ddbf7cd18b261312d6 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Nov 2009 21:51:04 +0000
Subject: A bit of tidying in the full-app. Mainly renaming frontend to
 coordination and correcting the composite names in the full app contributions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884703 13f79535-47bb-0310-9956-ffa450edef68
---
 .../creditcard/CreditCardPaymentTestCase.java      |  2 +-
 .../main/resources/META-INF/sca-contribution.xml   |  2 +-
 .../main/resources/fullapp-bespoketrip.composite   | 63 +++++++++++++++
 .../src/main/resources/scatours.composite          | 63 ---------------
 .../contributions/fullapp-coordination/pom.xml     | 90 ++++++++++++++++++++++
 .../main/resources/META-INF/sca-contribution.xml   | 30 ++++++++
 .../main/resources/fullapp-coordination.composite  | 72 +++++++++++++++++
 .../main/resources/META-INF/sca-contribution.xml   |  2 +-
 .../src/main/resources/fullapp-currency.composite  | 28 +++++++
 .../src/main/resources/scatours.composite          | 28 -------
 .../contributions/fullapp-frontend/pom.xml         | 90 ----------------------
 .../main/resources/META-INF/sca-contribution.xml   | 30 --------
 .../src/main/resources/scatours.composite          | 72 -----------------
 .../main/resources/META-INF/sca-contribution.xml   |  2 +-
 .../main/resources/fullapp-packagedtrip.composite  | 37 +++++++++
 .../src/main/resources/scatours.composite          | 37 ---------
 .../main/resources/META-INF/sca-contribution.xml   |  2 +-
 .../main/resources/fullapp-shoppingcart.composite  | 36 +++++++++
 .../src/main/resources/scatours.composite          | 36 ---------
 .../main/resources/META-INF/sca-contribution.xml   |  2 +-
 .../src/main/resources/fullapp-ui.composite        | 58 ++++++++++++++
 .../src/main/resources/scatours.composite          | 58 --------------
 .../java/scatours/payment/PaymentTestCase.java     | 28 ++++---
 .../src/main/resources/payment.composite           |  4 +-
 sandbox/travelsample/contributions/pom.xml         |  2 +-
 25 files changed, 442 insertions(+), 432 deletions(-)
 create mode 100644 sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
 create mode 100644 sandbox/travelsample/contributions/fullapp-coordination/pom.xml
 create mode 100644 sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
 create mode 100644 sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-frontend/pom.xml
 delete mode 100644 sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml
 delete mode 100644 sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
 create mode 100644 sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
 create mode 100644 sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
 create mode 100644 sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite

(limited to 'sandbox/travelsample/contributions')

diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index 7f40910d82..a33b2b3046 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -48,7 +48,7 @@ public class CreditCardPaymentTestCase {
     public static void setUpBeforeClass() throws Exception {
         try {
             node =
-                SCANodeFactory.newInstance().createSCANode(null, new SCAContribution("creditcard", "./target/classes"));
+                SCANodeFactory.newInstance().createSCANode("creditcard.composite", new SCAContribution("creditcard", "./target/classes"));
 
             node.start();
         } catch (Exception ex) {
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
index 45344f051d..9ae204d8f7 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:bespoketrip" />
+    <deployable composite="scatours:fullapp-bespoketrip" />
     <import.java package="com.tuscanyscatours.common" />
     <import.java package="com.tuscanyscatours.hotel" />
     <import.java package="com.tuscanyscatours.hotel.impl" />
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
new file mode 100644
index 0000000000..76c91b7887
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
@@ -0,0 +1,63 @@
+<?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/"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           name="fullapp-bespoketrip">
+    
+    <component name="HotelPartner">
+        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
+        <service name="Search">
+            <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
+            <!-- tuscany:binding.jsonrpc name="searchjsonrpc"/-->
+            <callback>
+                <binding.ws/>
+            </callback> 
+        </service>
+        <service name="Book"/>
+    </component>  
+    
+    <component name="FlightPartner">
+        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
+        <service name="Search">
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
+            <binding.ws name="searchws" uri="http://localhost:8086/Flight/Search"/>
+            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
+            <callback>
+                <binding.ws/>
+            </callback>            
+        </service>
+        <service name="Book"/>
+    </component> 
+    
+    <component name="CarPartner">
+        <implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
+        <service name="Search">
+            <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
+            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
+            <callback>
+                <binding.ws/>
+            </callback> 
+        </service>
+        <service name="Book"/>        
+    </component>
+
+</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
deleted file mode 100644
index 741081c653..0000000000
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,63 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="bespoketrip">
-    
-    <component name="Hotel">
-        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
-        <service name="Search">
-            <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
-            <!-- tuscany:binding.jsonrpc name="searchjsonrpc"/-->
-            <callback>
-                <binding.ws/>
-            </callback> 
-        </service>
-        <service name="Book"/>
-    </component>  
-    
-    <component name="Flight">
-        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
-        <service name="Search">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws name="searchws" uri="http://localhost:8086/Flight/Search"/>
-            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
-            <callback>
-                <binding.ws/>
-            </callback>            
-        </service>
-        <service name="Book"/>
-    </component> 
-    
-    <component name="Car">
-        <implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
-        <service name="Search">
-            <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
-            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
-            <callback>
-                <binding.ws/>
-            </callback> 
-        </service>
-        <service name="Book"/>        
-    </component>
-
-</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-coordination/pom.xml b/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
new file mode 100644
index 0000000000..120e8bd490
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
@@ -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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-contribution-fullapp-coordination</artifactId>
+    <name>Apache Tuscany SCA Tours Full Application Coordination Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>${tuscany.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>${tuscany.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>${tuscany.version}</version>
+            <scope>test</scope>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>${tuscany.version}</version>
+            <scope>test</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <!--
+       <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>${tuscany.version}</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <mainClass>scatours.LaunchNode</mainClass>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+       </plugins>
+       -->
+    </build>
+</project>
diff --git a/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..a6eb8bcce2
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-coordination/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:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:fullapp-coordination" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.currencyconverter" /> 
+    <import.java package="com.tuscanyscatours.travelcatalog" /> 
+    <import.java package="com.tuscanyscatours.travelcatalog.impl" /> 
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <import.java package="com.tuscanyscatours.tripbooking" />
+    <import.java package="com.tuscanyscatours.tripbooking.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
new file mode 100644
index 0000000000..b3c901085d
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
@@ -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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://tuscanyscatours.com/"
+           name="fullapp-coordination">
+    
+    <component name="TravelCatalog">
+        <implementation.java class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
+        <service name="TravelCatalogSearch"/>
+        <reference name="hotelSearch">
+            <binding.ws uri="http://localhost:8086/Hotel/Search"/>
+            <callback>
+                <binding.ws name="callback"
+                            uri="http://localhost:8084/Hotel/SearchCallback"/>
+            </callback>
+        </reference>
+        <reference name="flightSearch">
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
+            <binding.ws uri="http://localhost:8086/Flight/Search"/>
+            <callback>
+                <binding.ws name="callback"
+                            uri="http://localhost:8084/Flight/SearchCallback"/>
+            </callback>
+        </reference> 
+        <reference name="carSearch">
+            <binding.ws uri="http://localhost:8086/Car/Search"/>
+            <callback>
+                <binding.ws name="callback"
+                            uri="http://localhost:8084/Car/SearchCallback"/>
+            </callback>
+        </reference>    
+        <reference name="tripSearch">
+            <binding.ws uri="http://localhost:8085/Trip/Search"/>
+            <callback>
+                <binding.ws name="callback"
+                            uri="http://localhost:8084/Trip/SearchCallback"/>
+            </callback>
+        </reference>     
+        <reference name="currencyConverter" target="CurrencyConverter">
+        </reference>
+        <property name="quoteCurrencyCode">GBP</property>
+    </component>
+    
+    <component name="TripBooking">
+        <implementation.java class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
+        <service name="TripBooking"/>
+        <reference name="hotelBook" target="HotelPartner/Book"/>
+        <reference name="flightBook" target="TripPartner/Book"/>
+        <reference name="carBook" target="CarPartner/Book"/>   
+        <reference name="tripBook" target="TripPartner/Book"/>  
+        <reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>      
+    </component>    
+
+</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
index c439cf9a77..dc66ed8db6 100644
--- a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:currency" />
+    <deployable composite="scatours:fullapp-currency" />
     <import.java package="com.tuscanyscatours.currencyconverter" />
     <import.java package="com.tuscanyscatours.currencyconverter.impl" />
 </contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
new file mode 100644
index 0000000000..654ff60c41
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
@@ -0,0 +1,28 @@
+<?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="fullapp-currency">
+  
+    <component name="CurrencyConverter">
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
+    </component> 
+    
+</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
deleted file mode 100644
index 7336c4c91d..0000000000
--- a/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,28 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="currency">
-  
-    <component name="CurrencyConverter">
-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
-    </component> 
-    
-</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend/pom.xml b/sandbox/travelsample/contributions/fullapp-frontend/pom.xml
deleted file mode 100644
index 93f6c9e255..0000000000
--- a/sandbox/travelsample/contributions/fullapp-frontend/pom.xml
+++ /dev/null
@@ -1,90 +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-scatours</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-frontend</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Front End Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 99a98f6136..0000000000
--- a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,30 +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"
-              xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:frontend" />
-    <import.java package="com.tuscanyscatours.common" />
-    <import.java package="com.tuscanyscatours.currencyconverter" /> 
-    <import.java package="com.tuscanyscatours.travelcatalog" /> 
-    <import.java package="com.tuscanyscatours.travelcatalog.impl" /> 
-    <import.java package="com.tuscanyscatours.shoppingcart" />
-    <import.java package="com.tuscanyscatours.tripbooking" />
-    <import.java package="com.tuscanyscatours.tripbooking.impl" />
-</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
deleted file mode 100644
index 6d18947bd1..0000000000
--- a/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,72 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="frontend">
-    
-    <component name="TravelCatalog">
-        <implementation.java class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
-        <service name="TravelCatalogSearch"/>
-        <reference name="hotelSearch">
-            <binding.ws uri="http://localhost:8086/Hotel/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Hotel/SearchCallback"/>
-            </callback>
-        </reference>
-        <reference name="flightSearch">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8086/Flight/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Flight/SearchCallback"/>
-            </callback>
-        </reference> 
-        <reference name="carSearch">
-            <binding.ws uri="http://localhost:8086/Car/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Car/SearchCallback"/>
-            </callback>
-        </reference>    
-        <reference name="tripSearch">
-            <binding.ws uri="http://localhost:8085/Trip/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Trip/SearchCallback"/>
-            </callback>
-        </reference>     
-        <reference name="currencyConverter" target="CurrencyConverter">
-        </reference>
-        <property name="quoteCurrencyCode">GBP</property>
-    </component>
-    
-    <component name="TripBooking">
-        <implementation.java class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
-        <service name="TripBooking"/>
-        <reference name="hotelBook" target="Hotel/Book"/>
-        <reference name="flightBook" target="Trip/Book"/>
-        <reference name="carBook" target="Car/Book"/>   
-        <reference name="tripBook" target="Trip/Book"/>  
-        <reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>      
-    </component>    
-
-</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
index 7844d200db..3059c49911 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:packagedtrip" />
+    <deployable composite="scatours:fullapp-packagedtrip" />
     <import.java package="com.tuscanyscatours.common" />
     <import.java package="com.tuscanyscatours.trip.impl" />
 </contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
new file mode 100644
index 0000000000..0f8dd33060
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
@@ -0,0 +1,37 @@
+<?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/"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           name="fullapp-packagedtrip">
+
+    <component name="TripPartner">
+        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
+        <service name="Search">
+            <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
+            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
+            <callback>
+                <binding.ws/>
+            </callback> 
+        </service>
+        <service name="Book"/>        
+    </component>
+
+</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
deleted file mode 100644
index 1a03021199..0000000000
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,37 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="packagedtrip">
-
-    <component name="Trip">
-        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
-        <service name="Search">
-            <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
-            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
-            <callback>
-                <binding.ws/>
-            </callback> 
-        </service>
-        <service name="Book"/>        
-    </component>
-
-</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
index 29769ba852..384887f792 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:shoppingcart" />
+    <deployable composite="scatours:fullapp-shoppingcart" />
     <import.java package="com.tuscanyscatours.payment" />
     <import.java package="com.tuscanyscatours.shoppingcart" />
     <import.java package="com.tuscanyscatours.shoppingcart.impl" />
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
new file mode 100644
index 0000000000..ed4fce84d6
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
@@ -0,0 +1,36 @@
+<?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="fullapp-shoppingcart">
+    
+    <component name="ShoppingCart">
+        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
+        <reference name="cartStore" target="CartStore"/>     
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8081/Payment" />
+        </reference> 
+    </component>    
+    
+    <component name="CartStore">
+        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
+    </component> 
+
+</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
deleted file mode 100644
index 97c6e649e2..0000000000
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,36 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="shoppingcart">
-    
-    <component name="ShoppingCart">
-        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
-        <reference name="cartStore" target="CartStore"/>     
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference> 
-    </component>    
-    
-    <component name="CartStore">
-        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
-    </component> 
-
-</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
index 6832ecaf79..104a78cd92 100644
--- a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:ui" />
+    <deployable composite="scatours:fullapp-ui" />
     <import.java package="com.tuscanyscatours" />
     <import.java package="com.tuscanyscatours.impl" />
     <import.java package="com.tuscanyscatours.shoppingcart" />
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
new file mode 100644
index 0000000000..bcfa894ca6
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
@@ -0,0 +1,58 @@
+<?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/"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           name="fullapp-ui">
+           
+    <component name="SCAToursUserInterface">
+        <tuscany:implementation.widget location="scatours.html"/>
+        <service name="Widget">
+            <tuscany:binding.http uri="/scatours"/>
+        </service>
+        <reference name="scaToursCatalog" target="SCATours/SCAToursSearch">
+            <tuscany:binding.jsonrpc/>
+        </reference> 
+        <reference name="scaToursBooking" target="SCATours/SCAToursBooking">
+            <tuscany:binding.jsonrpc/>
+        </reference>
+        <reference name="scaToursCart" target="SCATours/SCAToursCart">
+            <tuscany:binding.jsonrpc/>
+        </reference>                
+    </component>   
+    
+    <component name="SCATours">
+        <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/>
+        <service name="SCAToursSearch">
+            <tuscany:binding.jsonrpc/>
+        </service>
+        <service name="SCAToursBooking">
+            <tuscany:binding.jsonrpc/>
+        </service>
+        <service name="SCAToursCart">
+            <tuscany:binding.jsonrpc/>
+        </service>        
+        <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/>
+        <reference name="tripBooking" target="TripBooking"/>
+        <reference name="cartInitialize" target="ShoppingCart/CartInitialize"/>    
+        <reference name="cartCheckout" target="ShoppingCart/CartCheckout"/>       
+    </component>    
+   
+</composite>
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
deleted file mode 100644
index 5dd0d01102..0000000000
--- a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,58 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="ui">
-           
-    <component name="scatours">
-        <tuscany:implementation.widget location="scatours.html"/>
-        <service name="Widget">
-            <tuscany:binding.http uri="/scatours"/>
-        </service>
-        <reference name="scaToursCatalog" target="SCATours/SCAToursSearch">
-            <tuscany:binding.jsonrpc/>
-        </reference> 
-        <reference name="scaToursBooking" target="SCATours/SCAToursBooking">
-            <tuscany:binding.jsonrpc/>
-        </reference>
-        <reference name="scaToursCart" target="SCATours/SCAToursCart">
-            <tuscany:binding.jsonrpc/>
-        </reference>                
-    </component>   
-    
-    <component name="SCATours">
-        <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/>
-        <service name="SCAToursSearch">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="SCAToursBooking">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="SCAToursCart">
-            <tuscany:binding.jsonrpc/>
-        </service>        
-        <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/>
-        <reference name="tripBooking" target="TripBooking"/>
-        <reference name="cartInitialize" target="ShoppingCart/CartInitialize"/>    
-        <reference name="cartCheckout" target="ShoppingCart/CartCheckout"/>       
-    </component>    
-   
-</composite>
diff --git a/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
index 5fd8900fce..d8c79622e6 100644
--- a/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
@@ -31,22 +31,27 @@ import org.junit.Test;
 import com.tuscanyscatours.payment.Payment;
 
 public class PaymentTestCase {
-    private static SCANode node;
+    private static SCANode node1;
+    private static SCANode node2;
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-        node =
+        node1 =
             SCANodeFactory.newInstance()
-                .createSCANode(null,
-                               new SCAContribution("payment", "./target/classes"),
+                .createSCANode("payment.composite",
+                               new SCAContribution("payment", "./target/classes"));
+        node2 =
+            SCANodeFactory.newInstance()
+                .createSCANode("creditcard.composite",        
                                new SCAContribution("creditcard",
                                                    "../../contributions/creditcard-payment-jaxb/target/classes"));
-        node.start();
+        node1.start();
+        node2.start();
     }
 
     @Test
     public void testPayment() {
-        SCAClient client = (SCAClient)node;
+        SCAClient client = (SCAClient)node1;
         Payment payment = client.getService(Payment.class, "Payment");
 
         System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
@@ -66,10 +71,15 @@ public class PaymentTestCase {
 
     @AfterClass
     public static void tearDownAfterClass() throws Exception {
-        if (node != null) {
-            node.stop();
-            node = null;
+        if (node1 != null) {
+            node1.stop();
+            node1 = null;
         }
+        
+        if (node2 != null) {
+            node2.stop();
+            node2 = null;
+        }        
     }
 
 }
diff --git a/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
index d1ea76db4b..c6710c60a2 100644
--- a/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
@@ -26,8 +26,8 @@
         <service name="Payment">
             <binding.ws uri="http://localhost:8081/Payment"/>
         </service>
-        <reference name="creditCardPaymentReference" requires="authentication">
-            <binding.ws uri="http://localhost:8083/CreditCardPayment"/>
+        <reference name="creditCardPaymentReference" >
+            <binding.ws uri="http://localhost:8083/CreditCardPayment" requires="authentication"/>
         </reference>
         <reference name="emailGateway" target="EmailGateway"/>
          <reference name="customerRegistry" target="CustomerRegistry"/>
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 5b191e77a4..c6ece86582 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -57,7 +57,7 @@
                 <module>feed-logger</module>
                 <module>flight</module>
                 <module>fullapp-ui</module>
-                <module>fullapp-frontend</module>
+                <module>fullapp-coordination</module>
                 <module>fullapp-currency</module>
                 <module>fullapp-packagedtrip</module>
                 <module>fullapp-bespoketrip</module>
-- 
cgit v1.2.3