Refactor component palettes a bit and support autosave.

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

8 files changed, 193 insertions, 66 deletions

diff --git a/sca-cpp/trunk/modules/edit/palettes/events/palette.composite b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite
index 7629315f60..6f55d30639 100644
--- a/sca-cpp/trunk/modules/edit/palettes/events/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://events"
+  targetNamespace="http://event"
   name="palette">
         
     <service name="page" promote="page"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/list/palette.composite
index 89b5e6234a..8e31f0e8b5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/list/palette.composite
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://lists"
+  targetNamespace="http://list"
   name="palette">
         
     <service name="list" promote="list"/>
@@ -28,12 +28,8 @@
     <service name="empty" promote="empty"/>
     <service name="itemnb" promote="itemnb"/>
     <service name="find" promote="find"/>
-    <service name="foreach" promote="foreach"/>
-    <service name="filter" promote="filter"/>
-    <service name="reduce" promote="reduce"/>
     <service name="range" promote="range"/>
     <service name="append" promote="append"/>
-    <service name="reverse" promote="reverse"/>
 
     <component name="list" t:title="make list" t:color="yellow1">
         <t:implementation.python script="nuvem/list_.py"/>
@@ -73,31 +69,6 @@
         <reference name="assoc"/>
     </component>
     
-    <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="list"/>
-    </component>
-    
     <component name="range" t:title="range" t:color="yellow1">
         <t:implementation.python script="nuvem/range_.py"/>
         <service name="range"/>
@@ -112,10 +83,4 @@
         <reference name="second"/>
     </component>
     
-    <component name="reverse" t:title="reverse" t:color="yellow1">
-        <t:implementation.python script="nuvem/reverse.py"/>
-        <service name="reverse"/>
-        <reference name="list"/>
-    </component>
-    
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
new file mode 100644
index 0000000000..08c41ac5ec
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
@@ -0,0 +1,47 @@
+<?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"/>
+
+    <component name="googlesearch" t:title="google search" t:color="red1">
+        <t:implementation.python script="nuvem/googlesearch.py"/>
+        <service name="googlesearch"/>
+        <reference name="query"/>
+    </component>
+    
+    <component name="yahoosearch" t:title="yahoo search" t:color="red1">
+        <t:implementation.python script="nuvem/yahoosearch.py"/>
+        <service name="yahoosearch"/>
+        <reference name="query"/>
+    </component>
+    
+    <component name="bingsearch" t:title="bing search" t:color="red1">
+        <t:implementation.python script="nuvem/bingsearch.py"/>
+        <service name="bingsearch"/>
+        <reference name="query"/>
+    </component>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite b/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite
index b3400e2634..755d111ae8 100644
--- a/sca-cpp/trunk/modules/edit/palettes/sensors/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite
@@ -19,23 +19,44 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://sensors"
+  targetNamespace="http://sensor"
   name="palette">
         
     <service name="location" promote="location"/>
     <service name="distance" promote="distance"/>
+    <service name="geomap" promote="geomap"/>
+    <service name="weather" promote="weather"/>
+    <service name="traffic" promote="traffic"/>
 
     <component name="location" t:title="location" t:color="red1">
-        <t:implementation.python script="location.py"/>
+        <t:implementation.python script="nuvem/location.py"/>
         <service name="location"/>
         <reference name="user"/>
     </component>
     
     <component name="distance" t:title="distance" t:color="red1">
-        <t:implementation.python script="distance.py"/>
+        <t:implementation.python script="nuvem/distance.py"/>
         <service name="distance"/>
         <reference name="location1"/>
         <reference name="location2"/>
     </component>
     
+    <component name="geomap" t:title="map" t:color="red1">
+        <t:implementation.python script="nuvem/geomap.py"/>
+        <service name="geomap"/>
+        <reference name="location"/>
+    </component>
+    
+    <component name="weather" t:title="weather" t:color="red1">
+        <t:implementation.python script="nuvem/weather.py"/>
+        <service name="weather"/>
+        <reference name="location"/>
+    </component>
+    
+    <component name="traffic" t:title="traffic" t:color="red1">
+        <t:implementation.python script="nuvem/traffic.py"/>
+        <service name="traffic"/>
+        <reference name="location"/>
+    </component>
+    
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
index c0d24c2550..3fc3d4f162 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -30,9 +30,6 @@
     <service name="twfriends" promote="twfriends"/>
     <service name="twstatus" promote="twstatus"/>
     <service name="twtimeline" promote="twtimeline"/>
-    <service name="gtalksend" promote="gtalksend"/>
-    <service name="gtalkreceive" promote="gtalkreceive"/>
-    <service name="smssend" promote="smssend"/>
 
     <component name="fbprofile" t:title="facebook profile" t:color="blue1">
         <t:implementation.python script="nuvem/fbprofile.py"/>
@@ -91,26 +88,4 @@
         </reference>
     </component>
     
-    <component name="gtalksend" t:title="send gtalk" t:color="blue1">
-        <t:implementation.python script="nuvem/gtalksend.py"/>
-        <service name="gtalksend"/>
-        <reference name="jid"/>
-        <reference name="to"/>
-        <reference name="msg"/>
-    </component>
-    
-    <component name="gtalkreceive" t:title="when gtalk received" t:color="blue1">
-        <t:implementation.python script="nuvem/gtalkreceive.py"/>
-        <service name="gtalkreceive"/>
-        <reference name="jid"/>
-    </component>
-    
-    <component name="smssend" t:title="send sms" t:color="blue1">
-        <t:implementation.python script="nuvem/smssend.py"/>
-        <service name="smssend"/>
-        <reference name="user"/>
-        <reference name="to"/>
-        <reference name="msg"/>
-    </component>
-    
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
new file mode 100644
index 0000000000..c45262a786
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -0,0 +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 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="call" promote="call"/>
+    <service name="smssend" promote="smssend"/>
+    <service name="gtalksend" promote="gtalksend"/>
+    <service name="gtalkreceive" promote="gtalkreceive"/>
+
+    <component name="call" t:title="place call" t:color="blue1">
+        <t:implementation.python script="nuvem/call.py"/>
+        <service name="call"/>
+        <reference name="to"/>
+    </component>
+    
+    <component name="smssend" t:title="send sms" t:color="blue1">
+        <t:implementation.python script="nuvem/smssend.py"/>
+        <service name="smssend"/>
+        <reference name="user"/>
+        <reference name="to"/>
+        <reference name="msg"/>
+    </component>
+    
+    <component name="gtalksend" t:title="send gtalk" t:color="blue1">
+        <t:implementation.python script="nuvem/gtalksend.py"/>
+        <service name="gtalksend"/>
+        <reference name="jid"/>
+        <reference name="to"/>
+        <reference name="msg"/>
+    </component>
+    
+    <component name="gtalkreceive" t:title="when gtalk received" t:color="blue1">
+        <t:implementation.python script="nuvem/gtalkreceive.py"/>
+        <service name="gtalkreceive"/>
+        <reference name="jid"/>
+    </component>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
new file mode 100644
index 0000000000..24db398347
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
@@ -0,0 +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://transform"
+  name="palette">
+        
+    <service name="foreach" promote="foreach"/>
+    <service name="filter" promote="filter"/>
+    <service name="reduce" promote="reduce"/>
+    <service name="reverse" promote="reverse"/>
+
+    <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="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>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/value/palette.composite
index ab881b45f9..abdb47e460 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/value/palette.composite
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://values"
+  targetNamespace="http://value"
   name="palette">
         
     <service name="text" promote="text"/>