Refactor the sample composites and components and cleanup the component names a bit.

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

14 files changed, 460 insertions, 127 deletions

diff --git a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite b/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
index 6785c0477f..75cbf497b6 100644
--- a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
@@ -1,45 +1,103 @@
 <?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" name="palette" targetNamespace="http://palette">
+ <service name="frames" promote="frames"/>
  <service name="htattrs" promote="htattrs"/>
  <service name="htbutton" promote="htbutton"/>
  <service name="htcheck" promote="htcheck"/>
  <service name="htimg" promote="htimg"/>
+ <service name="htinline" promote="htinline"/>
  <service name="htlink" promote="htlink"/>
  <service name="htstyle" promote="htstyle"/>
+ <service name="left" promote="left"/>
  <service name="pixels" promote="pixels"/>
- <component x="90" y="110" name="htattrs" title="html attrs:" color="magenta1">
+ <service name="top" promote="top"/>
+ <service name="transform" promote="transform"/>
+ <service name="transition" promote="transition"/>
+ <component x="170" y="160" name="frames" title="frames" color="white1">
+  <implementation.python script="nuvem/frames.py"/>
+  <service name="frames"/>
+  <reference name="msec"/>
+  <reference name="loop"/>
+  <reference name="content"/>
+ </component>
+ <component x="140" y="60" name="htattrs" title="attrs:" color="white1">
   <implementation.python script="nuvem/htattrs.py"/>
   <service name="htattrs"/>
   <reference name="value"/>
  </component>
- <component x="180" y="10" name="htbutton" title="html button" color="magenta1">
+ <component x="130" y="10" name="htbutton" title="button" color="white1">
   <implementation.python script="nuvem/htbutton.py"/>
   <service name="htbutton"/>
   <reference name="value"/>
  </component>
- <component x="180" y="60" name="htcheck" title="html checkbox" color="magenta1">
+ <component x="250" y="10" name="htcheck" title="checkbox" color="white1">
   <implementation.python script="nuvem/htcheck.py"/>
   <service name="htcheck"/>
   <reference name="value"/>
  </component>
- <component x="90" y="10" name="htimg" title="html img" color="magenta1">
+ <component x="80" y="10" name="htimg" title="img" color="white1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
   <reference name="value"/>
  </component>
- <component x="90" y="60" name="htlink" title="html link" color="magenta1">
+ <component x="80" y="60" name="htinline" title="inline" color="white1">
+  <implementation.python script="nuvem/htinline.py"/>
+  <service name="htinline"/>
+  <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="htlink" title="link" color="white1">
   <implementation.python script="nuvem/htlink.py"/>
   <service name="htlink"/>
   <reference name="value"/>
  </component>
- <component x="190" y="110" name="htstyle" title="html style" color="magenta1">
+ <component x="200" y="60" name="htstyle" title="style" color="white1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
   <reference name="value"/>
  </component>
- <component x="90" y="160" name="pixels" title="pixels" color="magenta1">
+ <component x="230" y="110" name="left" title="left" color="white1">
+  <implementation.python script="nuvem/left.py"/>
+  <service name="left"/>
+  <reference name="value"/>
+ </component>
+ <component x="260" y="60" name="pixels" title="pixels" color="white1">
   <implementation.python script="nuvem/pixels.py"/>
   <service name="pixels"/>
   <reference name="value"/>
  </component>
+ <component x="170" y="110" name="top" title="top" color="white1">
+  <implementation.python script="nuvem/top.py"/>
+  <service name="top"/>
+  <reference name="value"/>
+ </component>
+ <component x="80" y="160" name="transform" title="transform" color="white1">
+  <implementation.python script="nuvem/transform.py"/>
+  <service name="transform"/>
+  <reference name="x"/>
+  <reference name="y"/>
+  <reference name="d"/>
+ </component>
+ <component x="80" y="110" name="transition" title="transition" color="white1">
+  <implementation.python script="nuvem/transition.py"/>
+  <service name="transition"/>
+  <reference name="value"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
index b2c933eec4..f89cae2c5d 100644
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="animation" promote="animation"/>
  <service name="call" promote="call"/>
@@ -8,7 +26,7 @@
  <service name="start" promote="start"/>
  <service name="stop" promote="stop"/>
  <service name="timer" promote="timer"/>
