You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2011/02/12 19:29:38 UTC
svn commit: r1070123 - in /tuscany/sca-cpp/trunk/modules:
edit/apps/myprofile/ edit/apps/myprofile2/ edit/apps/nearme/
edit/apps/nearme2/ edit/apps/relay/ edit/dashboards/ edit/htdocs/
edit/htdocs/graph/ edit/htdocs/page/ edit/palettes/events/ edit/pal...
Author: jsdelfino
Date: Sat Feb 12 18:29:37 2011
New Revision: 1070123
URL: http://svn.apache.org/viewvc?rev=1070123&view=rev
Log:
Add a few sample composites and a few fixes to the existing ones.
Added:
tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/
tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite
tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html
tuscany/sca-cpp/trunk/modules/edit/apps/nearme/
tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/
tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/logic/
tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
- copied, changed from r1068288, tuscany/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/text/
tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
Removed:
tuscany/sca-cpp/trunk/modules/edit/apps/relay/
tuscany/sca-cpp/trunk/modules/edit/palettes/operators/
Modified:
tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
tuscany/sca-cpp/trunk/modules/edit/htdocs/main.html
tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.html
tuscany/sca-cpp/trunk/modules/edit/palettes/events/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
tuscany/sca-cpp/trunk/modules/js/htdocs/scdl.js
tuscany/sca-cpp/trunk/modules/js/htdocs/uicyan.css
Modified: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite Sat Feb 12 18:29:37 2011
@@ -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="li
st" 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>
Modified: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html Sat Feb 12 18:29:37 2011
@@ -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>
Added: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite?rev=1070123&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite Sat Feb 12 18:29:37 2011
@@ -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&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&twid=joe</property>
+ </component>
+</composite>
Added: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html?rev=1070123&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html Sat Feb 12 18:29:37 2011
@@ -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>
Added: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite?rev=1070123&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite Sat Feb 12 18:29:37 2011
@@ -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>
Added: tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite?rev=1070123&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite Sat Feb 12 18:29:37 2011
@@ -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>
Modified: tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/dashboards/joe%40localhost?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost (original)
+++ tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost Sat Feb 12 18:29:37 2011
@@ -1 +1 @@
-(("Sample Online Store App" "store" ()) ("Layout Variation of the Online Store App" "store2" ()) ("Another Variation of the Online Store App" "store3" ()) ("Sample HTTP Relay App" "relay" ()) ("Travel Tutorial App" "travel" ()) ("My Aggregated Profile" "myprofile" ()) ("An Empty Test App" "test" ()))
\ No newline at end of file
+(("An App that shows my Aggregated Social Profile" "myprofile" ()) ("An advanced version of the Aggregated Social Profile App" "myprofile2" ()) ("An App that shows Friends Near Me" "nearme" ()) ("An advanced version of the Friends Near Me App" "nearme2" ()) ("Sample Online Store App" "store" ()) ("Layout Variation of the Online Store App" "store2" ()) ("Another Variation of the Online Store App" "store3" ()) ("Travel Tutorial App" "travel" ()) ("An Empty Test App" "test" ()))
\ No newline at end of file
Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html Sat Feb 12 18:29:37 2011
@@ -34,9 +34,9 @@
<table style="width: 100%;">
<tr>
-<th class="thl" style="width: 230px; min-width: 230px;">Palette</th><th class="ths" style="width: 3px; min-width: 3px;"></th>
+<th class="thl" style="width: 225px; min-width: 225px;">Palette</th>
-<th class="thr" style="padding-top: 0px; padding-bottom: 0px;">
+<th class="thr" style="padding-left: 4px; padding-top: 0px; padding-bottom: 0px;">
<input id="compName" type="text" value="component name" style="position: relative; width: 200px;"/>
<input id="propValue" type="text" value="property value" style="position: relative; width: 300px;"/>
</th>
@@ -47,7 +47,7 @@
</th>
</tr>
-<tr style="height: 5000px;"><td class="tdl"></td><th class="ths"></th><td class="tdr" colspan="2"></td></tr>
+<tr style="height: 5000px;"><td class="tdl"></td><td class="tdr" colspan="2"></td></tr>
</table>
</div>
@@ -110,7 +110,7 @@ function getpalette(name, g, bg, palette
if (isNil(name))
return;
palettes.get(name, function(doc) {
- gpalettes[name] = graph.composite(atomcomposite(doc), graph.mkpath().move(85,0));
+ gpalettes[name] = graph.composite(atomcomposite(doc), graph.mkpath().move(80,0));
graph.display(gpalettes[name], name == spalette? g : bg);
});
}
@@ -154,11 +154,12 @@ var bg = graph.mkgroup(graph.mkpath());
var gpalettes = new Array();
var spalette = 'events';
var pos = graph.mkpath();
-installpalette('events', pos.rmove(0,10), g, bg, spalette, gpalettes);
+installpalette('events', pos.rmove(0,0), g, bg, spalette, gpalettes);
installpalette('values', pos.rmove(0,50), g, bg, spalette, gpalettes);
installpalette('url', pos.rmove(0, 50), g, bg, spalette, gpalettes);
installpalette('lists', pos.rmove(0, 50), g, bg, spalette, gpalettes);
-installpalette('operators', pos.rmove(0, 50), g, bg, spalette, gpalettes);
+installpalette('text', pos.rmove(0, 50), g, bg, spalette, gpalettes);
+installpalette('logic', pos.rmove(0, 50), g, bg, spalette, gpalettes);
installpalette('math', pos.rmove(0, 50), g, bg, spalette, gpalettes);
installpalette('social', pos.rmove(0, 50), g, bg, spalette, gpalettes);
installpalette('sensors', pos.rmove(0, 50), g, bg, spalette, gpalettes);
Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js (original)
+++ tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js Sat Feb 12 18:29:37 2011
@@ -55,9 +55,9 @@ var palcx = 250;
var trashcx = 230;
var proxcx = 20;
var proxcy = 20;
-var buttoncx = 80;
+var buttoncx = 70;
var buttoncy = 40;
-var curvsz = 5;
+var curvsz = 6;
var tabsz = 3;
/**
@@ -361,9 +361,9 @@ if (ui.isIE()) {
graph.mktitle = function(t, bold, pos) {
var title = document.createElement('v:textbox');
title.style.position = 'absolute';
- title.style.left = pos.xpos();
+ title.style.left = pos.xpos() + 2;
title.style.top = pos.ypos();
- title.inset = '' + 4 + 'px ' + pos.ypos() + 'px 0px 0px';
+ title.inset = '' + 6 + 'px ' + pos.ypos() + 'px 0px 0px';
if (bold)
title.style.fontWeight = 'bold';
var tnode = document.createTextNode(t);
@@ -378,7 +378,7 @@ if (ui.isIE()) {
var tsvcs = graph.tsvcs(comp);
var lsvcs = graph.lsvcs(comp);
var pos = graph.mkpath().move(isNil(lsvcs)? tabsz : (tabsz * 5), isNil(tsvcs)? tabsz : (tabsz * 5));
- return graph.mktitle(graph.title(comp), true, pos);
+ return graph.mktitle(graph.title(comp), false, pos);
};
/**
@@ -399,7 +399,7 @@ if (ui.isIE()) {
var tsvcs = graph.tsvcs(comp);
var lsvcs = graph.lsvcs(comp);
var pos = graph.mkpath().move(isNil(lsvcs)? tabsz : (tabsz * 5), isNil(tsvcs)? 15 + tabsz : 15 + (tabsz * 5));
- return graph.mktitle(graph.property(comp), false, pos);
+ return graph.mktitle(graph.property(comp), true, pos);
};
/**
@@ -461,7 +461,7 @@ if (ui.isIE()) {
contour.path = d;
contour.filled = 'false';
contour.strokecolor = graph.colors.gray;
- contour.strokeweight = '2';
+ contour.strokeweight = '1';
contour.style.left = 1;
contour.style.top = 1;
var stroke = document.createElement('v:stroke');
@@ -506,7 +506,7 @@ if (ui.isIE()) {
graph.mkbutton = function(t, pos) {
// Make the title element
- var title = graph.mktitle(t, true, pos);
+ var title = graph.mktitle(t, true, graph.mkpath().move(4,4));
// Compute the path of the button shape
var path = graph.buttonpath().str();
@@ -528,7 +528,7 @@ if (ui.isIE()) {
contour.path = path;
contour.filled = 'false';
contour.strokecolor = graph.colors.gray;
- contour.strokeweight = '2';
+ contour.strokeweight = '1';
contour.style.left = 1;
contour.style.top = 1;
var stroke = document.createElement('v:stroke');
@@ -851,7 +851,7 @@ if (ui.isIE()) {
* Return an element representing the title of a component.
*/
graph.comptitle = function(comp) {
- return graph.mktitle(graph.title(comp), true);
+ return graph.mktitle(graph.title(comp), false);
};
/**
@@ -887,7 +887,7 @@ if (ui.isIE()) {
* Return an element representing the value of a property.
*/
graph.proptitle = function(comp) {
- var title = graph.mktitle(graph.property(comp), false);
+ var title = graph.mktitle(graph.property(comp), true);
title.setAttribute('y', 30);
return title;
};
@@ -926,7 +926,7 @@ if (ui.isIE()) {
contour.setAttribute('d', d);
contour.setAttribute('fill', 'none');
contour.setAttribute('stroke', graph.colors.gray);
- contour.setAttribute('stroke-width', '4');
+ contour.setAttribute('stroke-width', '3');
contour.setAttribute('stroke-opacity', '0.20');
contour.setAttribute('transform', 'translate(1,1)');
@@ -978,7 +978,7 @@ if (ui.isIE()) {
contour.setAttribute('d', path);
contour.setAttribute('fill', 'none');
contour.setAttribute('stroke', graph.colors.gray);
- contour.setAttribute('stroke-width', '4');
+ contour.setAttribute('stroke-width', '3');
contour.setAttribute('stroke-opacity', '0.20');
contour.setAttribute('transform', 'translate(1,1)');
@@ -1035,9 +1035,14 @@ graph.bringtotop = function(n, g) {
* Return the title of a SCDL element.
*/
graph.title = function(e) {
- var d = scdl.documentation(e);
- if (d != null)
- return d;
+ var t = scdl.title(e);
+ if (t != null) {
+ if (t == 'gt')
+ return '>'
+ if (t == 'lt')
+ return '<';
+ return t;
+ }
return scdl.name(e);
};
@@ -1181,6 +1186,8 @@ graph.compheight = function(comp, cassoc
var rrefs = graph.rrefs(comp);
var rrefsh = graph.rrefsheight(rrefs, cassoc) + (tabsz * 4);
var height = Math.max(lsvcsh, rrefsh);
+ if (!isNil(graph.brefs(comp)))
+ height = Math.max(height, (tabsz * 10) + (tabsz * 4) + (tabsz * 2));
return height;
});
};
@@ -1530,7 +1537,7 @@ graph.composite = function(compos, pos)
}
// Render the promoted service components
- var rproms = renderproms(proms, cassoc, pos.clone().rmove(20,20));
+ var rproms = renderproms(proms, cassoc, pos.clone().rmove(tabsz * 4, tabsz * 4));
if (name == 'palette') {
Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/main.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/main.html?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/main.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/htdocs/main.html Sat Feb 12 18:29:37 2011
@@ -34,13 +34,13 @@
<p>Try the <a href="dash" target="_parent">App Dashboard</a> to manage your collection of apps.</p>
<h2>Composition Editor</h2>
-<p>Try the <a href="graph/?app=store" target="_parent">Composition Editor</a> to compose the logic of an app.</p>
+<p>Try the <a href="graph/?app=myprofile" target="_parent">Composition Editor</a> to compose the logic of an app.</p>
<h2>Page Editor</h2>
-<p>Try the <a href="page/?app=store" target="_parent">Page Editor</a> to draw an app page.</p>
+<p>Try the <a href="page/?app=myprofile" target="_parent">Page Editor</a> to draw an app page.</p>
<h2>App Settings Editor</h2>
-<p>Try the <a href="app/?app=store" target="_parent">App Settings Editor</a> to edit the settings of app.</p>
+<p>Try the <a href="app/?app=myprofile" target="_parent">App Settings Editor</a> to edit the settings of app.</p>
</div>
Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.html?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.html Sat Feb 12 18:29:37 2011
@@ -34,10 +34,10 @@
<table style="width: 100%;">
<tr>
-<th class="thl thr" style="width: 230px; min-width: 230px;">Palette</th><th class="ths" style="width: 3px; min-width: 3px;"></th>
+<th class="thl" style="width: 225px; min-width: 225px;">Palette</th>
-<th class="thl thr" style="padding-top: 0px; padding-bottom: 0px;">
-<input id="widgetName" type="text" value="widget name" style="position: relative; width: 150px;"/>
+<th class="thr" style="padding-left: 4px; padding-top: 0px; padding-bottom: 0px;">
+<input id="widgetName" type="text" value="widget name" style="position: relative; width: 200px;"/>
<input id="widgetText" type="text" value="widget text" style="position: relative; width: 300px;"/>
</th>
@@ -47,7 +47,7 @@
</th>
</tr>
-<tr style="height: 5000px;"><td class="tdl"></td><th class="ths"></th><td class="tdr" colspan="2"></td></tr>
+<tr style="height: 5000px;"><td class="tdl"></td><td class="tdr" colspan="2"></td></tr>
</table>
<div id="page" style="position: absolute; top: 40px; left: 0px; width: 5000px; height: 5000px;">
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/events/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/events/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/events/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/events/palette.composite Sat Feb 12 18:29:37 2011
@@ -22,23 +22,28 @@
targetNamespace="http://events"
name="palette">
- <service name="page" promote="page"/>
+ <service name="opened" promote="opened"/>
+ <service name="clicked" promote="clicked"/>
<service name="every" promote="every"/>
- <component name="page" t:color="green1">
- <documentation>page</documentation>
- <t:implementation.python script="page.py"/>
- <service name="page" t:visible="false"/>
- <property name="property">/mypage.html</property>
- <reference name="value"/>
+ <component name="opened" t:title="when page opened" t:color="green1">
+ <t:implementation.python script="opened.py"/>
+ <service name="opened" t:visible="false"/>
+ <reference name="content"/>
</component>
- <component name="every" t:color="green1">
- <documentation>every</documentation>
+ <component name="clicked" t:title="when clicked" t:color="green1">
+ <t:implementation.python script="clicked.py"/>
+ <service name="clicked" t:visible="false"/>
+ <property name="property">button</property>
+ <reference name="content"/>
+ </component>
+
+ <component name="every" t:title="every n secs" t:color="green1">
<t:implementation.python script="every.py"/>
<service name="every" t:visible="false"/>
<property name="property">60</property>
- <reference name="value"/>
+ <reference name="content"/>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite Sat Feb 12 18:29:37 2011
@@ -25,53 +25,104 @@
<service name="list" promote="list"/>
<service name="first" promote="first"/>
<service name="rest" promote="rest"/>
+ <service name="empty" promote="empty"/>
+ <service name="itemnb" promote="itemnb"/>
+ <service name="find" promote="find"/>
<service name="foreach" promote="foreach"/>
+ <service name="item" promote="item"/>
+ <service name="filter" promote="filter"/>
+ <service name="reduce" promote="reduce"/>
+ <service name="range" promote="range"/>
<service name="append" promote="append"/>
<service name="reverse" promote="reverse"/>
- <component name="list" t:color="yellow1">
- <documentation>list</documentation>
+ <component name="list" t:title="make list" t:color="yellow1">
<t:implementation.python script="list_.py"/>
<service name="list"/>
+ <reference name="first"/>
<reference name="rest"/>
- <property name="property">abc</property>
</component>
- <component name="first" t:color="yellow1">
- <documentation>first</documentation>
+ <component name="first" t:title="first item" t:color="yellow1">
<t:implementation.python script="first.py"/>
<service name="first"/>
- <reference name="value"/>
+ <reference name="list"/>
</component>
- <component name="rest" t:color="yellow1">
- <documentation>rest</documentation>
+ <component name="rest" t:title="rest of list" t:color="yellow1">
<t:implementation.python script="rest.py"/>
<service name="rest"/>
- <reference name="value"/>
+ <reference name="list"/>
+ </component>
+
+ <component name="empty" t:title="empty list" t:color="yellow1">
+ <t:implementation.python script="empty.py"/>
+ <service name="empty"/>
+ </component>
+
+ <component name="itemnb" t:title="item number" t:color="yellow1">
+ <t:implementation.python script="itemnb.py"/>
+ <service name="itemnb"/>
+ <reference name="index"/>
+ <reference name="list"/>
+ </component>
+
+ <component name="find" t:title="find by name" t:color="yellow1">
+ <t:implementation.python script="find.py"/>
+ <service name="find"/>
+ <reference name="name"/>
+ <reference name="assoc"/>
</component>
- <component name="foreach" t:color="yellow1">
- <documentation>foreach</documentation>
- <t:implementation.python script="ifelse.py"/>
+ <component name="foreach" t:title="foreach" t:color="yellow1">
+ <t:implementation.python script="foreach.py"/>
<service name="foreach"/>
+ <reference name="item"/>
+ <reference name="transform"/>
<reference name="list"/>
- <reference name="apply"/>
</component>
- <component name="reverse" t:color="yellow1">
- <documentation>reverse</documentation>
- <t:implementation.python script="reverse.py"/>
- <service name="reverse"/>
- <reference name="value"/>
+ <component name="item" t:color="yellow1">
+ <t:implementation.python script="item.py"/>
+ <service name="item"/>
+ <property name="property"></property>
</component>
- <component name="append" t:color="yellow1">
- <documentation>append</documentation>
- <t:implementation.python script="list_.py"/>
+ <component name="filter" t:title="filter" t:color="yellow1">
+ <t:implementation.python script="filter_.py"/>
+ <service name="filter"/>
+ <reference name="item"/>
+ <reference name="condition"/>
+ <reference name="list"/>
+ </component>
+
+ <component name="reduce" t:title="reduce" t:color="yellow1">
+ <t:implementation.python script="reduce.py"/>
+ <service name="reduce"/>
+ <reference name="transform"/>
+ <reference name="initial"/>
+ <reference name="item"/>
+ <reference name="list"/>
+ </component>
+
+ <component name="range" t:title="range" t:color="yellow1">
+ <t:implementation.python script="range.py"/>
+ <service name="range"/>
+ <reference name="first"/>
+ <reference name="last"/>
+ </component>
+
+ <component name="append" t:title="append" t:color="yellow1">
+ <t:implementation.python script="append.py"/>
<service name="append"/>
<reference name="first"/>
<reference name="second"/>
</component>
+ <component name="reverse" t:title="reverse" t:color="yellow1">
+ <t:implementation.python script="reverse.py"/>
+ <service name="reverse"/>
+ <reference name="list"/>
+ </component>
+
</composite>
Copied: tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite (from r1068288, tuscany/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite?p2=tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite&r1=1068288&r2=1070123&rev=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite Sat Feb 12 18:29:37 2011
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://operators"
+ targetNamespace="http://logic"
name="palette">
<service name="if" promote="if"/>
@@ -30,7 +30,7 @@
<service name="greater" promote="greater"/>
<service name="lesser" promote="lesser"/>
- <component name="if" t:color="green1">
+ <component name="if" t:title="if" t:color="magenta1">
<t:implementation.python script="if_.py"/>
<service name="if"/>
<reference name="condition"/>
@@ -38,52 +38,43 @@
<reference name="else"/>
</component>
- <component name="and" t:color="green1">
+ <component name="and" t:title="and" t:color="magenta1">
<t:implementation.python script="and_.py"/>
<service name="and"/>
<reference name="value1"/>
<reference name="value2"/>
</component>
- <component name="or" t:color="green1">
+ <component name="or" t:title="or" t:color="magenta1">
<t:implementation.python script="or_.py"/>
<service name="or"/>
<reference name="value1"/>
<reference name="value2"/>
</component>
- <component name="not" t:color="green1">
+ <component name="not" t:title="not" t:color="magenta1">
<t:implementation.python script="not_.py"/>
<service name="not"/>
<reference name="value"/>
</component>
- <component name="equals" t:color="green1">
- <documentation>=</documentation>
+ <component name="equals" t:title="=" t:color="magenta1">
<t:implementation.python script="equals.py"/>
- <service name="equals">
- <documentation>=</documentation>
- </service>
+ <service name="equals"/>
<reference name="value1"/>
<reference name="value2"/>
</component>
- <component name="greater" t:color="green1">
- <documentation>gt</documentation>
+ <component name="greater" t:title="gt" t:color="magenta1">
<t:implementation.python script="greater.py"/>
- <service name="greater">
- <documentation>gt</documentation>
- </service>
+ <service name="greater"/>
<reference name="value1"/>
<reference name="value2"/>
</component>
- <component name="lesser" t:color="green1">
- <documentation>lt</documentation>
+ <component name="lesser" t:title="lt" t:color="magenta1">
<t:implementation.python script="lesser.py"/>
- <service name="lesser">
- <documentation>lt</documentation>
- </service>
+ <service name="lesser"/>
<reference name="value1"/>
<reference name="value2"/>
</component>
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite Sat Feb 12 18:29:37 2011
@@ -27,8 +27,7 @@
<service name="add" promote="add"/>
<service name="subtract" promote="subtract"/>
- <component name="multiply" t:color="green1">
- <documentation>*</documentation>
+ <component name="multiply" t:title="*" t:color="magenta1">
<t:implementation.python script="multiply.py"/>
<service name="multiply">
<documentation>*</documentation>
@@ -37,8 +36,7 @@
<reference name="value2"/>
</component>
- <component name="divide" t:color="green1">
- <documentation>/</documentation>
+ <component name="divide" t:title="/" t:color="magenta1">
<t:implementation.python script="divide.py"/>
<service name="divide">
<documentation>/</documentation>
@@ -47,8 +45,7 @@
<reference name="value2"/>
</component>
- <component name="add" t:color="green1">
- <documentation>+</documentation>
+ <component name="add" t:title="+" t:color="magenta1">
<t:implementation.python script="add.py"/>
<service name="add">
<documentation>+</documentation>
@@ -57,8 +54,7 @@
<reference name="value2"/>
</component>
- <component name="subtract" t:color="green1">
- <documentation>-</documentation>
+ <component name="subtract" t:title="-" t:color="magenta1">
<t:implementation.python script="subtract.py"/>
<service name="subtract">
<documentation>-</documentation>
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite Sat Feb 12 18:29:37 2011
@@ -23,10 +23,19 @@
name="palette">
<service name="location" promote="location"/>
+ <service name="distance" promote="distance"/>
- <component name="location" t:color="magenta1">
+ <component name="location" t:title="location" t:color="red1">
<t:implementation.python script="location.py"/>
<service name="location"/>
+ <reference name="user"/>
+ </component>
+
+ <component name="distance" t:title="distance" t:color="red1">
+ <t:implementation.python script="distance.py"/>
+ <service name="distance"/>
+ <reference name="location1"/>
+ <reference name="location2"/>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite Sat Feb 12 18:29:37 2011
@@ -10,7 +10,7 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
+ * Unless requiblue 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
@@ -30,61 +30,78 @@
<service name="twfriends" promote="twfriends"/>
<service name="twstatus" promote="twstatus"/>
<service name="twtimeline" promote="twtimeline"/>
+ <service name="gtalksend" promote="gtalksend"/>
+ <service name="gtalkreceive" promote="gtalkreceive"/>
+ <service name="smssend" promote="smssend"/>
- <component name="fbprofile" t:color="blue1">
- <documentation>facebook profile</documentation>
+ <component name="fbprofile" t:title="facebook profile" t:color="blue1">
<t:implementation.python script="fbprofile.py"/>
<service name="fbprofile"/>
<reference name="id"/>
</component>
- <component name="fbalbum" t:color="blue1">
- <documentation>facebook album</documentation>
+ <component name="fbalbum" t:title="facebook album" t:color="blue1">
<t:implementation.python script="fbalbum.py"/>
<service name="fbalbum"/>
<reference name="id"/>
</component>
- <component name="fbfriends" t:color="blue1">
- <documentation>facebook friends</documentation>
+ <component name="fbfriends" t:title="facebook friends" t:color="blue1">
<t:implementation.python script="fbfriends.py"/>
<service name="fbfriends"/>
<reference name="id"/>
</component>
- <component name="fbgroup" t:color="blue1">
- <documentation>facebook group</documentation>
+ <component name="fbgroup" t:title="facebook group" t:color="blue1">
<t:implementation.python script="fbgroup.py"/>
<service name="fbgroup"/>
<reference name="id"/>
</component>
- <component name="twprofile" t:color="blue1">
- <documentation>twitter profile</documentation>
+ <component name="twprofile" t:title="twitter profile" t:color="blue1">
<t:implementation.python script="twprofile.py"/>
<service name="twprofile"/>
<reference name="id"/>
</component>
- <component name="twfriends" t:color="blue1">
- <documentation>twitter friends</documentation>
+ <component name="twfriends" t:title="twitter friends" t:color="blue1">
<t:implementation.python script="twfriends.py"/>
<service name="twfriends"/>
<reference name="id"/>
</component>
- <component name="twstatus" t:color="blue1">
- <documentation>twitter status</documentation>
+ <component name="twstatus" t:title="twitter status" t:color="blue1">
<t:implementation.python script="twstatus.py"/>
<service name="twstatus"/>
<reference name="id"/>
</component>
- <component name="twtimeline" t:color="blue1">
- <documentation>twitter timeline</documentation>
+ <component name="twtimeline" t:title="twitter timeline" t:color="blue1">
<t:implementation.python script="twtimeline.py"/>
<service name="twtimeline"/>
<reference name="id"/>
</component>
+ <component name="gtalksend" t:title="send gtalk" t:color="blue1">
+ <t:implementation.python script="gtalksend.py"/>
+ <service name="gtalksend"/>
+ <reference name="jid"/>
+ <reference name="to"/>
+ <reference name="msg"/>
+ </component>
+
+ <component name="gtalkreceive" t:title="when gtalk received" t:color="blue1">
+ <t:implementation.python script="gtalkreceive.py"/>
+ <service name="gtalkreceive"/>
+ <reference name="jid"/>
+ </component>
+
+ <component name="smssend" t:title="send sms" t:color="blue1">
+ <t:implementation.python script="smssend.py"/>
+ <service name="smssend"/>
+ <reference name="user"/>
+ <reference name="to"/>
+ <reference name="msg"/>
+ </component>
+
</composite>
Added: tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite?rev=1070123&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite Sat Feb 12 18:29:37 2011
@@ -0,0 +1,73 @@
+<?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://text"
+ name="palette">
+
+ <service name="contains" promote="contains"/>
+ <service name="split" promote="split"/>
+ <service name="join" promote="join"/>
+ <service name="replace" promote="replace"/>
+ <service name="lowercase" promote="lowercase"/>
+ <service name="uppercase" promote="uppercase"/>
+
+ <component name="contains" t:title="contains" t:color="magenta1">
+ <t:implementation.python script="contains.py"/>
+ <service name="contains"/>
+ <reference name="search"/>
+ <reference name="string"/>
+ </component>
+
+ <component name="split" t:title="split" t:color="magenta1">
+ <t:implementation.python script="split.py"/>
+ <service name="split"/>
+ <reference name="separator"/>
+ <reference name="string"/>
+ </component>
+
+ <component name="join" t:title="join" t:color="magenta1">
+ <t:implementation.python script="join.py"/>
+ <service name="join"/>
+ <reference name="separator"/>
+ <reference name="list"/>
+ </component>
+
+ <component name="replace" t:title="replace" t:color="magenta1">
+ <t:implementation.python script="replace.py"/>
+ <service name="replace"/>
+ <reference name="from"/>
+ <reference name="to"/>
+ <reference name="string"/>
+ </component>
+
+ <component name="lowercase" t:title="lowercase" t:color="magenta1">
+ <t:implementation.python script="lowercase.py"/>
+ <service name="lowercase"/>
+ <reference name="string"/>
+ </component>
+
+ <component name="uppercase" t:title="uppercase" t:color="magenta1">
+ <t:implementation.python script="uppercase.py"/>
+ <service name="uppercase"/>
+ <reference name="string"/>
+ </component>
+
+</composite>
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/url/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/url/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/url/palette.composite Sat Feb 12 18:29:37 2011
@@ -29,46 +29,40 @@
<service name="realm" promote="realm"/>
<service name="email" promote="email"/>
- <component name="host" t:color="orange1">
- <documentation>host</documentation>
+ <component name="host" t:title="host" t:color="green1">
<t:implementation.python script="host.py"/>
<service name="host"/>
- <property name="host" t:visible="false"></property>
+ <property name="host"></property>
</component>
- <component name="path" t:color="orange1">
- <documentation>path</documentation>
+ <component name="path" t:title="path" t:color="green1">
<t:implementation.python script="path.py"/>
<service name="path"/>
- <property name="path" t:visible="false"></property>
+ <property name="path"></property>
</component>
- <component name="params" t:color="orange1">
- <documentation>?params</documentation>
+ <component name="params" t:title="?params" t:color="green1">
<t:implementation.python script="params.py"/>
<service name="params"/>
- <property name="params" t:visible="false"></property>
+ <property name="params"></property>
</component>
- <component name="user" t:color="orange1">
- <documentation>user</documentation>
+ <component name="user" t:title="user" t:color="green1">
<t:implementation.python script="user.py"/>
<service name="user"/>
- <property name="user" t:visible="false"></property>
+ <property name="user"></property>
</component>
- <component name="realm" t:color="orange1">
- <documentation>realm</documentation>
+ <component name="realm" t:title="realm" t:color="green1">
<t:implementation.python script="realm.py"/>
<service name="realm"/>
- <property name="realm" t:visible="false"></property>
+ <property name="realm"></property>
</component>
- <component name="email" t:color="orange1">
- <documentation>email</documentation>
+ <component name="email" t:title="email" t:color="green1">
<t:implementation.python script="email.py"/>
<service name="email"/>
- <property name="email" t:visible="false"></property>
+ <property name="email"></property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite Sat Feb 12 18:29:37 2011
@@ -22,35 +22,50 @@
targetNamespace="http://values"
name="palette">
- <service name="number" promote="number"/>
<service name="text" promote="text"/>
+ <service name="number" promote="number"/>
+ <service name="name" promote="name"/>
+ <service name="assoc" promote="assoc"/>
<service name="nothing" promote="nothing"/>
<service name="true" promote="true"/>
<service name="false" promote="false"/>
- <component name="number" t:color="orange1">
+ <component name="text" t:title="text" t:color="orange1">
+ <t:implementation.python script="text.py"/>
+ <service name="text"/>
+ <property name="property">abc</property>
+ </component>
+
+ <component name="number" t:title="number" t:color="orange1">
<t:implementation.python script="number.py"/>
<service name="number"/>
<property name="property">0</property>
</component>
- <component name="text" t:color="orange1">
- <t:implementation.python script="text.py"/>
- <service name="text"/>
- <property name="property">abc</property>
+ <component name="name" t:title="name" t:color="orange1">
+ <t:implementation.python script="name.py"/>
+ <service name="name"/>
+ <property name="property">name</property>
+ </component>
+
+ <component name="assoc" t:title="assoc" t:color="orange1">
+ <t:implementation.python script="assoc.py"/>
+ <service name="assoc"/>
+ <reference name="name"/>
+ <reference name="value"/>
</component>
- <component name="nothing" t:color="orange1">
+ <component name="nothing" t:title="nothing" t:color="orange1">
<t:implementation.python script="text.py"/>
<service name="nothing"/>
</component>
- <component name="true" t:color="orange1">
+ <component name="true" t:title="true" t:color="orange1">
<t:implementation.python script="true_.py"/>
<service name="true"/>
</component>
- <component name="false" t:color="orange1">
+ <component name="false" t:title="false" t:color="orange1">
<t:implementation.python script="false_.py"/>
<service name="false"/>
</component>
Modified: tuscany/sca-cpp/trunk/modules/js/htdocs/scdl.js
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/htdocs/scdl.js?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/htdocs/scdl.js (original)
+++ tuscany/sca-cpp/trunk/modules/js/htdocs/scdl.js Sat Feb 12 18:29:37 2011
@@ -79,14 +79,17 @@ scdl.documentation = function(l) {
if (!elementHasValue(car(d)))
return null;
var v = elementValue(car(d));
- if (v == 'gt')
- return '>'
- if (v == 'lt')
- return '<';
return v;
};
/**
+ * Returns the title of a component or componentType.
+ */
+scdl.title = function(l) {
+ return namedAttributeValue("'t:title", l);
+};
+
+/**
* Returns the color of a component or componentType.
*/
scdl.color = function(l) {
@@ -217,6 +220,8 @@ scdl.properties = function(l) {
* Returns the value of a property.
*/
scdl.propertyValue = function(l) {
+ if (!elementHasValue(l))
+ return '';
return elementValue(l);
};
Modified: tuscany/sca-cpp/trunk/modules/js/htdocs/uicyan.css
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/htdocs/uicyan.css?rev=1070123&r1=1070122&r2=1070123&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/htdocs/uicyan.css (original)
+++ tuscany/sca-cpp/trunk/modules/js/htdocs/uicyan.css Sat Feb 12 18:29:37 2011
@@ -54,11 +54,11 @@ overflow: hidden;
}
.tdl {
-border-right: 1px;
+border-right: 1px; border-style: solid; border-color: #a2bae7;
}
.tdr {
-border-left: 1px;
+border-left: 1px; border-style: solid; border-color: #a2bae7;
}
.tdw {