Add a few sample composites and a few fixes to the existing ones.

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

8 files changed, 514 insertions, 139 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite b/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
index bc24ad1500..414176f316 100644
--- a/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
@@ -1,2 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://myprofile" name="myprofile"><component t:x="425" t:y="244" name="fbprofile" t:color="blue1"><documentation>facebook profile</documentation><t:implementation.python script="fbprofile.py"/><service name="fbprofile"/><reference target="first" name="id"/></component><component t:x="425" t:y="287" name="twprofile" t:color="blue1"><documentation>twitter profile</documentation><t:implementation.python script="twprofile.py"/><service name="twprofile"/><reference target="first2" name="id"/></component><component t:x="549" t:y="243" name="first" t:color="yellow1"><documentation>first</documentation><t:implementation.python script="first.py"/><service name="first"/><reference target="rest" name="value"/></component><component t:x="679" t:y="251" name="rest" t:color="yellow1"><documentation>rest</documentation><t:implementation.python script="rest.py"/><service name="rest"/><reference target="path" name="value"/></component><component t:x="726" t:y="253" name="path" t:color="orange1"><documentation>path</documentation><t:implementation.python script="path.py"/><service name="path"/><property name="path" t:visible="false"/></component><component t:x="625" t:y="323" name="path2" t:color="orange1"><documentation>path</documentation><t:implementation.python script="path.py"/><service name="path"/><property name="path" t:visible="false"/></component><component t:x="575" t:y="325" name="rest2" t:color="yellow1"><documentation>rest</documentation><t:implementation.python script="rest.py"/><service name="rest"/><reference target="path2" name="value"/></component><service name="page" promote="page"/><component t:x="25" t:y="25" name="page" t:color="green1"><documentation>page</documentation><t:implementation.python script="page.py"/><service name="page" t:visible="false"/><property>/mypage.html</property><reference target="list" name="value"/></component><component t:x="389" t:y="158" name="first2" t:color="yellow1"><documentation>first</documentation><t:implementation.python script="first.py"/><service name="first"/><reference target="rest2" name="value"/></component><component t:x="436" t:y="123" name="text" t:color="orange1"><t:implementation.python script="text.py"/><service name="text"/><property>This is my combined social profile</property></component><component t:x="128" t:y="25" name="list" t:color="yellow1"><documentation>list</documentation><t:implementation.python script="list_.py"/><service name="list"/><reference target="append" name="rest"/><property>This is my combined social profile</property></component><component t:x="352" t:y="26" name="append" t:color="yellow1"><documentation>append</documentation><t:implementation.python script="list_.py"/><service name="append"/><reference target="fbprofile" name="first"/><reference target="twprofile" name="second"/></component></composite>
+<!--
+ * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://me360" name="me360">
+  <component t:x="240" t:y="57" name="text" t:title="text" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="text"/>
+    <property>12345678</property>
+  </component>
+  <service name="opened" promote="opened"/>
+  <component t:x="3" t:y="2" name="opened" t:title="when page opened" t:color="green1">
+    <t:implementation.python script="opened.py"/>
+    <service name="opened" t:visible="false"/>
+    <reference target="assoc2" name="content"/>
+  </component>
+  <component t:x="135" t:y="2" name="assoc2" t:title="assoc" t:color="orange1">
+    <t:implementation.python script="assoc.py"/>
+    <service name="assoc"/>
+    <reference target="name2" name="name"/>
+    <reference target="append" name="value"/>
+  </component>
+  <component t:x="225" t:y="52" name="append" t:title="append" t:color="yellow1">
+    <t:implementation.python script="append.py"/>
+    <service name="append"/>
+    <reference target="fbprofile" name="first"/>
+    <reference target="twprofile" name="second"/>
+  </component>
+  <component t:x="297" t:y="53" name="fbprofile" t:title="facebook profile" t:color="blue1">
+    <t:implementation.python script="fbprofile.py"/>
+    <service name="fbprofile"/>
+    <reference target="text" name="id"/>
+  </component>
+  <component t:x="293" t:y="105" name="twprofile" t:title="twitter profile" t:color="blue1">
+    <t:implementation.python script="twprofile.py"/>
+    <service name="twprofile"/>
+    <reference target="text2" name="id"/>
+  </component>
+  <component t:x="219" t:y="0" name="name2" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>profiles</property>
+  </component>
+  <component t:x="358" t:y="98" name="text2" t:title="text" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="text"/>
+    <property>joe</property>
+  </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/myprofile/app.html b/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
index 3a57127751..f422574655 100644
--- a/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
@@ -1,32 +1,45 @@
+<?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.    
+ * 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.    
 -->