- <component x="90" y="170" name="animation" title="animation" color="green1">
+ <component x="160" y="60" name="animation" title="animation" color="green1">
   <implementation.python script="nuvem/animation.py"/>
   <service name="animation" visible="false">
    <binding.http uri="animation"/>
@@ -17,20 +35,20 @@
   <reference name="loop"/>
   <reference name="content"/>
  </component>
- <component x="90" y="70" name="call" title="call" color="green1">
+ <component x="190" y="10" 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">
+ <component x="80" y="60" 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="170" y="120" name="schedule" title="schedule" color="green1">
+ <component x="240" y="60" name="schedule" title="schedule" color="green1">
   <implementation.python script="nuvem/schedule.py"/>
   <service name="schedule" visible="false">
    <binding.http uri="schedule"/>
@@ -38,26 +56,26 @@
   <reference name="n"/>
   <reference name="content"/>
  </component>
- <component x="150" y="70" name="service" title="{compname}" color="green1">
+ <component x="240" y="10" 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">
+ <component x="80" 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">
+ <component x="130" 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">
+ <component x="80" y="110" name="timer" title="timer" color="green1">
   <implementation.python script="nuvem/timer.py"/>
   <service name="timer" visible="false">
    <binding.http uri="timer"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
index 42d67af548..cca0b174b8 100644
--- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="delete" promote="delete"/>
  <service name="filedb" promote="filedb"/>
@@ -7,45 +25,45 @@
  <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">
+ <component x="270" y="60" name="delete" title="delete" color="pink1">
   <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">
+ <component x="80" y="10" name="filedb" title="file" color="pink1">
   <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">
+ <component x="80" y="60" name="get" title="get" color="pink1">
   <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">
+ <component x="140" y="10" name="nosqldb" title="index **" color="pink1">
   <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">
+ <component x="200" y="60" name="post" title="post" color="pink1">
   <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">
+ <component x="140" y="60" name="put" title="put" color="pink1">
   <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">
+ <component x="210" y="10" name="sqldb" title="sql **" color="pink1">
   <implementation.python script="nuvem/sqldb.py"/>
   <service name="sqldb"/>
   <reference name="db" target="AppDataSQLCache" visible="false"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
index 6dcfb9eb43..6c8cbaa553 100644
--- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="delete" promote="delete"/>
  <service name="email" promote="email"/>
@@ -13,73 +31,73 @@
  <service name="put" promote="put"/>
  <service name="url" promote="url"/>
  <service name="user" promote="user"/>
- <component x="90" y="240" name="delete" title="delete" color="green1">
+ <component x="80" y="170" name="delete" title="delete" color="green1">
   <implementation.cpp path="lib/http" library="libhttpdelete"/>
   <service name="delete"/>
   <reference name="url"/>
  </component>
- <component x="250" y="60" name="email" title="email" color="green1">
+ <component x="130" y="60" name="email" title="email" color="green1">
   <implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email" visible="false"/>
  </component>
- <component x="90" y="170" name="get" title="get" color="green1">
+ <component x="80" y="120" 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">
+ <component x="80" 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="90" y="110" name="keychain" title="keychain" color="green1">
+ <component x="190" y="60" 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="90" y="60" name="param" title="?param" color="green1">
+ <component x="250" y="10" 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="230" y="10" name="params" title="?params" color="green1">
+ <component x="180" y="10" name="params" title="?params" color="green1">
   <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="query" visible="false"/>
  </component>
- <component x="170" y="240" name="patch" title="patch" color="green1">
+ <component x="260" y="120" name="patch" title="patch" color="green1">
   <implementation.cpp path="lib/http" library="libhttppatch"/>
   <service name="patch"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="160" y="10" name="path" title="path" color="green1">
+ <component x="130" 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="230" y="170" name="post" title="post" color="green1">
+ <component x="200" y="120" 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="160" y="170" name="put" title="put" color="green1">
+ <component x="140" y="120" 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="190" y="110" name="url" title="url" color="green1">
+ <component x="270" y="60" name="url" title="url" color="green1">
   <implementation.python script="nuvem/url.py"/>
   <service name="url"/>
   <reference name="address"/>
   <reference name="args"/>
  </component>
- <component x="180" y="60" name="user" title="user" color="green1">
+ <component x="80" y="60" name="user" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" visible="false"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
index 4190398e80..2f4051d7b9 100644
--- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="append" promote="append"/>
  <service name="empty" promote="empty"/>
