Take account of composite name changes

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

9 files changed, 33 insertions, 33 deletions

diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
index 812736e620..2b619002b7 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
@@ -24,7 +24,7 @@
            xmlns:ns2="http://tuscany.apache.org/cloud">
       
   <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
-  <include name="ns2:frontend" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:coordination" uri="http://tuscany.apache.org/cloud" />
   <include name="ns2:packagedtrip" uri="http://tuscany.apache.org/cloud" />
   <include name="ns2:bespoketrip" uri="http://tuscany.apache.org/cloud" />
   <include name="ns2:currency" uri="http://tuscany.apache.org/cloud" />
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
index 51f48a93f1..365917368e 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -25,7 +25,7 @@
 		name="bespoketrip">
 
     <component name="bespoketrip">
-        <t:implementation.node uri="fullapp-bespoketrip" composite="s:bespoketrip"/>
+        <t:implementation.node uri="fullapp-bespoketrip" composite="s:fullapp-bespoketrip"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8086"/>
             <binding.ws uri="http://localhost:8086"/>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
index 75c95daf4b..dc619880c3 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
@@ -22,10 +22,10 @@
         targetNamespace="http://tuscany.apache.org/cloud"
         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
         xmlns:s="http://tuscanyscatours.com/"
-		name="frontend">
+		name="coordination">
 
-    <component name="frontend">
-        <t:implementation.node uri="fullapp-frontend" composite="s:frontend"/>
+    <component name="coordination">
+        <t:implementation.node uri="fullapp-coordination" composite="s:fullapp-coordination"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8084"/>
             <binding.ws uri="http://localhost:8084"/>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
index 808d2843bd..0f0ab580f6 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
@@ -25,7 +25,7 @@
 		name="currency">
 
     <component name="currency">
-        <t:implementation.node uri="fullapp-currency" composite="s:currency"/>
+        <t:implementation.node uri="fullapp-currency" composite="s:fullapp-currency"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8083"/>
             <binding.ws uri="http://localhost:8083"/>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
index a6ec78b56c..caf7b79789 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -25,7 +25,7 @@
 		name="packagedtrip">
 
     <component name="packagedtrip">
-        <t:implementation.node uri="fullapp-packagedtrip" composite="s:packagedtrip"/>
+        <t:implementation.node uri="fullapp-packagedtrip" composite="s:fullapp-packagedtrip"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8085"/>
             <tuscany:binding.jsonrpc uri="http://localhost:8085"/>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
index dce5fe829e..69a1bd2ea7 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -25,7 +25,7 @@
 		name="shoppingcart">
 
     <component name="shoppingcart">
-        <t:implementation.node uri="fullapp-shoppingcart" composite="s:shoppingcart"/>
+        <t:implementation.node uri="fullapp-shoppingcart" composite="s:fullapp-shoppingcart"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8087"/>
             <binding.ws uri="http://localhost:8087"/>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
index d72432daff..230dfb9f20 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
@@ -24,7 +24,7 @@
 		name="ui">
 
     <component name="ui">
-        <t:implementation.node uri="fullapp-ui" composite="s:ui"/>
+        <t:implementation.node uri="fullapp-ui" composite="s:fullapp-ui"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8080"/>
         </service>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
index 636397c705..e835cbb68f 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
@@ -25,11 +25,11 @@
        
   <include name="ns2:creditcard" uri="fullapp-creditcard" />         
   <include name="ns2:payment" uri="fullapp-payment" />    
-  <include name="ns2:shoppingcart" uri="fullapp-shoppingcart" />
-  <include name="ns2:currency" uri="fullapp-currency" />
-  <include name="ns2:packagedtrip" uri="fullapp-packagedtrip" /> 
-  <include name="ns2:bespoketrip" uri="fullapp-bespoketrip" />
-  <include name="ns2:frontend" uri="fullapp-frontend" />         
-  <include name="ns2:ui" uri="fullapp-ui" /> 
+  <include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />
+  <include name="ns2:fullapp-currency" uri="fullapp-currency" />
+  <include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" /> 
+  <include name="ns2:fullapp-bespoketrip" uri="fullapp-bespoketrip" />
+  <include name="ns2:fullapp-fcoordination" uri="fullapp-coordination" />         
+  <include name="ns2:fullapp-ui" uri="fullapp-ui" /> 
 
 </composite>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
index 59fea4eec2..991a55036c 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
@@ -19,23 +19,23 @@
 -->
 <workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
            xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:../../../../contributions/common/target/scatours-contribution-common.jar"  uri="common"/>
-  <contribution location="file:../../../../contributions/currency/target/scatours-contribution-currency.jar"  uri="currency"/>
-  <contribution location="file:../../../../contributions/hotel/target/scatours-contribution-hotel.jar"  uri="hotel"/>
-  <contribution location="file:../../../../contributions/flight/target/scatours-contribution-flight.jar"  uri="flight"/>
-  <contribution location="file:../../../../contributions/car/target/scatours-contribution-car.jar"  uri="car"/>
-  <contribution location="file:../../../../contributions/trip/target/scatours-contribution-trip.jar"  uri="trip"/>
-  <contribution location="file:../../../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
-  <contribution location="file:../../../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
-  <contribution location="file:../../../../contributions/payment-java/target/scatours-contribution-payment-java.jar"  uri="fullapp-payment"/>
-  <contribution location="file:../../../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"  uri="fullapp-creditcard"/>
-  <contribution location="file:../../../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
-  <contribution location="file:../../../../contributions/scatours/target/scatours-contribution-scatours.jar"  uri="scatours"/>
-  <contribution location="file:../../../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
-  <contribution location="file:../../../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-frontend.jar"  uri="fullapp-frontend"/>
-  <contribution location="file:../../../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
-  <contribution location="file:../../../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
-  <contribution location="file:../../../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
-  <contribution location="file:../../../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:../../contributions/common/target/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../../contributions/currency/target/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../../contributions/hotel/target/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../../contributions/flight/target/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../../contributions/car/target/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../../contributions/trip/target/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <contribution location="file:../../contributions/payment-java/target/scatours-contribution-payment-java.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../../contributions/scatours/target/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
+  <contribution location="file:../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
   <contribution location="file:./cloud" uri="http://tuscany.apache.org/cloud"/>  
 </workspace>
\ No newline at end of file