Support service promotion and improve component layout algorithm.

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

2 files changed, 23 insertions, 17 deletions

diff --git a/sca-cpp/trunk/modules/edit/domains/relay/app.composite b/sca-cpp/trunk/modules/edit/domains/relay/app.composite
index 7f7302955e..8a02ed7cd7 100644
--- a/sca-cpp/trunk/modules/edit/domains/relay/app.composite
+++ b/sca-cpp/trunk/modules/edit/domains/relay/app.composite
@@ -22,7 +22,13 @@
   targetNamespace="http://relay"
   name="relay">
         
-    <component name="JSONTwit">
+    <service name="JSONTwit" promote="JSONTwit"/>
+    <service name="XMLTwit" promote="XMLTwit"/>
+    <service name="RSSTwit" promote="RSSTwit"/>
+    <service name="HTML" promote="HTML"/>
+    <service name="JSONFB" promote="JSONFB"/>
+
+    <component name="JSONTwit" color="red">
         <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="jsontwit"/>
@@ -32,7 +38,7 @@
         </reference>
     </component>
     
-    <component name="XMLTwit">
+    <component name="XMLTwit" color="green">
         <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="xmltwit"/>
@@ -42,7 +48,7 @@
         </reference>
     </component>
     
-    <component name="RSSTwit">
+    <component name="RSSTwit" color="blue">
         <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="rsstwit"/>
@@ -52,7 +58,7 @@
         </reference>
     </component>
     
-    <component name="HTML">
+    <component name="HTML" color="yellow">
         <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="html"/>
@@ -62,7 +68,7 @@
         </reference>
     </component>
     
-    <component name="JSONFB">
+    <component name="JSONFB" color="orange">
         <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="jsonfb"/>
diff --git a/sca-cpp/trunk/modules/edit/domains/store/app.composite b/sca-cpp/trunk/modules/edit/domains/store/app.composite
index 912898123b..6db5af61ce 100644
--- a/sca-cpp/trunk/modules/edit/domains/store/app.composite
+++ b/sca-cpp/trunk/modules/edit/domains/store/app.composite
@@ -21,18 +21,21 @@
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
-        
-    <component name="Store">
+
+    <service name="Store" promote="Store"/>
+    <service name="ShoppingCart" promote="ShoppingCart"/>
+
+    <component name="Store" color="green">
         <t:implementation.python script="store.py"/>
         <service name="Widget">
             <t:binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
-        <reference name="shoppingCart" target="ShoppingCart/Cart"/>
-        <reference name="shoppingTotal" target="ShoppingCart/Total"/>
+        <reference name="shoppingCart" target="ShoppingCart"/>
+        <reference name="shoppingTotal" target="ShoppingCart"/>
     </component>
     
-    <component name="Catalog">
+    <component name="Catalog" color="yellow">
         <t:implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
@@ -41,25 +44,22 @@
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
-    <component name="ShoppingCart">
+    <component name="ShoppingCart" color="magenta">
         <t:implementation.python script="shopping-cart.py"/>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
-        </service>        
-        <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <t:binding.http uri="shoppingCart"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
-    <component name="CurrencyConverter">
+    <component name="CurrencyConverter" color="blue">
         <t:implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
             <t:binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
-    <component name="Cache">
+    <component name="Cache" color="orange">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>