@@ -7,91 +25,105 @@
  <service name="itemnb" promote="itemnb"/>
  <service name="last" promote="last"/>
  <service name="list" promote="list"/>
+ <service name="list1" promote="list1"/>
+ <service name="list2" promote="list2"/>
+ <service name="list3" promote="list3"/>
  <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">
+ <component x="140" 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">
+ <component x="80" y="70" 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">
+ <component x="80" y="130" 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">
+ <component x="200" 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">
+ <component x="80" y="180" 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">
+ <component x="200" y="130" 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">
+ <component x="80" y="10" 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">
+ <component x="140" y="10" name="list1" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference name="first"/>
+  <reference name="second"/>
+ </component>
+ <component x="260" y="10" name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference name="first"/>
+  <reference name="second"/>
+  <reference name="third"/>
+ </component>
+ <component x="160" y="180" 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">
+ <component x="80" y="250" 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">
+ <component x="240" y="250" 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">
+ <component x="140" y="130" 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">
+ <component x="250" y="130" 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">
+ <component x="240" y="180" 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">
+ <component x="160" y="250" name="values" title="values" color="yellow1">
   <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference name="list"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
index 0c5a769567..4d84272fd5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="and" promote="and"/>
  <service name="equals" promote="equals"/>
@@ -7,43 +25,43 @@
  <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">
+ <component x="140" y="10" name="and" title="and" color="green1">
   <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">
+ <component x="80" y="100" name="equals" title="=" color="green1">
   <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">
+ <component x="200" y="100" name="greater" title="gt" color="green1">
   <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">
+ <component x="80" y="10" name="if" title="if" color="green1">
   <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">
+ <component x="140" y="100" name="lesser" title="lt" color="green1">
   <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">
+ <component x="260" y="10" name="not" title="not" color="green1">
   <implementation.python script="nuvem/not_.py"/>
   <service name="not"/>
   <reference name="value"/>
  </component>
- <component x="200" y="10" name="or" title="or" color="magenta1">
+ <component x="200" y="10" name="or" title="or" color="green1">
   <implementation.python script="nuvem/or_.py"/>
   <service name="or"/>
   <reference name="value1"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
index 3e86647d1d..7dc4e88f2f 100644
--- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
@@ -1,19 +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" name="palette" targetNamespace="http://palette">
  <service name="add" promote="add"/>
+ <service name="ceil" promote="ceil"/>
  <service name="cos" promote="cos"/>
  <service name="distance" promote="distance"/>
  <service name="divide" promote="divide"/>
+ <service name="floor" promote="floor"/>
  <service name="max" promote="max"/>
  <service name="min" promote="min"/>
+ <service name="mod" promote="mod"/>
  <service name="multiply" promote="multiply"/>
  <service name="pi" promote="pi"/>
  <service name="random" promote="random"/>
+ <service name="randoms" promote="randoms"/>
  <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">
+ <component x="80" y="10" name="add" title="+" color="cyan1">
   <implementation.python script="nuvem/add.py"/>
   <service name="add">
    <documentation>+</documentation>
@@ -21,18 +43,23 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="250" y="200" name="cos" title="cos" color="magenta1">
+ <component x="270" y="130" name="ceil" title="ceil" color="cyan1">
+  <implementation.python script="nuvem/ceil_.py"/>
+  <service name="ceil"/>
+  <reference name="x"/>
+ </component>
+ <component x="210" y="190" name="cos" title="cos" color="cyan1">
   <implementation.python script="nuvem/cos_.py"/>
   <service name="cos"/>
   <reference name="x"/>
  </component>
- <component x="90" y="200" name="distance" title="distance **" color="magenta1">
+ <component x="80" y="240" name="distance" title="distance **" color="cyan1">
   <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">
+ <component x="270" y="10" name="divide" title="/" color="cyan1">
   <implementation.python script="nuvem/divide.py"/>
   <service name="divide">
    <documentation>/</documentation>
@@ -40,17 +67,28 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="160" y="80" name="max" title="max" color="magenta1">
+ <component x="210" y="130" name="floor" title="floor" color="cyan1">
+  <implementation.python script="nuvem/floor_.py"/>
+  <service name="floor"/>
+  <reference name="x"/>
+ </component>
+ <component x="150" y="80" name="max" title="max" color="cyan1">
   <implementation.python script="nuvem/max_.py"/>
   <service name="max"/>
   <reference name="l"/>
  </component>
