diff options
Diffstat (limited to 'sca-cpp/trunk/modules/edit/palettes')
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/event/palette.composite | 26 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/http/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/url/palette.composite) | 35 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/logic/palette.composite | 16 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/math/palette.composite | 16 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/python/palette.composite | 42 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/search/palette.composite | 27 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite | 62 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/social/palette.composite | 39 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/edit/palettes/talk/palette.composite | 8 |
9 files changed, 157 insertions, 114 deletions
diff --git a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite index c887b17d57..0bb69eeccd 100644 --- a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite @@ -25,24 +25,36 @@ <service name="page" promote="page"/> <service name="button" promote="button"/> <service name="every" promote="every"/> + <service name="location" promote="location"/> - <component name="page" t:title="when page opened" t:color="green1"> + <component name="page" t:title="when page opens" t:color="green1"> <t:implementation.python script="nuvem/page.py"/> - <service name="page" t:visible="false"/> + <service name="page" t:visible="false"> + <t:binding.http uri="page"/> + </service> <reference name="content"/> </component> - <component name="button" t:title="when clicked" t:color="green1"> + <component name="button" t:title="on {compname} click" t:color="green1"> <t:implementation.python script="nuvem/button.py"/> <service name="button" t:visible="false"/> - <property name="property">button</property> <reference name="content"/> </component> - <component name="every" t:title="every n secs" t:color="green1"> + <component name="every" t:title="every n millisec" t:color="green1"> <t:implementation.python script="nuvem/every.py"/> - <service name="every" t:visible="false"/> - <property name="property">60</property> + <service name="every" t:visible="false"> + <t:binding.http uri="every"/> + </service> + <reference name="n"/> + <reference name="content"/> + </component> + + <component name="location" t:title="on location change" t:color="green1"> + <t:implementation.python script="nuvem/location.py"/> + <service name="location" t:visible="false"> + <t:binding.http uri="location"/> + </service> <reference name="content"/> </component> diff --git a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite index dc3b40e6a7..fb46490dea 100644 --- a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite @@ -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://url" + targetNamespace="http://http" name="palette"> <service name="host" promote="host"/> @@ -28,35 +28,38 @@ <service name="user" promote="user"/> <service name="email" promote="email"/> <service name="get" promote="get"/> + <service name="post" promote="post"/> + <service name="put" promote="put"/> + <service name="delete" promote="delete"/> <component name="host" t:title="host" t:color="green1"> <t:implementation.python script="nuvem/host.py"/> <service name="host"/> - <property name="host"></property> + <property name="host" t:visible="false"></property> </component> <component name="path" t:title="path" t:color="green1"> <t:implementation.python script="nuvem/path.py"/> <service name="path"/> - <property name="path"></property> + <property name="path" t:visible="false"></property> </component> <component name="params" t:title="?params" t:color="green1"> <t:implementation.python script="nuvem/params.py"/> <service name="params"/> - <property name="query"></property> + <property name="query" t:visible="false"></property> </component> <component name="user" t:title="user" t:color="green1"> <t:implementation.python script="nuvem/user.py"/> <service name="user"/> - <property name="user"></property> + <property name="user" t:visible="false"></property> </component> <component name="email" t:title="email" t:color="green1"> <t:implementation.python script="nuvem/email.py"/> <service name="email"/> - <property name="email"></property> + <property name="email" t:visible="false"></property> </component> <component name="get" t:title="http get" t:color="green1"> @@ -65,4 +68,24 @@ <reference name="url"/> </component> + <component name="post" t:title="http post **" t:color="green1"> + <implementation.cpp path="lib/http" library="libhttppost"/> + <service name="post"/> + <reference name="url"/> + <reference name="content"/> + </component> + + <component name="put" t:title="http put **" t:color="green1"> + <implementation.cpp path="lib/http" library="libhttpput"/> + <service name="put"/> + <reference name="url"/> + <reference name="content"/> + </component> + + <component name="delete" t:title="http delete **" t:color="green1"> + <implementation.cpp path="lib/http" library="libhttpdelete"/> + <service name="delete"/> + <reference name="url"/> + </component> + </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite index 0db971bdfd..e24d93a987 100644 --- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite @@ -29,8 +29,6 @@ <service name="equals" promote="equals"/> <service name="greater" promote="greater"/> <service name="lesser" promote="lesser"/> - <service name="eval" promote="eval"/> - <service name="exec" promote="exec"/> <component name="if" t:title="if" t:color="magenta1"> <t:implementation.python script="nuvem/if_.py"/> @@ -81,18 +79,4 @@ <reference name="value2"/> </component> - <component name="eval" t:title="py expr" t:color="magenta1"> - <t:implementation.python script="nuvem/eval_.py"/> - <service name="eval"/> - <reference name="py"/> - <reference name="ref"/> - </component> - - <component name="exec" t:title="py script" t:color="magenta1"> - <t:implementation.python script="nuvem/exec_.py"/> - <service name="exec"/> - <reference name="py"/> - <reference name="ref"/> - </component> - </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite index 61638b50a2..d3c99d74c4 100644 --- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite @@ -26,8 +26,9 @@ <service name="divide" promote="divide"/> <service name="add" promote="add"/> <service name="subtract" promote="subtract"/> + <service name="distance" promote="distance"/> - <component name="multiply" t:title="*" t:color="magenta1"> + <component name="multiply" t:title="multiply" t:color="magenta1"> <t:implementation.python script="nuvem/multiply.py"/> <service name="multiply"> <documentation>*</documentation> @@ -36,7 +37,7 @@ <reference name="value2"/> </component> - <component name="divide" t:title="/" t:color="magenta1"> + <component name="divide" t:title="divide" t:color="magenta1"> <t:implementation.python script="nuvem/divide.py"/> <service name="divide"> <documentation>/</documentation> @@ -45,7 +46,7 @@ <reference name="value2"/> </component> - <component name="add" t:title="+" t:color="magenta1"> + <component name="add" t:title="add" t:color="magenta1"> <t:implementation.python script="nuvem/add.py"/> <service name="add"> <documentation>+</documentation> @@ -54,7 +55,7 @@ <reference name="value2"/> </component> - <component name="subtract" t:title="-" t:color="magenta1"> + <component name="subtract" t:title="subtract" t:color="magenta1"> <t:implementation.python script="nuvem/subtract.py"/> <service name="subtract"> <documentation>-</documentation> @@ -63,4 +64,11 @@ <reference name="value2"/> </component> + <component name="distance" t:title="distance **" t:color="magenta1"> + <t:implementation.python script="nuvem/distance.py"/> + <service name="distance"/> + <reference name="location1"/> + <reference name="location2"/> + </component> + </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite new file mode 100644 index 0000000000..d6b8ebcaaf --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite @@ -0,0 +1,42 @@ +<?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://python" + name="palette"> + + <service name="eval" promote="eval"/> + <service name="exec" promote="exec"/> + + <component name="eval" t:title="py expr" t:color="magenta1"> + <t:implementation.python script="nuvem/eval_.py"/> + <service name="eval"/> + <reference name="py"/> + <reference name="ref"/> + </component> + + <component name="exec" t:title="py script" t:color="magenta1"> + <t:implementation.python script="nuvem/exec_.py"/> + <service name="exec"/> + <reference name="py"/> + <reference name="ref"/> + </component> + +</composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite index 08c41ac5ec..eab03ac835 100644 --- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite @@ -25,23 +25,44 @@ <service name="googlesearch" promote="googlesearch"/> <service name="yahoosearch" promote="yahoosearch"/> <service name="bingsearch" promote="bingsearch"/> + <service name="geomap" promote="geomap"/> + <service name="weather" promote="weather"/> + <service name="traffic" promote="traffic"/> - <component name="googlesearch" t:title="google search" t:color="red1"> + <component name="googlesearch" t:title="google search **" t:color="red1"> <t:implementation.python script="nuvem/googlesearch.py"/> <service name="googlesearch"/> <reference name="query"/> </component> - <component name="yahoosearch" t:title="yahoo search" t:color="red1"> + <component name="yahoosearch" t:title="yahoo search **" t:color="red1"> <t:implementation.python script="nuvem/yahoosearch.py"/> <service name="yahoosearch"/> <reference name="query"/> </component> - <component name="bingsearch" t:title="bing search" t:color="red1"> + <component name="bingsearch" t:title="bing search **" t:color="red1"> <t:implementation.python script="nuvem/bingsearch.py"/> <service name="bingsearch"/> <reference name="query"/> </component> + <component name="geomap" t:title="map **" t:color="red1"> + <t:implementation.python script="nuvem/geomap.py"/> + <service name="geomap"/> + <reference name="location"/> + </component> + + <component name="weather" t:title="weather **" t:color="red1"> + <t:implementation.python script="nuvem/weather.py"/> + <service name="weather"/> + <reference name="location"/> + </component> + + <component name="traffic" t:title="traffic **" t:color="red1"> + <t:implementation.python script="nuvem/traffic.py"/> + <service name="traffic"/> + <reference name="location"/> + </component> + </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite b/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite deleted file mode 100644 index 755d111ae8..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite +++ /dev/null @@ -1,62 +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://sensor" - name="palette"> - - <service name="location" promote="location"/> - <service name="distance" promote="distance"/> - <service name="geomap" promote="geomap"/> - <service name="weather" promote="weather"/> - <service name="traffic" promote="traffic"/> - - <component name="location" t:title="location" t:color="red1"> - <t:implementation.python script="nuvem/location.py"/> - <service name="location"/> - <reference name="user"/> - </component> - - <component name="distance" t:title="distance" t:color="red1"> - <t:implementation.python script="nuvem/distance.py"/> - <service name="distance"/> - <reference name="location1"/> - <reference name="location2"/> - </component> - - <component name="geomap" t:title="map" t:color="red1"> - <t:implementation.python script="nuvem/geomap.py"/> - <service name="geomap"/> - <reference name="location"/> - </component> - - <component name="weather" t:title="weather" t:color="red1"> - <t:implementation.python script="nuvem/weather.py"/> - <service name="weather"/> - <reference name="location"/> - </component> - - <component name="traffic" t:title="traffic" t:color="red1"> - <t:implementation.python script="nuvem/traffic.py"/> - <service name="traffic"/> - <reference name="location"/> - </component> - -</composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite index 3fc3d4f162..fdd174afb0 100644 --- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite @@ -23,12 +23,12 @@ name="palette"> <service name="fbprofile" promote="fbprofile"/> - <service name="fbalbum" promote="fbalbum"/> + <service name="fbalbums" promote="fbalbums"/> <service name="fbfriends" promote="fbfriends"/> - <service name="fbgroup" promote="fbgroup"/> + <service name="fbgroups" promote="fbgroups"/> <service name="twprofile" promote="twprofile"/> <service name="twfriends" promote="twfriends"/> - <service name="twstatus" promote="twstatus"/> + <service name="twfollowers" promote="twfollowers"/> <service name="twtimeline" promote="twtimeline"/> <component name="fbprofile" t:title="facebook profile" t:color="blue1"> @@ -40,22 +40,31 @@ </reference> </component> - <component name="fbalbum" t:title="facebook album" t:color="blue1"> - <t:implementation.python script="nuvem/fbalbum.py"/> - <service name="fbalbum"/> + <component name="fbalbums" t:title="facebook albums" t:color="blue1"> + <t:implementation.python script="nuvem/fbalbums.py"/> + <service name="fbalbums"/> <reference name="id"/> + <reference name="fb" t:visible="false"> + <t:binding.http uri="https://graph.facebook.com"/> + </reference> </component> <component name="fbfriends" t:title="facebook friends" t:color="blue1"> <t:implementation.python script="nuvem/fbfriends.py"/> <service name="fbfriends"/> <reference name="id"/> + <reference name="fb" t:visible="false"> + <t:binding.http uri="https://graph.facebook.com"/> + </reference> </component> - <component name="fbgroup" t:title="facebook group" t:color="blue1"> - <t:implementation.python script="nuvem/fbgroup.py"/> - <service name="fbgroup"/> + <component name="fbgroups" t:title="facebook groups" t:color="blue1"> + <t:implementation.python script="nuvem/fbgroups.py"/> + <service name="fbgroups"/> <reference name="id"/> + <reference name="fb" t:visible="false"> + <t:binding.http uri="https://graph.facebook.com"/> + </reference> </component> <component name="twprofile" t:title="twitter profile" t:color="blue1"> @@ -71,12 +80,18 @@ <t:implementation.python script="nuvem/twfriends.py"/> <service name="twfriends"/> <reference name="id"/> + <reference name="tw" t:visible="false"> + <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/> + </reference> </component> - <component name="twstatus" t:title="twitter status" t:color="blue1"> - <t:implementation.python script="nuvem/twstatus.py"/> - <service name="twstatus"/> + <component name="twfollowers" t:title="twitter followers" t:color="blue1"> + <t:implementation.python script="nuvem/twfollowers.py"/> + <service name="twfollowers"/> <reference name="id"/> + <reference name="tw" t:visible="false"> + <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/> + </reference> </component> <component name="twtimeline" t:title="twitter timeline" t:color="blue1"> diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite index c45262a786..ad65ffdc1d 100644 --- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite @@ -27,13 +27,13 @@ <service name="gtalksend" promote="gtalksend"/> <service name="gtalkreceive" promote="gtalkreceive"/> - <component name="call" t:title="place call" t:color="blue1"> + <component name="call" t:title="place call **" t:color="blue1"> <t:implementation.python script="nuvem/call.py"/> <service name="call"/> <reference name="to"/> </component> - <component name="smssend" t:title="send sms" t:color="blue1"> + <component name="smssend" t:title="send sms **" t:color="blue1"> <t:implementation.python script="nuvem/smssend.py"/> <service name="smssend"/> <reference name="user"/> @@ -41,7 +41,7 @@ <reference name="msg"/> </component> - <component name="gtalksend" t:title="send gtalk" t:color="blue1"> + <component name="gtalksend" t:title="send gtalk **" t:color="blue1"> <t:implementation.python script="nuvem/gtalksend.py"/> <service name="gtalksend"/> <reference name="jid"/> @@ -49,7 +49,7 @@ <reference name="msg"/> </component> - <component name="gtalkreceive" t:title="when gtalk received" t:color="blue1"> + <component name="gtalkreceive" t:title="gtalk received **" t:color="blue1"> <t:implementation.python script="nuvem/gtalkreceive.py"/> <service name="gtalkreceive"/> <reference name="jid"/> |