summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/edit/palettes
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-05-23 04:25:27 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-05-23 04:25:27 +0000
commitd1ef2011feade03df3916a93930fbc2f60327aa8 (patch)
tree37020f0a1b656426b798d8be5c0a0df1f727ba62 /sca-cpp/trunk/modules/edit/palettes
parent641f5cd4fd52b351d849148096cbdc4b6dc0a6f0 (diff)
Cleanup and organize sample components, apps and html pages.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1126306 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/edit/palettes')
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/control/palette.composite123
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/database/palette.composite134
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/http/palette.composite183
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/lists/palette.composite232
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/logic/palette.composite130
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/math/palette.composite207
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/python/palette.composite55
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/search/palette.composite171
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/social/palette.composite234
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/talk/palette.composite91
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/text/palette.composite143
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/transform/palette.composite106
-rw-r--r--sca-cpp/trunk/modules/edit/palettes/values/palette.composite144
13 files changed, 791 insertions, 1162 deletions
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
index 1ab4d4a54f..d22b9482ee 100644
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
@@ -1,78 +1,49 @@
<?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://control"
- name="palette">
-
- <service name="start" promote="start"/>
- <service name="stop" promote="stop"/>
- <service name="service" promote="service"/>
- <service name="timer" promote="timer"/>
- <service name="geolocation" promote="geolocation"/>
- <service name="call" promote="call"/>
-
- <component name="start" t:title="start" t:color="green1">
- <t:implementation.python script="nuvem/start.py"/>
- <service name="start" t:visible="false">
- <t:binding.http uri="start"/>
- </service>
- <reference name="content"/>
- </component>
-
- <component name="stop" t:title="stop" t:color="green1">
- <t:implementation.python script="nuvem/stop.py"/>
- <service name="stop" t:visible="false">
- <t:binding.http uri="stop"/>
- </service>
- <reference name="content"/>
- </component>
-
- <component name="service" t:title="{compname}" t:color="green1">
- <t:implementation.python script="nuvem/service.py"/>
- <service name="service" t:visible="false"/>
- <reference name="content"/>
- </component>
-
- <component name="timer" t:title="timer" t:color="green1">
- <t:implementation.python script="nuvem/timer.py"/>
- <service name="timer" t:visible="false">
- <t:binding.http uri="timer"/>
- </service>
- <reference name="n"/>
- <reference name="content"/>
- </component>
-
- <component name="geolocation" t:title="location" t:color="green1">
- <t:implementation.python script="nuvem/geolocation.py"/>
- <service name="geolocation" t:visible="false">
- <t:binding.http uri="geolocation"/>
- </service>
- <reference name="content"/>
- </component>
-
- <component name="call" t:title="call" t:color="green1">
- <t:implementation.python script="nuvem/call.py"/>
- <service name="call"/>
- <reference name="name"/>
- <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="call" promote="call"/>
+ <service name="location" promote="location"/>
+ <service name="service" promote="service"/>
+ <service name="start" promote="start"/>
+ <service name="stop" promote="stop"/>
+ <service name="timer" promote="timer"/>
+ <component x="90" y="70" name="call" title="call" color="green1">
+ <implementation.python script="nuvem/call.py"/>
+ <service name="call"/>
+ <reference name="name"/>
+ <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="90" y="120" name="location" title="location" color="green1">
+ <implementation.python script="nuvem/location.py"/>
+ <service name="location" visible="false">
+ <binding.http uri="location"/>
+ </service>
+ <reference name="content"/>
+ </component>
+ <component x="160" y="70" name="service" title="{compname}" color="green1">
+ <implementation.python script="nuvem/service.py"/>
+ <service name="service" visible="false"/>
+ <reference name="content"/>
+ </component>
+ <component x="90" y="10" name="start" title="start" color="green1">
+ <implementation.python script="nuvem/start.py"/>
+ <service name="start" visible="false">
+ <binding.http uri="start"/>
+ </service>
+ <reference name="content"/>
+ </component>
+ <component x="150" y="10" name="stop" title="stop" color="green1">
+ <implementation.python script="nuvem/stop.py"/>
+ <service name="stop" visible="false">
+ <binding.http uri="stop"/>
+ </service>
+ <reference name="content"/>
+ </component>
+ <component x="210" y="10" name="timer" title="timer" color="green1">
+ <implementation.python script="nuvem/timer.py"/>
+ <service name="timer" visible="false">
+ <binding.http uri="timer"/>
+ </service>
+ <reference name="n"/>
+ <reference name="content"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
index f9dab736f8..42d67af548 100644
--- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
@@ -1,84 +1,54 @@
<?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://database"
- name="palette">
-
- <service name="filedb" promote="filedb"/>
- <service name="nosqldb" promote="nosqldb"/>
- <service name="sqldb" promote="sqldb"/>
- <service name="get" promote="get"/>
- <service name="post" promote="post"/>
- <service name="put" promote="put"/>
- <service name="delete" promote="delete"/>
-
- <component name="filedb" t:title="file" t:color="red1">
- <t:implementation.python script="nuvem/filedb.py"/>
- <service name="filedb"/>
- <reference name="db" target="AppDataFileCache" t:visible="false"/>
- <property name="host" t:visible="false"/>
- </component>
-
- <component name="nosqldb" t:title="index **" t:color="red1">
- <t:implementation.python script="nuvem/nosqldb.py"/>
- <service name="nosqldb"/>
- <reference name="db" target="AppDataNoSQLCache" t:visible="false"/>
- <property name="host" t:visible="false"/>
- </component>
-
- <component name="sqldb" t:title="sql **" t:color="red1">
- <t:implementation.python script="nuvem/sqldb.py"/>
- <service name="sqldb"/>
- <reference name="db" target="AppDataSQLCache" t:visible="false"/>
- <property name="host" t:visible="false"/>
- </component>
-
- <component name="get" t:title="get" t:color="red1">
- <t:implementation.python script="nuvem/get.py"/>
- <service name="get"/>
- <reference name="collection"/>
- <reference name="id"/>
- </component>
-
- <component name="post" t:title="post" t:color="red1">
- <t:implementation.python script="nuvem/post.py"/>
- <service name="post"/>
- <reference name="collection"/>
- <reference name="id"/>
- <reference name="value"/>
- </component>
-
- <component name="put" t:title="put" t:color="red1">
- <t:implementation.python script="nuvem/put.py"/>
- <service name="put"/>
- <reference name="collection"/>
- <reference name="id"/>
- <reference name="value"/>
- </component>
-
- <component name="delete" t:title="delete" t:color="red1">
- <t:implementation.python script="nuvem/delete.py"/>
- <service name="delete"/>
- <reference name="collection"/>
- <reference name="id"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="delete" promote="delete"/>
+ <service name="filedb" promote="filedb"/>
+ <service name="get" promote="get"/>
+ <service name="nosqldb" promote="nosqldb"/>
+ <service name="post" promote="post"/>
+ <service name="put" promote="put"/>
+ <service name="sqldb" promote="sqldb"/>
+ <component x="230" y="60" name="delete" title="delete" color="red1">
+ <implementation.python script="nuvem/delete.py"/>
+ <service name="delete"/>
+ <reference name="collection"/>
+ <reference name="id"/>
+ </component>
+ <component x="90" y="10" name="filedb" title="file" color="red1">
+ <implementation.python script="nuvem/filedb.py"/>
+ <service name="filedb"/>
+ <reference name="db" target="AppDataFileCache" visible="false"/>
+ <property name="host" visible="false"/>
+ </component>
+ <component x="90" y="60" name="get" title="get" color="red1">
+ <implementation.python script="nuvem/get.py"/>
+ <service name="get"/>
+ <reference name="collection"/>
+ <reference name="id"/>
+ </component>
+ <component x="150" y="10" name="nosqldb" title="index **" color="red1">
+ <implementation.python script="nuvem/nosqldb.py"/>
+ <service name="nosqldb"/>
+ <reference name="db" target="AppDataNoSQLCache" visible="false"/>
+ <property name="host" visible="false"/>
+ </component>
+ <component x="90" y="130" name="post" title="post" color="red1">
+ <implementation.python script="nuvem/post.py"/>
+ <service name="post"/>
+ <reference name="collection"/>
+ <reference name="id"/>
+ <reference name="value"/>
+ </component>
+ <component x="160" y="60" name="put" title="put" color="red1">
+ <implementation.python script="nuvem/put.py"/>
+ <service name="put"/>
+ <reference name="collection"/>
+ <reference name="id"/>
+ <reference name="value"/>
+ </component>
+ <component x="240" y="10" name="sqldb" title="sql **" color="red1">
+ <implementation.python script="nuvem/sqldb.py"/>
+ <service name="sqldb"/>
+ <reference name="db" target="AppDataSQLCache" visible="false"/>
+ <property name="host" visible="false"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
index 317cf338ed..6b518f0a35 100644
--- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
@@ -1,107 +1,80 @@
<?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://http"
- name="palette">
-
- <service name="host" promote="host"/>
- <service name="path" promote="path"/>
- <service name="params" promote="params"/>
- <service name="param" promote="param"/>
- <service name="user" promote="user"/>
- <service name="email" promote="email"/>
- <service name="url" promote="url"/>
- <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" 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" 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" t:visible="false"></property>
- </component>
-
- <component name="param" t:title="?param" t:color="green1">
- <t:implementation.python script="nuvem/param.py"/>
- <service name="param"/>
- <property name="name">x</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" 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" t:visible="false"></property>
- </component>
-
- <component name="url" t:title="url" t:color="green1">
- <t:implementation.python script="nuvem/url.py"/>
- <service name="url"/>
- <reference name="address"/>
- <reference name="args"/>
- </component>
-
- <component name="get" t:title="get" t:color="green1">
- <implementation.cpp path="lib/http" library="libhttpget"/>
- <service name="get"/>
- <reference name="url"/>
- </component>
-
- <component name="post" t:title="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="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="delete" t:color="green1">
- <implementation.cpp path="lib/http" library="libhttpdelete"/>
- <service name="delete"/>
- <reference name="url"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="delete" promote="delete"/>
+ <service name="email" promote="email"/>
+ <service name="get" promote="get"/>
+ <service name="host" promote="host"/>
+ <service name="keychain" promote="keychain"/>
+ <service name="param" promote="param"/>
+ <service name="params" promote="params"/>
+ <service name="path" promote="path"/>
+ <service name="post" promote="post"/>
+ <service name="put" promote="put"/>
+ <service name="url" promote="url"/>
+ <service name="user" promote="user"/>
+ <component x="180" y="230" name="delete" title="delete" color="green1">
+ <implementation.cpp path="lib/http" library="libhttpdelete"/>
+ <service name="delete"/>
+ <reference name="url"/>
+ </component>
+ <component x="160" y="110" name="email" title="email" color="green1">
+ <implementation.python script="nuvem/email.py"/>
+ <service name="email"/>
+ <property name="email" visible="false"/>
+ </component>
+ <component x="150" y="160" name="get" title="get" color="green1">
+ <implementation.cpp path="lib/http" library="libhttpget"/>
+ <service name="get"/>
+ <reference name="url"/>
+ </component>
+ <component x="90" y="10" name="host" title="host" color="green1">
+ <implementation.python script="nuvem/host.py"/>
+ <service name="host"/>
+ <property name="host" visible="false"/>
+ </component>
+ <component x="230" y="110" name="keychain" title="keychain" color="green1">
+ <implementation.python script="nuvem/keychain.py"/>
+ <service name="keychain"/>
+ <reference name="name"/>
+ <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component x="180" y="60" name="param" title="?param" color="green1">
+ <implementation.python script="nuvem/param.py"/>
+ <service name="param"/>
+ <property>x</property>
+ <property name="query" visible="false"/>
+ </component>
+ <component x="90" y="60" name="params" title="?params" color="green1">
+ <implementation.python script="nuvem/params.py"/>
+ <service name="params"/>
+ <property name="query" visible="false"/>
+ </component>
+ <component x="160" y="10" name="path" title="path" color="green1">
+ <implementation.python script="nuvem/path.py"/>
+ <service name="path"/>
+ <property name="path" visible="false"/>
+ </component>
+ <component x="90" y="230" name="post" title="post **" color="green1">
+ <implementation.cpp path="lib/http" library="libhttppost"/>
+ <service name="post"/>
+ <reference name="url"/>
+ <reference name="content"/>
+ </component>
+ <component x="220" y="160" name="put" title="put **" color="green1">
+ <implementation.cpp path="lib/http" library="libhttpput"/>
+ <service name="put"/>
+ <reference name="url"/>
+ <reference name="content"/>
+ </component>
+ <component x="90" y="160" name="url" title="url" color="green1">
+ <implementation.python script="nuvem/url.py"/>
+ <service name="url"/>
+ <reference name="address"/>
+ <reference name="args"/>
+ </component>
+ <component x="90" y="110" name="user" title="user" color="green1">
+ <implementation.python script="nuvem/user.py"/>
+ <service name="user"/>
+ <property name="user" visible="false"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
index 2272a107c7..4190398e80 100644
--- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
@@ -1,137 +1,99 @@
<?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://lists"
- name="palette">
-
- <service name="pair" promote="pair"/>
- <service name="list" promote="list"/>
- <service name="first" promote="first"/>
- <service name="rest" promote="rest"/>
- <service name="second" promote="second"/>
- <service name="last" promote="last"/>
- <service name="empty" promote="empty"/>
- <service name="insert" promote="insert"/>
- <service name="append" promote="append"/>
- <service name="itemnb" promote="itemnb"/>
- <service name="lookup" promote="lookup"/>
- <service name="search" promote="search"/>
- <service name="names" promote="names"/>
- <service name="values" promote="values"/>
- <service name="range" promote="range"/>
-
- <component name="pair" t:title="pair" t:color="yellow1">
- <t:implementation.python script="nuvem/pair.py"/>
- <service name="pair"/>
- <reference name="name"/>
- <reference name="value"/>
- </component>
-
- <component name="list" t:title="list" t:color="yellow1">
- <t:implementation.python script="nuvem/list_.py"/>
- <service name="list"/>
- <reference name="item" t:clonable="true"/>
- </component>
-
- <component name="first" t:title="first" t:color="yellow1">
- <t:implementation.python script="nuvem/first.py"/>
- <service name="first"/>
- <reference name="list"/>
- </component>
-
- <component name="rest" t:title="rest" t:color="yellow1">
- <t:implementation.python script="nuvem/rest.py"/>
- <service name="rest"/>
- <reference name="list"/>
- </component>
-
- <component name="second" t:title="second" t:color="yellow1">
- <t:implementation.python script="nuvem/second.py"/>
- <service name="second"/>
- <reference name="list"/>
- </component>
-
- <component name="last" t:title="last" t:color="yellow1">
- <t:implementation.python script="nuvem/last.py"/>
- <service name="last"/>
- <reference name="list"/>
- </component>
-
- <component name="empty" t:title="empty" t:color="yellow1">
- <t:implementation.python script="nuvem/empty.py"/>
- <service name="empty"/>
- </component>
-
- <component name="insert" t:title="insert" t:color="yellow1">
- <t:implementation.python script="nuvem/insert.py"/>
- <service name="insert"/>
- <reference name="value"/>
- <reference name="list"/>
- </component>
-
- <component name="append" t:title="+" t:color="yellow1">
- <t:implementation.python script="nuvem/append.py"/>
- <service name="append"/>
- <reference name="first"/>
- <reference name="second"/>
- </component>
-
- <component name="itemnb" t:title="item #" t:color="yellow1">
- <t:implementation.python script="nuvem/itemnb.py"/>
- <service name="itemnb"/>
- <reference name="index"/>
- <reference name="list"/>
- </component>
-
- <component name="lookup" t:title="lookup" t:color="yellow1">
- <t:implementation.python script="nuvem/lookup.py"/>
- <service name="lookup"/>
- <reference name="name"/>
- <reference name="list"/>
- </component>
-
- <component name="search" t:title="search" t:color="yellow1">
- <t:implementation.python script="nuvem/search.py"/>
- <service name="search"/>
- <reference name="path"/>
- <reference name="list"/>
- </component>
-
- <component name="names" t:title="names" t:color="yellow1">
- <t:implementation.python script="nuvem/names.py"/>
- <service name="names"/>
- <reference name="list"/>
- </component>
-
- <component name="values" t:title="values" t:color="yellow1">
- <t:implementation.python script="nuvem/values.py"/>
- <service name="values"/>
- <reference name="list"/>
- </component>
-
- <component name="range" t:title="range" t:color="yellow1">
- <t:implementation.python script="nuvem/range_.py"/>
- <service name="range"/>
- <reference name="first"/>
- <reference name="last"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="append" promote="append"/>
+ <service name="empty" promote="empty"/>
+ <service name="first" promote="first"/>
+ <service name="insert" promote="insert"/>
+ <service name="itemnb" promote="itemnb"/>
+ <service name="last" promote="last"/>
+ <service name="list" promote="list"/>
+ <service name="lookup" promote="lookup"/>
+ <service name="names" promote="names"/>
+ <service name="pair" promote="pair"/>
+ <service name="range" promote="range"/>
+ <service name="rest" promote="rest"/>
+ <service name="second" promote="second"/>
+ <service name="select" promote="select"/>
+ <service name="values" promote="values"/>
+ <component x="170" y="70" name="append" title="+" color="yellow1">
+ <implementation.python script="nuvem/append.py"/>
+ <service name="append"/>
+ <reference name="first"/>
+ <reference name="second"/>
+ </component>
+ <component x="230" y="10" name="empty" title="empty" color="yellow1">
+ <implementation.python script="nuvem/empty.py"/>
+ <service name="empty"/>
+ </component>
+ <component x="90" y="140" name="first" title="first" color="yellow1">
+ <implementation.python script="nuvem/first.py"/>
+ <service name="first"/>
+ <reference name="list"/>
+ </component>
+ <component x="90" y="70" name="insert" title="insert" color="yellow1">
+ <implementation.python script="nuvem/insert.py"/>
+ <service name="insert"/>
+ <reference name="value"/>
+ <reference name="list"/>
+ </component>
+ <component x="230" y="140" name="itemnb" title="item #" color="yellow1">
+ <implementation.python script="nuvem/itemnb.py"/>
+ <service name="itemnb"/>
+ <reference name="index"/>
+ <reference name="list"/>
+ </component>
+ <component x="160" y="190" name="last" title="last" color="yellow1">
+ <implementation.python script="nuvem/last.py"/>
+ <service name="last"/>
+ <reference name="list"/>
+ </component>
+ <component x="90" y="13" name="list" title="list" color="yellow1">
+ <implementation.python script="nuvem/list_.py"/>
+ <service name="list"/>
+ <reference name="item" clonable="true"/>
+ </component>
+ <component x="90" y="240" name="lookup" title="lookup" color="yellow1">
+ <implementation.python script="nuvem/lookup.py"/>
+ <service name="lookup"/>
+ <reference name="name"/>
+ <reference name="list"/>
+ </component>
+ <component x="90" y="310" name="names" title="names" color="yellow1">
+ <implementation.python script="nuvem/names.py"/>
+ <service name="names"/>
+ <reference name="list"/>
+ </component>
+ <component x="160" y="10" name="pair" title="pair" color="yellow1">
+ <implementation.python script="nuvem/pair.py"/>
+ <service name="pair"/>
+ <reference name="name"/>
+ <reference name="value"/>
+ </component>
+ <component x="230" y="70" name="range" title="range" color="yellow1">
+ <implementation.python script="nuvem/range_.py"/>
+ <service name="range"/>
+ <reference name="first"/>
+ <reference name="last"/>
+ </component>
+ <component x="90" y="190" name="rest" title="rest" color="yellow1">
+ <implementation.python script="nuvem/rest.py"/>
+ <service name="rest"/>
+ <reference name="list"/>
+ </component>
+ <component x="150" y="140" name="second" title="second" color="yellow1">
+ <implementation.python script="nuvem/second.py"/>
+ <service name="second"/>
+ <reference name="list"/>
+ </component>
+ <component x="170" y="240" name="select" title="select" color="yellow1">
+ <implementation.python script="nuvem/select.py"/>
+ <service name="select"/>
+ <reference name="path"/>
+ <reference name="list"/>
+ </component>
+ <component x="170" y="310" name="values" title="values" color="yellow1">
+ <implementation.python script="nuvem/values.py"/>
+ <service name="values"/>
+ <reference name="list"/>
+ </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 e24d93a987..0c5a769567 100644
--- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
@@ -1,82 +1,52 @@
<?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://logic"
- name="palette">
-
- <service name="if" promote="if"/>
- <service name="and" promote="and"/>
- <service name="or" promote="or"/>
- <service name="not" promote="not"/>
- <service name="equals" promote="equals"/>
- <service name="greater" promote="greater"/>
- <service name="lesser" promote="lesser"/>
-
- <component name="if" t:title="if" t:color="magenta1">
- <t:implementation.python script="nuvem/if_.py"/>
- <service name="if"/>
- <reference name="condition"/>
- <reference name="then"/>
- <reference name="else"/>
- </component>
-
- <component name="and" t:title="and" t:color="magenta1">
- <t:implementation.python script="nuvem/and_.py"/>
- <service name="and"/>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="or" t:title="or" t:color="magenta1">
- <t:implementation.python script="nuvem/or_.py"/>
- <service name="or"/>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="not" t:title="not" t:color="magenta1">
- <t:implementation.python script="nuvem/not_.py"/>
- <service name="not"/>
- <reference name="value"/>
- </component>
-
- <component name="equals" t:title="=" t:color="magenta1">
- <t:implementation.python script="nuvem/equals.py"/>
- <service name="equals"/>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="greater" t:title="gt" t:color="magenta1">
- <t:implementation.python script="nuvem/greater.py"/>
- <service name="greater"/>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="lesser" t:title="lt" t:color="magenta1">
- <t:implementation.python script="nuvem/lesser.py"/>
- <service name="lesser"/>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="and" promote="and"/>
+ <service name="equals" promote="equals"/>
+ <service name="greater" promote="greater"/>
+ <service name="if" promote="if"/>
+ <service name="lesser" promote="lesser"/>
+ <service name="not" promote="not"/>
+ <service name="or" promote="or"/>
+ <component x="140" y="10" name="and" title="and" color="magenta1">
+ <implementation.python script="nuvem/and_.py"/>
+ <service name="and"/>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="90" y="100" name="equals" title="=" color="magenta1">
+ <implementation.python script="nuvem/equals.py"/>
+ <service name="equals"/>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="210" y="100" name="greater" title="gt" color="magenta1">
+ <implementation.python script="nuvem/greater.py"/>
+ <service name="greater"/>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="90" y="10" name="if" title="if" color="magenta1">
+ <implementation.python script="nuvem/if_.py"/>
+ <service name="if"/>
+ <reference name="condition"/>
+ <reference name="then"/>
+ <reference name="else"/>
+ </component>
+ <component x="150" y="100" name="lesser" title="lt" color="magenta1">
+ <implementation.python script="nuvem/lesser.py"/>
+ <service name="lesser"/>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="260" y="10" name="not" title="not" color="magenta1">
+ <implementation.python script="nuvem/not_.py"/>
+ <service name="not"/>
+ <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="or" title="or" color="magenta1">
+ <implementation.python script="nuvem/or_.py"/>
+ <service name="or"/>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </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 f835d8df03..f8d7ced4b8 100644
--- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
@@ -1,123 +1,88 @@
<?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://math"
- name="palette">
-
- <service name="multiply" promote="multiply"/>
- <service name="divide" promote="divide"/>
- <service name="add" promote="add"/>
- <service name="subtract" promote="subtract"/>
- <service name="distance" promote="distance"/>
- <service name="random" promote="random"/>
- <service name="sin" promote="sin"/>
- <service name="cos" promote="cos"/>
- <service name="round" promote="round"/>
- <service name="sum" promote="sum"/>
- <service name="min" promote="min"/>
- <service name="max" promote="max"/>
-
- <component name="multiply" t:title="*" t:color="magenta1">
- <t:implementation.python script="nuvem/multiply.py"/>
- <service name="multiply">
- <documentation>*</documentation>
- </service>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="divide" t:title="/" t:color="magenta1">
- <t:implementation.python script="nuvem/divide.py"/>
- <service name="divide">
- <documentation>/</documentation>
- </service>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="add" t:title="+" t:color="magenta1">
- <t:implementation.python script="nuvem/add.py"/>
- <service name="add">
- <documentation>+</documentation>
- </service>
- <reference name="value1"/>
- <reference name="value2"/>
- </component>
-
- <component name="subtract" t:title="-" t:color="magenta1">
- <t:implementation.python script="nuvem/subtract.py"/>
- <service name="subtract">
- <documentation>-</documentation>
- </service>
- <reference name="value1"/>
- <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>
-
- <component name="random" t:title="rand" t:color="magenta1">
- <t:implementation.python script="nuvem/random_.py"/>
- <service name="random"/>
- </component>
-
- <component name="sin" t:title="sin" t:color="magenta1">
- <t:implementation.python script="nuvem/sin_.py"/>
- <service name="sin"/>
- <reference name="x"/>
- </component>
-
- <component name="cos" t:title="cos" t:color="magenta1">
- <t:implementation.python script="nuvem/cos_.py"/>
- <service name="cos"/>
- <reference name="x"/>
- </component>
-
- <component name="round" t:title="round" t:color="magenta1">
- <t:implementation.python script="nuvem/round_.py"/>
- <service name="round"/>
- <reference name="n"/>
- <reference name="x"/>
- </component>
-
- <component name="sum" t:title="sum" t:color="magenta1">
- <t:implementation.python script="nuvem/sum_.py"/>
- <service name="sum"/>
- <reference name="l"/>
- </component>
-
- <component name="min" t:title="min" t:color="magenta1">
- <t:implementation.python script="nuvem/min_.py"/>
- <service name="min"/>
- <reference name="l"/>
- </component>
-
- <component name="max" t:title="max" t:color="magenta1">
- <t:implementation.python script="nuvem/max_.py"/>
- <service name="max"/>
- <reference name="l"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="add" promote="add"/>
+ <service name="cos" promote="cos"/>
+ <service name="distance" promote="distance"/>
+ <service name="divide" promote="divide"/>
+ <service name="max" promote="max"/>
+ <service name="min" promote="min"/>
+ <service name="multiply" promote="multiply"/>
+ <service name="random" promote="random"/>
+ <service name="round" promote="round"/>
+ <service name="sin" promote="sin"/>
+ <service name="subtract" promote="subtract"/>
+ <service name="sum" promote="sum"/>
+ <component x="90" y="10" name="add" title="+" color="magenta1">
+ <implementation.python script="nuvem/add.py"/>
+ <service name="add">
+ <documentation>+</documentation>
+ </service>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="250" y="200" name="cos" title="cos" color="magenta1">
+ <implementation.python script="nuvem/cos_.py"/>
+ <service name="cos"/>
+ <reference name="x"/>
+ </component>
+ <component x="90" y="200" name="distance" title="distance **" color="magenta1">
+ <implementation.python script="nuvem/distance.py"/>
+ <service name="distance"/>
+ <reference name="location1"/>
+ <reference name="location2"/>
+ </component>
+ <component x="270" y="10" name="divide" title="/" color="magenta1">
+ <implementation.python script="nuvem/divide.py"/>
+ <service name="divide">
+ <documentation>/</documentation>
+ </service>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="160" y="80" name="max" title="max" color="magenta1">
+ <implementation.python script="nuvem/max_.py"/>
+ <service name="max"/>
+ <reference name="l"/>
+ </component>
+ <component x="230" y="80" name="min" title="min" color="magenta1">
+ <implementation.python script="nuvem/min_.py"/>
+ <service name="min"/>
+ <reference name="l"/>
+ </component>
+ <component x="210" y="10" name="multiply" title="*" color="magenta1">
+ <implementation.python script="nuvem/multiply.py"/>
+ <service name="multiply">
+ <documentation>*</documentation>
+ </service>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="170" y="130" name="random" title="rand" color="magenta1">
+ <implementation.python script="nuvem/random_.py"/>
+ <service name="random"/>
+ </component>
+ <component x="90" y="130" name="round" title="round" color="magenta1">
+ <implementation.python script="nuvem/round_.py"/>
+ <service name="round"/>
+ <reference name="n"/>
+ <reference name="x"/>
+ </component>
+ <component x="190" y="200" name="sin" title="sin" color="magenta1">
+ <implementation.python script="nuvem/sin_.py"/>
+ <service name="sin"/>
+ <reference name="x"/>
+ </component>
+ <component x="150" y="10" name="subtract" title="-" color="magenta1">
+ <implementation.python script="nuvem/subtract.py"/>
+ <service name="subtract">
+ <documentation>-</documentation>
+ </service>
+ <reference name="value1"/>
+ <reference name="value2"/>
+ </component>
+ <component x="90" y="80" name="sum" title="sum" color="magenta1">
+ <implementation.python script="nuvem/sum_.py"/>
+ <service name="sum"/>
+ <reference name="l"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
index 2cabac1a26..315a44b105 100644
--- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
@@ -1,42 +1,17 @@
<?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="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="script" t:color="magenta1">
- <t:implementation.python script="nuvem/exec_.py"/>
- <service name="exec"/>
- <reference name="py"/>
- <reference name="ref"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="eval" promote="eval"/>
+ <service name="exec" promote="exec"/>
+ <component x="90" y="10" name="eval" title="expr" color="magenta1">
+ <implementation.python script="nuvem/eval_.py"/>
+ <service name="eval"/>
+ <reference name="py"/>
+ <reference name="ref"/>
+ </component>
+ <component x="170" y="10" name="exec" title="script" color="magenta1">
+ <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 04cc674962..eb359ee84f 100644
--- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
@@ -1,93 +1,82 @@
<?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="googlesearch" promote="googlesearch"/>
- <service name="yahoosearch" promote="yahoosearch"/>
- <service name="bingsearch" promote="bingsearch"/>
- <service name="googlemap" promote="googlemap"/>
- <service name="googleimages" promote="googleimages"/>
- <service name="weather" promote="weather"/>
- <service name="traffic" promote="traffic"/>
-
- <component name="googlesearch" t:title="google" t:color="red1">
- <t:implementation.python script="nuvem/gsearch.py"/>
- <service name="googlesearch"/>
- <reference name="query"/>
- <reference name="s" t:visible="false">
- <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
- </reference>
- </component>
-
- <component name="yahoosearch" t:title="yahoo" t:color="red1">
- <t:implementation.python script="nuvem/ysearch.py"/>
- <service name="yahoosearch"/>
- <reference name="query"/>
- <reference name="s" t:visible="false">
- <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
- </reference>
- </component>
-
- <component name="bingsearch" t:title="bing" t:color="red1">
- <t:implementation.python script="nuvem/bsearch.py"/>
- <service name="bingsearch"/>
- <reference name="query"/>
- <reference name="s" t:visible="false">
- <t:binding.http uri="http://www.bing.com/search"/>
- </reference>
- </component>
-
- <component name="googlemap" t:title="google map" t:color="red1">
- <t:implementation.python script="nuvem/gmap.py"/>
- <service name="googlemap"/>
- <reference name="locations"/>
- <reference name="s" t:visible="false">
- <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
- </reference>
- </component>
-
- <component name="googleimages" t:title="google images" t:color="red1">
- <t:implementation.python script="nuvem/gimages.py"/>
- <service name="googleimages"/>
- <reference name="query"/>
- <reference name="s" t:visible="false">
- <t:binding.http uri="https://ajax.googleapis.com/ajax/services/search/images"/>
- </reference>
- </component>
-
- <component name="weather" t:title="weather" t:color="red1">
- <t:implementation.python script="nuvem/gweather.py"/>
- <service name="weather"/>
- <reference name="zip"/>
- <reference name="ws" t:visible="false">
- <t:binding.http uri="http://www.google.com/ig/api"/>
- </reference>
- </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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="bsearch" promote="bsearch"/>
+ <service name="gaddress" promote="gaddress"/>
+ <service name="ggeopos" promote="ggeopos"/>
+ <service name="gimages" promote="gimages"/>
+ <service name="gmap" promote="gmap"/>
+ <service name="gsearch" promote="gsearch"/>
+ <service name="gweather" promote="gweather"/>
+ <service name="traffic" promote="traffic"/>
+ <service name="ysearch" promote="ysearch"/>
+ <component x="250" y="10" name="bsearch" title="bing" color="red1">
+ <implementation.python script="nuvem/bsearch.py"/>
+ <service name="bsearch"/>
+ <reference name="query"/>
+ <reference name="s" visible="false">
+ <binding.http uri="http://www.bing.com/search"/>
+ </reference>
+ </component>
+ <component x="90" y="110" name="gaddress" title="address" color="red1">
+ <implementation.python script="nuvem/gaddress.py"/>
+ <service name="gaddress"/>
+ <reference name="address"/>
+ <reference name="s" visible="false">
+ <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+ </reference>
+ </component>
+ <component x="180" y="110" name="ggeopos" title="geo position" color="red1">
+ <implementation.python script="nuvem/ggeopos.py"/>
+ <service name="ggeopos"/>
+ <reference name="latitude"/>
+ <reference name="longitude"/>
+ <reference name="s" visible="false">
+ <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+ </reference>
+ </component>
+ <component x="90" y="60" name="gimages" title="google images" color="red1">
+ <implementation.python script="nuvem/gimages.py"/>
+ <service name="gimages"/>
+ <reference name="query"/>
+ <reference name="s" visible="false">
+ <binding.http uri="https://ajax.googleapis.com/ajax/services/search/images"/>
+ </reference>
+ </component>
+ <component x="210" y="60" name="gmap" title="google map" color="red1">
+ <implementation.python script="nuvem/gmap.py"/>
+ <service name="gmap"/>
+ <reference name="locations"/>
+ <reference name="s" visible="false">
+ <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+ </reference>
+ </component>
+ <component x="90" y="10" name="gsearch" title="google" color="red1">
+ <implementation.python script="nuvem/gsearch.py"/>
+ <service name="gsearch"/>
+ <reference name="query"/>
+ <reference name="s" visible="false">
+ <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
+ </reference>
+ </component>
+ <component x="90" y="180" name="gweather" title="weather" color="red1">
+ <implementation.python script="nuvem/gweather.py"/>
+ <service name="gweather"/>
+ <reference name="zip"/>
+ <reference name="ws" visible="false">
+ <binding.http uri="http://www.google.com/ig/api"/>
+ </reference>
+ </component>
+ <component x="180" y="180" name="traffic" title="traffic **" color="red1">
+ <implementation.python script="nuvem/traffic.py"/>
+ <service name="traffic"/>
+ <reference name="location"/>
+ </component>
+ <component x="170" y="10" name="ysearch" title="yahoo" color="red1">
+ <implementation.python script="nuvem/ysearch.py"/>
+ <service name="ysearch"/>
+ <reference name="query"/>
+ <reference name="s" visible="false">
+ <binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
+ </reference>
+ </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 fea8fba4e1..d319fc9c45 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -1,136 +1,102 @@
<?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 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
- * 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://social"
- name="palette">
-
- <service name="fbprofile" promote="fbprofile"/>
- <service name="fbalbums" promote="fbalbums"/>
- <service name="fbfriends" promote="fbfriends"/>
- <service name="fbgroups" promote="fbgroups"/>
- <service name="twprofile" promote="twprofile"/>
- <service name="twfriends" promote="twfriends"/>
- <service name="twfollowers" promote="twfollowers"/>
- <service name="twtimeline" promote="twtimeline"/>
- <service name="bzprofile" promote="bzprofile"/>
- <service name="picalbum" promote="picalbum"/>
- <service name="flkalbum" promote="flkalbum"/>
-
- <component name="fbprofile" t:title="facebook profile" t:color="blue1">
- <t:implementation.python script="nuvem/fbprofile.py"/>
- <service name="fbprofile"/>
- <reference name="id"/>
- <reference name="fb" t:visible="false">
- <t:binding.http uri="https://graph.facebook.com"/>
- </reference>
- </component>
-
- <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="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">
- <t:implementation.python script="nuvem/twprofile.py"/>
- <service name="twprofile"/>
- <reference name="id"/>
- <reference name="tw" t:visible="false">
- <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
- </reference>
- </component>
-
- <component name="twfriends" t:title="twitter friends" t:color="blue1">
- <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="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">
- <t:implementation.python script="nuvem/twtimeline.py"/>
- <service name="twtimeline"/>
- <reference name="id"/>
- <reference name="tw" t:visible="false">
- <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
- </reference>
- </component>
-
- <component name="bzprofile" t:title="buzz profile" t:color="blue1">
- <t:implementation.python script="nuvem/bzprofile.py"/>
- <service name="bzprofile"/>
- <reference name="id"/>
- <reference name="bz" t:visible="false">
- <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
- </reference>
- </component>
-
- <component name="picalbum" t:title="picasa album" t:color="blue1">
- <t:implementation.python script="nuvem/picalbum.py"/>
- <service name="picalbum"/>
- <reference name="id"/>
- <reference name="pic" t:visible="false">
- <t:binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
- </reference>
- </component>
-
- <component name="flkalbum" t:title="flicker album" t:color="blue1">
- <t:implementation.python script="nuvem/flkalbum.py"/>
- <service name="flkalbum"/>
- <reference name="id"/>
- <reference name="flk" t:visible="false">
- <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
- </reference>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="bzprofile" promote="bzprofile"/>
+ <service name="fbalbums" promote="fbalbums"/>
+ <service name="fbfriends" promote="fbfriends"/>
+ <service name="fbgroups" promote="fbgroups"/>
+ <service name="fbprofile" promote="fbprofile"/>
+ <service name="flkalbum" promote="flkalbum"/>
+ <service name="picalbum" promote="picalbum"/>
+ <service name="twfollowers" promote="twfollowers"/>
+ <service name="twfriends" promote="twfriends"/>
+ <service name="twprofile" promote="twprofile"/>
+ <service name="twtimeline" promote="twtimeline"/>
+ <component x="90" y="320" name="bzprofile" title="buzz profile" color="blue1">
+ <implementation.python script="nuvem/bzprofile.py"/>
+ <service name="bzprofile"/>
+ <reference name="id"/>
+ <reference name="bz" visible="false">
+ <binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+ </reference>
+ </component>
+ <component x="90" y="230" name="fbalbums" title="facebook albums" color="blue1">
+ <implementation.python script="nuvem/fbalbums.py"/>
+ <service name="fbalbums"/>
+ <reference name="id"/>
+ <reference name="fb" visible="false">
+ <binding.http uri="https://graph.facebook.com"/>
+ </reference>
+ </component>
+ <component x="90" y="50" name="fbfriends" title="facebook friends" color="blue1">
+ <implementation.python script="nuvem/fbfriends.py"/>
+ <service name="fbfriends"/>
+ <reference name="id"/>
+ <reference name="fb" visible="false">
+ <binding.http uri="https://graph.facebook.com"/>
+ </reference>
+ </component>
+ <component x="90" y="90" name="fbgroups" title="facebook groups" color="blue1">
+ <implementation.python script="nuvem/fbgroups.py"/>
+ <service name="fbgroups"/>
+ <reference name="id"/>
+ <reference name="fb" visible="false">
+ <binding.http uri="https://graph.facebook.com"/>
+ </reference>
+ </component>
+ <component x="90" y="10" name="fbprofile" title="facebook profile" color="blue1">
+ <implementation.python script="nuvem/fbprofile.py"/>
+ <service name="fbprofile"/>
+ <reference name="id"/>
+ <reference name="fb" visible="false">
+ <binding.http uri="https://graph.facebook.com"/>
+ </reference>
+ </component>
+ <component x="90" y="270" name="flkalbum" title="flicker album" color="blue1">
+ <implementation.python script="nuvem/flkalbum.py"/>
+ <service name="flkalbum"/>
+ <reference name="id"/>
+ <reference name="flk" visible="false">
+ <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+ </reference>
+ </component>
+ <component x="220" y="230" name="picalbum" title="picasa album" color="blue1">
+ <implementation.python script="nuvem/picalbum.py"/>
+ <service name="picalbum"/>
+ <reference name="id"/>
+ <reference name="pic" visible="false">
+ <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
+ </reference>
+ </component>
+ <component x="90" y="180" name="twfollowers" title="twitter followers" color="blue1">
+ <implementation.python script="nuvem/twfollowers.py"/>
+ <service name="twfollowers"/>
+ <reference name="id"/>
+ <reference name="tw" visible="false">
+ <binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
+ </reference>
+ </component>
+ <component x="210" y="180" name="twfriends" title="twitter friends" color="blue1">
+ <implementation.python script="nuvem/twfriends.py"/>
+ <service name="twfriends"/>
+ <reference name="id"/>
+ <reference name="tw" visible="false">
+ <binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
+ </reference>
+ </component>
+ <component x="90" y="140" name="twprofile" title="twitter profile" color="blue1">
+ <implementation.python script="nuvem/twprofile.py"/>
+ <service name="twprofile"/>
+ <reference name="id"/>
+ <reference name="tw" visible="false">
+ <binding.http uri="http://api.twitter.com/1/users/show.json"/>
+ </reference>
+ </component>
+ <component x="200" y="140" name="twtimeline" title="twitter timeline" color="blue1">
+ <implementation.python script="nuvem/twtimeline.py"/>
+ <service name="twtimeline"/>
+ <reference name="id"/>
+ <reference name="tw" visible="false">
+ <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
+ </reference>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
index 050316acb1..af293b97f5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -1,61 +1,34 @@
<?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 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
- * 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://talk"
- name="palette">
-
- <service name="voicecall" promote="voicecall"/>
- <service name="sendsms" promote="sendsms"/>
- <service name="sendgtalk" promote="sendgtalk"/>
- <service name="sendemail" promote="sendemail"/>
-
- <component name="voicecall" t:title="voice **" t:color="blue1">
- <t:implementation.python script="nuvem/voicecall.py"/>
- <service name="voicecall"/>
- <reference name="to"/>
- </component>
-
- <component name="sendsms" t:title="sms **" t:color="blue1">
- <t:implementation.python script="nuvem/sendsms.py"/>
- <service name="sendsms"/>
- <reference name="user"/>
- <reference name="to"/>
- <reference name="msg"/>
- </component>
-
- <component name="sendgtalk" t:title="gtalk" t:color="blue1">
- <implementation.cpp path="lib/chat" library="libchat-sender2"/>
- <service name="sendgtalk"/>
- <reference name="jid"/>
- <reference name="pass"/>
- <reference name="to"/>
- <reference name="msg"/>
- </component>
-
- <component name="sendemail" t:title="email **" t:color="blue1">
- <t:implementation.python script="nuvem/sendemail.py"/>
- <service name="sendemail"/>
- <reference name="from"/>
- <reference name="to"/>
- <reference name="msg"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="sendemail" promote="sendemail"/>
+ <service name="sendgtalk" promote="sendgtalk"/>
+ <service name="sendsms" promote="sendsms"/>
+ <service name="voicecall" promote="voicecall"/>
+ <component x="170" y="10" name="sendemail" title="email **" color="blue1">
+ <implementation.python script="nuvem/sendemail.py"/>
+ <service name="sendemail"/>
+ <reference name="from"/>
+ <reference name="to"/>
+ <reference name="msg"/>
+ </component>
+ <component x="90" y="10" name="sendgtalk" title="gtalk" color="blue1">
+ <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+ <service name="sendgtalk"/>
+ <reference name="jid"/>
+ <reference name="pass"/>
+ <reference name="to"/>
+ <reference name="msg"/>
+ </component>
+ <component x="90" y="120" name="sendsms" title="sms **" color="blue1">
+ <implementation.python script="nuvem/sendsms.py"/>
+ <service name="sendsms"/>
+ <reference name="user"/>
+ <reference name="to"/>
+ <reference name="msg"/>
+ </component>
+ <component x="170" y="120" name="voicecall" title="voice **" color="blue1">
+ <implementation.python script="nuvem/voicecall.py"/>
+ <service name="voicecall"/>
+ <reference name="to"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
index a8844b172e..4b643000ef 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
@@ -1,89 +1,58 @@
<?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"/>
- <service name="format" promote="format"/>
- <service name="parse" promote="parse"/>
-
- <component name="contains" t:title="contains" t:color="magenta1">
- <t:implementation.python script="nuvem/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="nuvem/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="nuvem/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="nuvem/replace.py"/>
- <service name="replace"/>
- <reference name="from"/>
- <reference name="to"/>
- <reference name="string"/>
- </component>
-
- <component name="lowercase" t:title="lower" t:color="magenta1">
- <t:implementation.python script="nuvem/lowercase.py"/>
- <service name="lowercase"/>
- <reference name="string"/>
- </component>
-
- <component name="uppercase" t:title="upper" t:color="magenta1">
- <t:implementation.python script="nuvem/uppercase.py"/>
- <service name="uppercase"/>
- <reference name="string"/>
- </component>
-
- <component name="format" t:title="format" t:color="magenta1">
- <t:implementation.python script="nuvem/format_.py"/>
- <service name="format"/>
- <reference name="pattern"/>
- <reference name="values"/>
- </component>
-
- <component name="parse" t:title="parse" t:color="magenta1">
- <t:implementation.python script="nuvem/parse.py"/>
- <service name="parse"/>
- <reference name="regexp"/>
- <reference name="string"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="contains" promote="contains"/>
+ <service name="format" promote="format"/>
+ <service name="join" promote="join"/>
+ <service name="lowercase" promote="lowercase"/>
+ <service name="parse" promote="parse"/>
+ <service name="replace" promote="replace"/>
+ <service name="split" promote="split"/>
+ <service name="uppercase" promote="uppercase"/>
+ <component x="90" y="10" name="contains" title="contains" color="magenta1">
+ <implementation.python script="nuvem/contains.py"/>
+ <service name="contains"/>
+ <reference name="search"/>
+ <reference name="string"/>
+ </component>
+ <component x="90" y="90" name="format" title="format" color="magenta1">
+ <implementation.python script="nuvem/format_.py"/>
+ <service name="format"/>
+ <reference name="pattern"/>
+ <reference name="values"/>
+ </component>
+ <component x="160" y="160" name="join" title="join" color="magenta1">
+ <implementation.python script="nuvem/join.py"/>
+ <service name="join"/>
+ <reference name="separator"/>
+ <reference name="list"/>
+ </component>
+ <component x="90" y="230" name="lowercase" title="lower" color="magenta1">
+ <implementation.python script="nuvem/lowercase.py"/>
+ <service name="lowercase"/>
+ <reference name="string"/>
+ </component>
+ <component x="170" y="90" name="parse" title="parse" color="magenta1">
+ <implementation.python script="nuvem/parse.py"/>
+ <service name="parse"/>
+ <reference name="regexp"/>
+ <reference name="string"/>
+ </component>
+ <component x="180" y="10" name="replace" title="replace" color="magenta1">
+ <implementation.python script="nuvem/replace.py"/>
+ <service name="replace"/>
+ <reference name="from"/>
+ <reference name="to"/>
+ <reference name="string"/>
+ </component>
+ <component x="90" y="160" name="split" title="split" color="magenta1">
+ <implementation.python script="nuvem/split.py"/>
+ <service name="split"/>
+ <reference name="separator"/>
+ <reference name="string"/>
+ </component>
+ <component x="170" y="230" name="uppercase" title="upper" color="magenta1">
+ <implementation.python script="nuvem/uppercase.py"/>
+ <service name="uppercase"/>
+ <reference name="string"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
index a762a46b2a..febefec9a1 100644
--- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
@@ -1,69 +1,41 @@
<?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://transform"
- name="palette">
-
- <service name="foreach" promote="foreach"/>
- <service name="filter" promote="filter"/>
- <service name="reduce" promote="reduce"/>
- <service name="reverse" promote="reverse"/>
- <service name="shuffle" promote="shuffle"/>
-
- <component name="foreach" t:title="foreach" t:color="yellow1">
- <t:implementation.python script="nuvem/map_.py"/>
- <service name="foreach"/>
- <reference name="item"/>
- <reference name="transform"/>
- <reference name="list"/>
- </component>
-
- <component name="filter" t:title="filter" t:color="yellow1">
- <t:implementation.python script="nuvem/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="nuvem/reduce_.py"/>
- <service name="reduce"/>
- <reference name="item"/>
- <reference name="accum"/>
- <reference name="transform"/>
- <reference name="init"/>
- <reference name="list"/>
- </component>
-
- <component name="reverse" t:title="reverse" t:color="yellow1">
- <t:implementation.python script="nuvem/reverse.py"/>
- <service name="reverse"/>
- <reference name="list"/>
- </component>
-
- <component name="shuffle" t:title="shuffle" t:color="yellow1">
- <t:implementation.python script="nuvem/shuffle_.py"/>
- <service name="shuffle"/>
- <reference name="list"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="filter" promote="filter"/>
+ <service name="foreach" promote="foreach"/>
+ <service name="reduce" promote="reduce"/>
+ <service name="reverse" promote="reverse"/>
+ <service name="shuffle" promote="shuffle"/>
+ <component x="170" y="10" name="filter" title="filter" color="yellow1">
+ <implementation.python script="nuvem/filter_.py"/>
+ <service name="filter"/>
+ <reference name="item"/>
+ <reference name="condition"/>
+ <reference name="list"/>
+ </component>
+ <component x="90" y="10" name="foreach" title="foreach" color="yellow1">
+ <implementation.python script="nuvem/map_.py"/>
+ <service name="foreach"/>
+ <reference name="item"/>
+ <reference name="transform"/>
+ <reference name="list"/>
+ </component>
+ <component x="240" y="10" name="reduce" title="reduce" color="yellow1">
+ <implementation.python script="nuvem/reduce_.py"/>
+ <service name="reduce"/>
+ <reference name="item"/>
+ <reference name="accum"/>
+ <reference name="transform"/>
+ <reference name="init"/>
+ <reference name="list"/>
+ </component>
+ <component x="90" y="120" name="reverse" title="reverse" color="yellow1">
+ <implementation.python script="nuvem/reverse.py"/>
+ <service name="reverse"/>
+ <reference name="list"/>
+ </component>
+ <component x="170" y="120" name="shuffle" title="shuffle" color="yellow1">
+ <implementation.python script="nuvem/shuffle_.py"/>
+ <service name="shuffle"/>
+ <reference name="list"/>
+ </component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
index 75c4bca5bb..8f143e42bf 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
@@ -1,87 +1,61 @@
<?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://values"
- name="palette">
-
- <service name="property" promote="property"/>
- <service name="text" promote="text"/>
- <service name="number" promote="number"/>
- <service name="name" promote="name"/>
- <service name="valueof" promote="valueof"/>
- <service name="true" promote="true"/>
- <service name="false" promote="false"/>
- <service name="nothing" promote="nothing"/>
- <service name="now" promote="now"/>
-
- <component name="property" t:title="{propval} :" t:color="orange1">
- <t:implementation.python script="nuvem/assoc.py"/>
- <service name="property"/>
- <reference name="value"/>
- <property name="property">name</property>
- </component>
-
- <component name="text" t:title=" '{propval}'" t:color="orange1">
- <t:implementation.python script="nuvem/text.py"/>
- <service name="text"/>
- <property name="property">text</property>
- </component>
-
- <component name="number" t:title="#" t:color="orange1">
- <t:implementation.python script="nuvem/number.py"/>
- <service name="number"/>
- <property name="property">123</property>
- </component>
-
- <component name="name" t:title="" t:color="orange1">
- <t:implementation.python script="nuvem/name.py"/>
- <service name="name"/>
- <property name="property">name</property>
- </component>
-
- <component name="valueof" t:title="valueof" t:color="orange1">
- <t:implementation.python script="nuvem/valueof.py"/>
- <service name="valueof"/>
- <property name="name">name</property>
- </component>
-
- <component name="true" t:title="true" t:color="orange1">
- <t:implementation.python script="nuvem/true_.py"/>
- <service name="true"/>
- </component>
-
- <component name="false" t:title="false" t:color="orange1">
- <t:implementation.python script="nuvem/false_.py"/>
- <service name="false"/>
- </component>
-
- <component name="nothing" t:title="nothing" t:color="orange1">
- <t:implementation.python script="nuvem/nothing.py"/>
- <service name="nothing"/>
- </component>
-
- <component name="now" t:title="now" t:color="orange1">
- <t:implementation.python script="nuvem/now.py"/>
- <service name="now"/>
- <reference name="format"/>
- </component>
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="comment" promote="comment"/>
+ <service name="false" promote="false"/>
+ <service name="item" promote="item"/>
+ <service name="name" promote="name"/>
+ <service name="nothing" promote="nothing"/>
+ <service name="now" promote="now"/>
+ <service name="number" promote="number"/>
+ <service name="text" promote="text"/>
+ <service name="true" promote="true"/>
+ <service name="valueof" promote="valueof"/>
+ <component x="160" y="160" name="comment" title="{propval}" color="white">
+ <implementation.python script="nuvem/comment.py"/>
+ <service name="comment" visible="false"/>
+ <property>comment</property>
+ </component>
+ <component x="160" y="110" name="false" title="false" color="orange1">
+ <implementation.python script="nuvem/false_.py"/>
+ <service name="false"/>
+ </component>
+ <component x="90" y="60" name="item" title="{propval} :" color="orange1">
+ <implementation.python script="nuvem/item.py"/>
+ <service name="item"/>
+ <reference name="value"/>
+ <property>name</property>
+ </component>
+ <component x="230" y="10" name="name" title="" color="orange1">
+ <implementation.python script="nuvem/name.py"/>
+ <service name="name"/>
+ <property>name</property>
+ </component>
+ <component x="230" y="110" name="nothing" title="nothing" color="orange1">
+ <implementation.python script="nuvem/nothing.py"/>
+ <service name="nothing"/>
+ </component>
+ <component x="90" y="160" name="now" title="now" color="orange1">
+ <implementation.python script="nuvem/now.py"/>
+ <service name="now"/>
+ <reference name="format"/>
+ </component>
+ <component x="160" y="10" name="number" title="#" color="orange1">
+ <implementation.python script="nuvem/number.py"/>
+ <service name="number"/>
+ <property>123</property>
+ </component>
+ <component x="90" y="10" name="text" title=" '{propval}'" color="orange1">
+ <implementation.python script="nuvem/text.py"/>
+ <service name="text"/>
+ <property>text</property>
+ </component>
+ <component x="90" y="110" name="true" title="true" color="orange1">
+ <implementation.python script="nuvem/true_.py"/>
+ <service name="true"/>
+ </component>
+ <component x="170" y="60" name="valueof" title="valueof" color="orange1">
+ <implementation.python script="nuvem/valueof.py"/>
+ <service name="valueof"/>
+ <property>name</property>
+ </component>
</composite>