- <component x="230" y="80" name="min" title="min" color="magenta1">
+ <component x="210" y="80" name="min" title="min" color="cyan1">
   <implementation.python script="nuvem/min_.py"/>
   <service name="min"/>
   <reference name="l"/>
  </component>
- <component x="210" y="10" name="multiply" title="*" color="magenta1">
+ <component x="80" y="130" name="mod" title="mod" color="cyan1">
+  <implementation.python script="nuvem/mod.py"/>
+  <service name="mod"/>
+  <reference name="n"/>
+  <reference name="x"/>
+ </component>
+ <component x="210" y="10" name="multiply" title="*" color="cyan1">
   <implementation.python script="nuvem/multiply.py"/>
   <service name="multiply">
    <documentation>*</documentation>
@@ -58,26 +96,33 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="240" y="130" name="pi" title="pi" color="magenta1">
+ <component x="80" y="190" name="pi" title="pi" color="cyan1">
   <implementation.python script="nuvem/pi_.py"/>
   <service name="pi"/>
  </component>
- <component x="170" y="130" name="random" title="rand" color="magenta1">
+ <component x="170" y="240" name="random" title="rand" color="cyan1">
   <implementation.python script="nuvem/random_.py"/>
   <service name="random"/>
+  <reference name="range"/>
+ </component>
+ <component x="230" y="240" name="randoms" title="rands" color="cyan1">
+  <implementation.python script="nuvem/randoms.py"/>
+  <service name="randoms"/>
+  <reference name="n"/>
+  <reference name="range"/>
  </component>
- <component x="90" y="130" name="round" title="round" color="magenta1">
+ <component x="150" y="130" name="round" title="round" color="cyan1">
   <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">
+ <component x="150" y="190" name="sin" title="sin" color="cyan1">
   <implementation.python script="nuvem/sin_.py"/>
   <service name="sin"/>
   <reference name="x"/>
  </component>
- <component x="150" y="10" name="subtract" title="-" color="magenta1">
+ <component x="150" y="10" name="subtract" title="-" color="cyan1">
   <implementation.python script="nuvem/subtract.py"/>
   <service name="subtract">
    <documentation>-</documentation>
@@ -85,7 +130,7 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="90" y="80" name="sum" title="sum" color="magenta1">
+ <component x="80" y="80" name="sum" title="sum" color="cyan1">
   <implementation.python script="nuvem/sum_.py"/>
   <service name="sum"/>
   <reference name="l"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
index 315a44b105..2cc03ae365 100644
--- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
@@ -1,14 +1,32 @@
 <?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" 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">
+ <component x="80" y="10" name="eval" title="expr" color="green1">
   <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">
+ <component x="150" y="10" name="exec" title="script" color="green1">
   <implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference name="py"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
index eb359ee84f..db58cdcd08 100644
--- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="bsearch" promote="bsearch"/>
  <service name="gaddress" promote="gaddress"/>
@@ -9,7 +27,7 @@
  <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">
+ <component x="240" y="10" name="bsearch" title="bing" color="blue1">
   <implementation.python script="nuvem/bsearch.py"/>
   <service name="bsearch"/>
   <reference name="query"/>
@@ -17,7 +35,7 @@
    <binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component x="90" y="110" name="gaddress" title="address" color="red1">
+ <component x="140" y="60" name="gaddress" title="address" color="blue1">
   <implementation.python script="nuvem/gaddress.py"/>
   <service name="gaddress"/>
   <reference name="address"/>
@@ -25,7 +43,7 @@
    <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">
+ <component x="220" y="60" name="ggeopos" title="geo position" color="blue1">
   <implementation.python script="nuvem/ggeopos.py"/>
   <service name="ggeopos"/>
   <reference name="latitude"/>
@@ -34,7 +52,7 @@
    <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">
+ <component x="80" y="120" name="gimages" title="images" color="blue1">
   <implementation.python script="nuvem/gimages.py"/>
   <service name="gimages"/>
   <reference name="query"/>
@@ -42,7 +60,7 @@
    <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">