-<div id="page">
-
-<span id="storeh1" class="h1" style="position:absolute; left: 0px; top: 0px"><h1>Store</h1></span>
-<span id="catalogh2" class="h2" style="position:absolute; left: 0px; top: 40px"><h2>Catalog</h2></span>
-<span id="addToCart" class="button" style="position:absolute; left: 0px; top: 160px"><input type="button" value="Add to Cart"/></span>
-  
-<span id="carth2" class="h2" style="position:absolute; left: 0px; top: 200px"><h2>Your Shopping Cart</h2></span>
-<span id="total" class="text" style="position:absolute; left: 0px; top: 300px"><span>total</span></span>
-
-<span id="checkout" class="button" style="position:absolute; left: 0px; top: 340px"><input type="button" value="Checkout"/></span>
-<span id="empty" class="button" style="position:absolute; left: 120px; top: 340px"><input type="button" value="Empty"/></span>
-<span id="feed" class="link" style="position:absolute; left: 240px; top: 340px"><a href="shoppingCart/"><span>(feed)</span></a></span>
-
-</div>
+<DIV id="page">
+  <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
+    <H1>My social profiles</H1>
+  </SPAN>
+  <SPAN id="getProfiles" class="button" style="position: absolute; top: 144px; left: 0px; ">
+    <INPUT type="button" value="Get my profiles"/>
+  </SPAN>
+  <SPAN id="h2" class="h2" style="position: absolute; top: 198px; left: 0px; ">
+    <H2>Facebook profile</H2>
+  </SPAN>
+  <SPAN id="fbprofile" class="text" style="position: absolute; top: 240px; left: 3px; ">
+    <SPAN>text</SPAN>
+  </SPAN>
+  <SPAN id="h2" class="h2" style="position: absolute; top: 283px; left: 1px; ">
+    <H2>Twitter profile</H2>
+  </SPAN>
+  <SPAN id="twprofile" class="text" style="position: absolute; top: 331px; left: 2px; ">
+    <SPAN>text</SPAN>
+  </SPAN>
+  <SPAN id="twid" class="entry" style="position: absolute; top: 99px; left: 0px; ">
+    <INPUT type="text" value="field" size="5"/>
+  </SPAN>
+  <SPAN id="fbid" class="entry" style="position: absolute; top: 56px; left: 0px; ">
+    <INPUT type="text" value="field" size="5"/>
+  </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite b/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite
new file mode 100644
index 0000000000..ef2383b1d3
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite
@@ -0,0 +1,118 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://myprofile2" name="myprofile2">
+  <service name="opened" promote="opened"/>
+  <component t:x="0" t:y="13" name="opened" t:title="when page opened" t:color="green1">
+    <t:implementation.python script="opened.py"/>
+    <service name="opened" t:visible="false"/>
+    <reference target="nothing" name="content"/>
+  </component>
+  <component t:x="133" t:y="11" name="nothing" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="nothing"/>
+  </component>
+  <service name="getProfiles" promote="getProfiles"/>
+  <component name="getProfiles" t:x="0" t:y="99" t:title="when clicked" t:color="green1">
+    <t:implementation.python script="clicked.py"/>
+    <service name="clicked" t:visible="false"/>
+    <property>getProfiles</property>
+    <reference target="list5" name="content"/>
+  </component>
+  <component t:x="98" t:y="100" name="list5" t:title="make list" t:color="yellow1">
+    <t:implementation.python script="list_.py"/>
+    <service name="list"/>
+    <reference target="assoc" name="first"/>
+    <reference target="list6" name="rest"/>
+  </component>
+  <component t:x="223" t:y="140" name="fbprofile2" t:title="facebook profile" t:color="blue1">
+    <t:implementation.python script="fbprofile.py"/>
+    <service name="fbprofile"/>
+    <reference target="find3" name="id"/>
+  </component>
+  <component t:x="176" t:y="144" name="list6" t:title="make list" t:color="yellow1">
+    <t:implementation.python script="list_.py"/>
+    <service name="list"/>
+    <reference target="assoc2" name="first"/>
+    <reference target="empty" name="rest"/>
+  </component>
+  <component t:x="176" t:y="99" name="assoc" t:title="assoc" t:color="orange1">
+    <t:implementation.python script="assoc.py"/>
+    <service name="assoc"/>
+    <reference target="name" name="name"/>
+    <reference target="fbprofile2" name="value"/>
+  </component>
+  <component t:x="299" t:y="269" name="twprofile2" t:title="twitter profile" t:color="blue1">
+    <t:implementation.python script="twprofile.py"/>
+    <service name="twprofile"/>
+    <reference target="find4" name="id"/>
+  </component>
+  <component t:x="337" t:y="142" name="find3" t:title="find by name" t:color="yellow1">
+    <t:implementation.python script="find.py"/>
+    <service name="find"/>
+    <reference target="name4" name="name"/>
+    <reference target="params3" name="assoc"/>
+  </component>
+  <component t:x="439" t:y="140" name="name4" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>fbid</property>
+  </component>
+  <component t:x="399" t:y="344" name="find4" t:title="find by name" t:color="yellow1">
+    <t:implementation.python script="find.py"/>
+    <service name="find"/>
+    <reference target="name5" name="name"/>
+    <reference target="params4" name="assoc"/>
+  </component>
+  <component t:x="495" t:y="345" name="name5" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>twid</property>
+  </component>
+  <component t:x="221" t:y="99" name="name" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>fbprofile</property>
+  </component>
+  <component t:x="256" t:y="262" name="assoc2" t:title="assoc" t:color="orange1">
+    <t:implementation.python script="assoc.py"/>
+    <service name="assoc"/>
+    <reference target="name3" name="name"/>
+    <reference target="twprofile2" name="value"/>
+  </component>
+  <component t:x="256" t:y="424" name="empty" t:title="empty list" t:color="yellow1">
+    <t:implementation.python script="empty.py"/>
+    <service name="empty"/>
+  </component>
+  <component t:x="298" t:y="261" name="name3" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>twprofile</property>
+  </component>
+  <component t:x="436" t:y="183" name="params3" t:title="?params" t:color="green1">
+    <t:implementation.python script="params.py"/>
+    <service name="params"/>
+    <property>fbid=1234567&amp;twid=joe</property>
+  </component>
+  <component t:x="495" t:y="345" name="params4" t:title="?params" t:color="green1">
+    <t:implementation.python script="params.py"/>
+    <service name="params"/>
+    <property>fbid=1234567&amp;twid=joe</property>
+  </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html b/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html
new file mode 100644
index 0000000000..f422574655
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html
@@ -0,0 +1,45 @@
+<?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.    
+-->
+<DIV id="page">
+  <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
+    <H1>My social profiles</H1>
+  </SPAN>
+  <SPAN id="getProfiles" class="button" style="position: absolute; top: 144px; left: 0px; ">
+    <INPUT type="button" value="Get my profiles"/>
+  </SPAN>
+  <SPAN id="h2" class="h2" style="position: absolute; top: 198px; left: 0px; ">
+    <H2>Facebook profile</H2>
+  </SPAN>
+  <SPAN id="fbprofile" class="text" style="position: absolute; top: 240px; left: 3px; ">
+    <SPAN>text</SPAN>
+  </SPAN>
+  <SPAN id="h2" class="h2" style="position: absolute; top: 283px; left: 1px; ">
+    <H2>Twitter profile</H2>
+  </SPAN>
+  <SPAN id="twprofile" class="text" style="position: absolute; top: 331px; left: 2px; ">
+    <SPAN>text</SPAN>
+  </SPAN>
+  <SPAN id="twid" class="entry" style="position: absolute; top: 99px; left: 0px; ">
+    <INPUT type="text" value="field" size="5"/>
+  </SPAN>
+  <SPAN id="fbid" class="entry" style="position: absolute; top: 56px; left: 0px; ">
+    <INPUT type="text" value="field" size="5"/>
+  </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
new file mode 100644
index 0000000000..61942294ba
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
@@ -0,0 +1,122 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://nearme" name="nearme">
+  <component t:x="234" t:y="25" name="fbfriend" t:color="yellow1">
+    <t:implementation.python script="item.py"/>
+    <service name="item"/>
+    <property name="property"/>
+  </component>
+  <component t:x="233" t:y="97" name="fbfriends" t:title="facebook friends" t:color="blue1">
+    <t:implementation.python script="fbfriends.py"/>
+    <service name="fbfriends"/>
+    <reference target="find" name="id"/>
+  </component>
+  <component t:x="352" t:y="96" name="find" t:title="find by name" t:color="yellow1">
+    <t:implementation.python script="find.py"/>
+    <service name="find"/>
+    <reference target="name" name="name"/>
+    <reference target="params" name="assoc"/>
+  </component>
+  <component t:x="453" t:y="97" name="name" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>fbid</property>
+  </component>
+  <component t:x="453" t:y="138" name="params" t:title="?params" t:color="green1">
+    <t:implementation.python script="params.py"/>
+    <service name="params"/>
+    <property>fbid=1234567</property>
+  </component>
+  <component t:x="274" t:y="97" name="mile" t:title="number" t:color="orange1">
+    <t:implementation.python script="number.py"/>
+    <service name="number"/>
+    <property>1</property>
+  </component>
+  <component t:x="484" t:y="68" name="name2" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>id</property>
+  </component>
+  <component t:x="226" t:y="29" name="lesser" t:title="lt" t:color="magenta1">
+    <t:implementation.python script="lesser.py"/>
+    <service name="lesser"/>
+    <reference target="distance" name="value1"/>
+    <reference target="mile" name="value2"/>
+  </component>
+  <component t:x="378" t:y="25" name="text2" t:title="text" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="text"/>
+    <property>jane</property>
+  </component>
+  <component t:x="227" t:y="240" name="nothing" t:title="nothing" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="nothing"/>
+  </component>
+  <component t:x="132" t:y="31" name="if" t:title="if" t:color="magenta1">
+    <t:implementation.python script="if_.py"/>
+    <service name="if"/>
+    <reference target="lesser" name="condition"/>
+    <reference target="assoc" name="then"/>
+    <reference target="nothing" name="else"/>
+  </component>
+  <component t:x="600" t:y="113" name="text" t:title="text" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="text"/>
+    <property>joe</property>
+  </component>
+  <service name="opened" promote="opened"/>
+  <component t:x="0" t:y="22" name="opened" t:title="when page opened" t:color="green1">
+    <t:implementation.python script="opened.py"/>
+    <service name="opened" t:visible="false"/>
+    <reference target="if" name="content"/>
+  </component>
+  <component t:x="175" t:y="198" name="assoc" t:title="assoc" t:color="orange1">
+    <t:implementation.python script="assoc.py"/>
+    <service name="assoc"/>
+    <reference target="name3" name="name"/>
+    <reference target="text3" name="value"/>
+  </component>
+  <component t:x="331" t:y="383" name="text3" t:title="text" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="text"/>
+    <property>jane</property>
+  </component>
+  <component t:x="218" t:y="195" name="name3" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>near</property>
+  </component>
+  <component t:x="216" t:y="23" name="distance" t:title="distance" t:color="red1">
+    <t:implementation.python script="distance.py"/>
+    <service name="distance"/>
+    <reference target="location" name="location1"/>
+    <reference target="location2" name="location2"/>
+  </component>
+  <component t:x="430" t:y="178" name="location" t:title="location" t:color="red1">
+    <t:implementation.python script="location.py"/>
+    <service name="location"/>
+    <reference target="text2" name="user"/>
+  </component>
+  <component t:x="429" t:y="234" name="location2" t:title="location" t:color="red1">
+    <t:implementation.python script="location.py"/>
+    <service name="location"/>
+    <reference target="text" name="user"/>
+  </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
new file mode 100644
index 0000000000..d5ed657a10
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
@@ -0,0 +1,123 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://nearme2" name="nearme2">
+  <service name="every" promote="every"/>
+  <component t:x="0" t:y="25" name="every" t:title="every n secs" t:color="green1">
+    <t:implementation.python script="every.py"/>
+    <service name="every" t:visible="false"/>
+    <property>60</property>
+    <reference target="gtalksend" name="content"/>
+  </component>
+  <component t:x="100" t:y="25" name="gtalksend" t:title="send gtalk" t:color="blue1">
+    <t:implementation.python script="gtalksend.py"/>
+    <service name="gtalksend"/>
+    <reference target="filter" name="jid"/>
+    <reference target="user" name="to"/>
+    <reference target="text" name="msg"/>
+  </component>
+  <component t:x="184" t:y="54" name="user" t:title="user" t:color="green1">
+    <t:implementation.python script="user.py"/>
+    <service name="user"/>
+    <property name="user"/>
+  </component>
+  <component t:x="183" t:y="97" name="text" t:title="text" t:color="orange1">
+    <t:implementation.python script="text.py"/>
+    <service name="text"/>
+    <property>Hey I'm here!</property>
+  </component>
+  <component t:x="184" t:y="24" name="filter" t:title="filter" t:color="yellow1">
+    <t:implementation.python script="filter_.py"/>
+    <service name="filter"/>
+    <reference target="fbfriend" name="item"/>
+    <reference target="lesser" name="condition"/>
+    <reference target="fbfriends" name="list"/>
+  </component>
+  <component t:x="234" t:y="25" name="fbfriend" t:color="yellow1">
+    <t:implementation.python script="item.py"/>
+    <service name="item"/>
+    <property name="property"/>
+  </component>
+  <component t:x="233" t:y="97" name="fbfriends" t:title="facebook friends" t:color="blue1">
+    <t:implementation.python script="fbfriends.py"/>
+    <service name="fbfriends"/>
+    <reference target="find" name="id"/>
+  </component>
+  <component t:x="352" t:y="96" name="find" t:title="find by name" t:color="yellow1">
+    <t:implementation.python script="find.py"/>
+    <service name="find"/>
+    <reference target="name" name="name"/>
+    <reference target="params" name="assoc"/>
+  </component>
+  <component t:x="453" t:y="97" name="name" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>fbid</property>
+  </component>
+  <component t:x="453" t:y="138" name="params" t:title="?params" t:color="green1">
+    <t:implementation.python script="params.py"/>
+    <service name="params"/>
+    <property>fbid=1234567</property>
+  </component>
+  <component t:x="235" t:y="67" name="lesser" t:title="lt" t:color="magenta1">
+    <t:implementation.python script="lesser.py"/>
+    <service name="lesser"/>
+    <reference target="subtract" name="value1"/>
+    <reference target="mile" name="value2"/>
+  </component>
+  <component t:x="274" t:y="97" name="mile" t:title="number" t:color="orange1">
+    <t:implementation.python script="number.py"/>
+    <service name="number"/>
+    <property>1</property>
+  </component>
+  <component t:x="274" t:y="67" name="subtract" t:title="-" t:color="magenta1">
+    <t:implementation.python script="subtract.py"/>
+    <service name="subtract">
+      <documentation>-</documentation>
+    </service>
+    <reference target="location" name="value1"/>
+    <reference target="location2" name="value2"/>
+  </component>
+  <component t:x="316" t:y="68" name="location" t:title="location" t:color="red1">
+    <t:implementation.python script="location.py"/>
+    <service name="location"/>
+    <reference target="find2" name="user"/>
+  </component>
+  <component t:x="316" t:y="122" name="location2" t:title="location" t:color="red1">
+    <t:implementation.python script="location.py"/>
+    <service name="location"/>
+    <reference target="user2" name="user"/>
+  </component>
+  <component t:x="386" t:y="118" name="user2" t:title="user" t:color="green1">
+    <t:implementation.python script="user.py"/>
+    <service name="user"/>
+    <property name="user"/>
+  </component>
+  <component t:x="386" t:y="69" name="find2" t:title="find by name" t:color="yellow1">
+    <t:implementation.python script="find.py"/>
+    <service name="find"/>
+    <reference target="name2" name="name"/>
+    <reference target="fbfriend" name="assoc"/>
+  </component>
+  <component t:x="484" t:y="68" name="name2" t:title="name" t:color="orange1">
+    <t:implementation.python script="name.py"/>
+    <service name="name"/>
+    <property>id</property>
+  </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/relay/app.composite b/sca-cpp/trunk/modules/edit/apps/relay/app.composite
deleted file mode 100644
index 2f630872de..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/relay/app.composite
+++ /dev/null
@@ -1,81 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://relay"
-  name="relay">
-        
-    <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" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="jsontwit"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json?screen_name=jsdelfino"/>
-        </reference>
-    </component>
-    
-    <component name="XMLTwit" t:color="green1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="xmltwit"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.xml?screen_name=jsdelfino"/>
-        </reference>
-    </component>
-    
-    <component name="RSSTwit" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="rsstwit"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=jsdelfino"/>
-        </reference>
-    </component>
-    
-    <component name="HTML" t:color="yellow1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="html"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://people.apache.org/~jsdelfino/"/>
-        </reference>
-    </component>
-    
-    <component name="JSONFB" t:color="orange1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="jsonfb"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="https://graph.facebook.com/100001053301307"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/relay/app.html b/sca-cpp/trunk/modules/edit/apps/relay/app.html
deleted file mode 100644
index 1b255b8199..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/relay/app.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<div id="page">
-
-<span id="html" class="button" style="position:absolute; left: 0px; top: 0px"><input type="button" value="Sample HTML Request"/></span>
-<span id="jsontwit" class="button" style="position:absolute; left: 0px; top: 40px"><input type="button" value="Sample Twitter JSON Request"/></span>
-<span id="xmltwit" class="button" style="position:absolute; left: 0px; top: 80px"><input type="button" value="Sample Twitter XML Request"/></span>
-<span id="rsstwit" class="button" style="position:absolute; left: 0px; top: 120px"><input type="button" value="Sample Twitter RSS Request"/></span>
-<span id="jsonfb" class="button" style="position:absolute; left: 0px; top: 160px"><input type="button" value="Sample Facebook JSON Request"/></span>
-
-</div>