+ <component x="80" y="60" name="gmap" title="map" color="blue1">
   <implementation.python script="nuvem/gmap.py"/>
   <service name="gmap"/>
   <reference name="locations"/>
@@ -50,7 +68,7 @@
    <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component x="90" y="10" name="gsearch" title="google" color="red1">
+ <component x="80" y="10" name="gsearch" title="google" color="blue1">
   <implementation.python script="nuvem/gsearch.py"/>
   <service name="gsearch"/>
   <reference name="query"/>
@@ -58,7 +76,7 @@
    <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
   </reference>
  </component>
- <component x="90" y="180" name="gweather" title="weather" color="red1">
+ <component x="150" y="120" name="gweather" title="weather" color="blue1">
   <implementation.python script="nuvem/gweather.py"/>
   <service name="gweather"/>
   <reference name="zip"/>
@@ -66,12 +84,12 @@
    <binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component x="180" y="180" name="traffic" title="traffic **" color="red1">
+ <component x="230" y="120" name="traffic" title="traffic **" color="blue1">
   <implementation.python script="nuvem/traffic.py"/>
   <service name="traffic"/>
   <reference name="location"/>
  </component>
- <component x="170" y="10" name="ysearch" title="yahoo" color="red1">
+ <component x="160" y="10" name="ysearch" title="yahoo" color="blue1">
   <implementation.python script="nuvem/ysearch.py"/>
   <service name="ysearch"/>
   <reference name="query"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
index d319fc9c45..5e02303857 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="bzprofile" promote="bzprofile"/>
  <service name="fbalbums" promote="fbalbums"/>
@@ -11,7 +29,7 @@
  <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">
+ <component x="80" y="260" name="bzprofile" title="buzz profile" color="blue1">
   <implementation.python script="nuvem/bzprofile.py"/>
   <service name="bzprofile"/>
   <reference name="id"/>
@@ -19,7 +37,7 @@
    <binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
   </reference>
  </component>
- <component x="90" y="230" name="fbalbums" title="facebook albums" color="blue1">
+ <component x="190" y="60" name="fbalbums" title="facebook albums" color="blue1">
   <implementation.python script="nuvem/fbalbums.py"/>
   <service name="fbalbums"/>
   <reference name="id"/>
@@ -27,7 +45,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="50" name="fbfriends" title="facebook friends" color="blue1">
+ <component x="190" y="10" name="fbfriends" title="facebook friends" color="blue1">
   <implementation.python script="nuvem/fbfriends.py"/>
   <service name="fbfriends"/>
   <reference name="id"/>
@@ -35,7 +53,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="90" name="fbgroups" title="facebook groups" color="blue1">
+ <component x="80" y="60" name="fbgroups" title="facebook groups" color="blue1">
   <implementation.python script="nuvem/fbgroups.py"/>
   <service name="fbgroups"/>
   <reference name="id"/>
@@ -43,7 +61,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="10" name="fbprofile" title="facebook profile" color="blue1">
+ <component x="80" y="10" name="fbprofile" title="facebook profile" color="blue1">
   <implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference name="id"/>
@@ -51,7 +69,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="270" name="flkalbum" title="flicker album" color="blue1">
+ <component x="80" y="210" name="flkalbum" title="flicker album" color="blue1">
   <implementation.python script="nuvem/flkalbum.py"/>
   <service name="flkalbum"/>
   <reference name="id"/>
@@ -59,7 +77,7 @@
    <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">
+ <component x="190" y="210" name="picalbum" title="picasa album" color="blue1">
   <implementation.python script="nuvem/picalbum.py"/>
   <service name="picalbum"/>
   <reference name="id"/>
@@ -67,7 +85,7 @@
    <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">
+ <component x="80" y="160" name="twfollowers" title="twitter followers" color="blue1">
   <implementation.python script="nuvem/twfollowers.py"/>
   <service name="twfollowers"/>
   <reference name="id"/>
@@ -75,7 +93,7 @@
    <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">
+ <component x="190" y="160" name="twfriends" title="twitter friends" color="blue1">
   <implementation.python script="nuvem/twfriends.py"/>
   <service name="twfriends"/>
   <reference name="id"/>
@@ -83,7 +101,7 @@
    <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">
+ <component x="80" y="110" name="twprofile" title="twitter profile" color="blue1">
   <implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference name="id"/>
@@ -91,7 +109,7 @@
    <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">
+ <component x="190" y="110" name="twtimeline" title="twitter timeline" color="blue1">
   <implementation.python script="nuvem/twtimeline.py"/>
   <service name="twtimeline"/>
   <reference name="id"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
index db125c9793..90a48291ca 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -1,17 +1,35 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="sendemail" promote="sendemail"/>
  <service name="sendgtalk" promote="sendgtalk"/>
  <service name="twsms" promote="twsms"/>
  <service name="voicecall" promote="voicecall"/>
- <component x="170" y="10" name="sendemail" title="email **" color="blue1">
+ <component x="150" 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">
+ <component x="80" y="10" name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference name="jid"/>
@@ -19,7 +37,7 @@
   <reference name="to"/>
   <reference name="msg"/>
  </component>
- <component x="90" y="120" name="twsms" title="sms" color="blue1">
+ <component x="230" y="10" name="twsms" title="sms" color="blue1">
   <implementation.python script="nuvem/twsms.py"/>
   <service name="twsms"/>
   <reference name="sid"/>
@@ -29,7 +47,7 @@
   <reference name="msg"/>
   <reference name="s" wiredByImpl="true" visible="false"/>
  </component>
- <component x="170" y="120" name="voicecall" title="voice **" color="blue1">
+ <component x="80" y="120" name="voicecall" title="voice **" color="blue1">
   <implementation.python script="nuvem/voicecall.py"/>
   <service name="voicecall"/>
   <reference name="to"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
index 925766a32f..6b9214f6e4 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="contains" promote="contains"/>
  <service name="format" promote="format"/>
@@ -8,49 +26,49 @@
  <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">
+ <component x="80" y="10" name="contains" title="contains" color="cyan1">
   <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">
+ <component x="80" y="90" name="format" title="format" color="cyan1">
   <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">
+ <component x="280" y="10" name="join" title="join" color="cyan1">
   <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">
+ <component x="210" y="90" name="lowercase" title="lower" color="cyan1">
   <implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference name="string"/>
  </component>
- <component x="170" y="90" name="parse" title="parse" color="magenta1">
+ <component x="150" y="90" name="parse" title="parse" color="cyan1">
   <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">
+ <component x="150" y="10" name="replace" title="replace" color="cyan1">
   <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">
+ <component x="220" y="10" name="split" title="split" color="cyan1">
   <implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference name="separator"/>
   <reference name="string"/>
  </component>
- <component x="160" y="230" name="uppercase" title="upper" color="magenta1">
+ <component x="270" y="90" name="uppercase" title="upper" color="cyan1">
   <implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference name="string"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
index febefec9a1..566278c44b 100644
--- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
@@ -1,25 +1,43 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="filter" promote="filter"/>
- <service name="foreach" promote="foreach"/>
+ <service name="map" promote="map"/>
  <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">
+ <component x="160" 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">
+ <component x="80" y="10" name="map" title="map" color="yellow1">
   <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
+  <service name="map"/>
   <reference name="item"/>
   <reference name="transform"/>
   <reference name="list"/>
  </component>
- <component x="240" y="10" name="reduce" title="reduce" color="yellow1">
+ <component x="80" y="90" name="reduce" title="reduce" color="yellow1">
   <implementation.python script="nuvem/reduce_.py"/>
   <service name="reduce"/>
   <reference name="item"/>
@@ -28,12 +46,12 @@
   <reference name="init"/>
   <reference name="list"/>
  </component>
- <component x="90" y="120" name="reverse" title="reverse" color="yellow1">
+ <component x="220" y="10" 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">
+ <component x="160" y="90" name="shuffle" title="shuffle" color="yellow1">
   <implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference name="list"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
index 8f143e42bf..4cd3a9d14e 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="comment" promote="comment"/>
  <service name="false" promote="false"/>
@@ -10,50 +28,50 @@
  <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">
+ <component x="210" y="110" 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">
+ <component x="260" y="10" 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">
+ <component x="80" 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">
+ <component x="150" y="60" 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">
+ <component x="80" 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">
+ <component x="150" y="110" 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">
+ <component x="140" 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">
+ <component x="80" 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">
+ <component x="200" y="10" 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">
+ <component x="210" y="60" name="valueof" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>name</property>