Refactor groups of reusable components and improve layout a bit. Fix bug preventing saving empty composites.

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

8 files changed, 334 insertions, 200 deletions

diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
deleted file mode 100644
index acb1c15755..0000000000
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://control"
-  name="palette">
-        
-    <service name="page" promote="page"/>
-    <service name="every" promote="every"/>
-    <service name="if" promote="if"/>
-    <service name="ifelse" promote="ifelse"/>
-    <service name="foreach" promote="foreach"/>
-
-    <component name="page" t:color="yellow1">
-        <documentation>when page requested</documentation>
-        <t:implementation.python script="page.py"/>
-        <service name="page" t:visible="false"/>
-        <reference name="url"/>
-        <reference name="do" t:align="bottom"/>
-    </component>
-    
-    <component name="every" t:color="yellow1">
-        <documentation>every n seconds</documentation>
-        <t:implementation.python script="every.py"/>
-        <service name="every" t:visible="false"/>
-        <reference name="seconds"/>
-        <reference name="do" t:align="bottom"/>
-    </component>
-    
-    <component name="if" t:color="yellow1">
-        <t:implementation.python script="if_.py"/>
-        <service name="if" t:align="top"/>
-        <reference name="condition"/>
-        <reference name="do" t:align="bottom"/>
-    </component>
-    
-    <component name="ifelse" t:color="yellow1">
-        <documentation>if else</documentation>
-        <t:implementation.python script="ifelse.py"/>
-        <service name="ifelse" t:align="top"/>
-        <reference name="condition"/>
-        <reference name="do" t:align="bottom"/>
-        <reference name="else" t:align="bottom"/>
-    </component>
-    
-    <component name="foreach" t:color="yellow1">
-        <documentation>for each</documentation>
-        <t:implementation.python script="ifelse.py"/>
-        <service name="foreach" t:align="top"/>
-        <reference name="list"/>
-        <reference name="do" t:align="bottom"/>
-    </component>
-    
-</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/events/palette.composite b/sca-cpp/trunk/modules/edit/palettes/events/palette.composite
new file mode 100644
index 0000000000..0e33fa6431
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/events/palette.composite
@@ -0,0 +1,44 @@
+<?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://events"
+  name="palette">
+        
+    <service name="page" promote="page"/>
+    <service name="every" promote="every"/>
+
+    <component name="page" t:color="green1">
+        <documentation>page</documentation>
+        <t:implementation.python script="page.py"/>
+        <service name="page" t:visible="false"/>
+        <property name="property">/mypage.html</property>
+        <reference name="value"/>
+    </component>
+    
+    <component name="every" t:color="green1">
+        <documentation>every</documentation>
+        <t:implementation.python script="every.py"/>
+        <service name="every" t:visible="false"/>
+        <property name="property">60</property>
+        <reference name="value"/>
+    </component>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
new file mode 100644
index 0000000000..dab3d03f64
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
@@ -0,0 +1,77 @@
+<?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="list" promote="list"/>
+    <service name="first" promote="first"/>
+    <service name="rest" promote="rest"/>
+    <service name="foreach" promote="foreach"/>
+    <service name="append" promote="append"/>
+    <service name="reverse" promote="reverse"/>
+
+    <component name="list" t:color="yellow1">
+        <documentation>list</documentation>
+        <t:implementation.python script="list_.py"/>
+        <service name="list"/>
+        <reference name="rest"/>
+        <property name="property">abc</property>
+    </component>
+    
+    <component name="first" t:color="yellow1">
+        <documentation>first</documentation>
+        <t:implementation.python script="first.py"/>
+        <service name="first"/>
+        <reference name="value"/>
+    </component>
+    
+    <component name="rest" t:color="yellow1">
+        <documentation>rest</documentation>
+        <t:implementation.python script="rest.py"/>
+        <service name="rest"/>
+        <reference name="value"/>
+    </component>
+    
+    <component name="foreach" t:color="yellow1">
+        <documentation>foreach</documentation>
+        <t:implementation.python script="ifelse.py"/>
+        <service name="foreach"/>
+        <reference name="list"/>
+        <reference name="apply"/>
+    </component>
+    
+    <component name="reverse" t:color="yellow1">
+        <documentation>reverse</documentation>
+        <t:implementation.python script="reverse.py"/>
+        <service name="reverse"/>
+        <reference name="value"/>
+    </component>
+    
+    <component name="append" t:color="yellow1">
+        <documentation>append</documentation>
+        <t:implementation.python script="list_.py"/>
+        <service name="append"/>
+        <reference name="first"/>
+        <reference name="second"/>
+    </component>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
new file mode 100644
index 0000000000..2f2e542754
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
@@ -0,0 +1,70 @@
+<?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"/>
+
+    <component name="multiply" t:color="green1">
+        <documentation>*</documentation>
+        <t:implementation.python script="multiply.py"/>
+        <service name="multiply">
+            <documentation>*</documentation>
+        </service>
+        <reference name="value1"/>
+        <reference name="value2"/>
+    </component>
+    
+    <component name="divide" t:color="green1">
+        <documentation>/</documentation>
+        <t:implementation.python script="divide.py"/>
+        <service name="divide">
+            <documentation>/</documentation>
+        </service>
+        <reference name="value1"/>
+        <reference name="value2"/>
+    </component>
+    
+    <component name="add" t:color="green1">
+        <documentation>+</documentation>
+        <t:implementation.python script="add.py"/>
+        <service name="add">
+            <documentation>+</documentation>
+        </service>
+        <reference name="value1"/>
+        <reference name="value2"/>
+    </component>
+    
+    <component name="subtract" t:color="green1">
+        <documentation>-</documentation>
+        <t:implementation.python script="subtract.py"/>
+        <service name="subtract">
+            <documentation>-</documentation>
+        </service>
+        <reference name="value1"/>
+        <reference name="value2"/>
+    </component>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite b/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite
index 54fd47768a..aa92f13a26 100644
--- a/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/operators/palette.composite
@@ -22,27 +22,20 @@
   targetNamespace="http://operators"
   name="palette">
         
-    <service name="true" promote="true"/>
-    <service name="false" promote="false"/>
+    <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"/>
-    <service name="multiply" promote="multiply"/>
-    <service name="divide" promote="divide"/>
-    <service name="add" promote="add"/>
-    <service name="subtract" promote="subtract"/>
 
-    <component name="true" t:color="green1">
-        <t:implementation.python script="true_.py"/>
-        <service name="true"/>
-    </component>
-    
-    <component name="false" t:color="green1">
-        <t:implementation.python script="false_.py"/>
-        <service name="false"/>
+    <component name="if" t:color="green1">
+        <t:implementation.python script="if_.py"/>
+        <service name="if"/>
+        <reference name="condition"/>
+        <reference name="then"/>
+        <reference name="else"/>
     </component>
     
     <component name="and" t:color="green1">
@@ -95,44 +88,4 @@
         <reference name="value2"/>
     </component>
     
-    <component name="multiply" t:color="green1">
-        <documentation>*</documentation>
-        <t:implementation.python script="multiply.py"/>
-        <service name="multiply">
-            <documentation>*</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="divide" t:color="green1">
-        <documentation>/</documentation>
-        <t:implementation.python script="divide.py"/>
-        <service name="divide">
-            <documentation>/</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="add" t:color="green1">
-        <documentation>+</documentation>
-        <t:implementation.python script="add.py"/>
-        <service name="add">
-            <documentation>+</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="subtract" t:color="green1">
-        <documentation>-</documentation>
-        <t:implementation.python script="subtract.py"/>
-        <service name="subtract">
-            <documentation>-</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </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 739b878025..09a4646d3d 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -22,60 +22,69 @@
   targetNamespace="http://social"
   name="palette">
         
-    <service name="JSONTwit" promote="JSONTwit"/>
-    <service name="XMLTwit" promote="XMLTwit"/>
-    <service name="RSSTwit" promote="RSSTwit"/>
-    <service name="HTML" promote="HTML"/>
-    <service name="JSONFB" promote="JSONFB"/>
+    <service name="fbprofile" promote="fbprofile"/>
+    <service name="fbalbum" promote="fbalbum"/>
+    <service name="fbfriends" promote="fbfriends"/>
+    <service name="fbgroup" promote="fbgroup"/>
+    <service name="twprofile" promote="twprofile"/>
+    <service name="twfriends" promote="twfriends"/>
+    <service name="twstatus" promote="twstatus"/>
+    <service name="twtimeline" promote="twtimeline"/>
 
-    <component name="JSONTwit" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="jsontwit"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json?screen_name=jsdelfino"/>
-        </reference>
+    <component name="fbprofile" t:color="blue1">
+        <documentation>facebook profile</documentation>
+        <t:implementation.python script="fbprofile.py"/>
+        <service name="fbprofile"/>
+        <reference name="id"/>
     </component>
     
-    <component name="XMLTwit" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="xmltwit"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.xml?screen_name=jsdelfino"/>
-        </reference>
+    <component name="fbalbum" t:color="blue1">
+        <documentation>facebook album</documentation>
+        <t:implementation.python script="fbalbum.py"/>
+        <service name="fbalbum"/>
+        <reference name="id"/>
     </component>
     
-    <component name="RSSTwit" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="rsstwit"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=jsdelfino"/>
-        </reference>
+    <component name="fbfriends" t:color="blue1">
+        <documentation>facebook friends</documentation>
+        <t:implementation.python script="fbfriends.py"/>
+        <service name="fbfriends"/>
+        <reference name="id"/>
     </component>
     
-    <component name="HTML" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="html"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="http://people.apache.org/~jsdelfino/"/>
-        </reference>
+    <component name="fbgroup" t:color="blue1">
+        <documentation>facebook group</documentation>
+        <t:implementation.python script="fbgroup.py"/>
+        <service name="fbgroup"/>
+        <reference name="id"/>
     </component>
     
-    <component name="JSONFB" t:color="blue1">
-        <t:implementation.python script="relay.py"/>
-        <service name="Relay">
-            <t:binding.http uri="jsonfb"/>
-        </service>        
-        <reference name="target">
-            <t:binding.http uri="https://graph.facebook.com/100001053301307"/>
-        </reference>
+    <component name="twprofile" t:color="blue1">
+        <documentation>twitter profile</documentation>
+        <t:implementation.python script="twprofile.py"/>
+        <service name="twprofile"/>
+        <reference name="id"/>
+    </component>
+    
+    <component name="twfriends" t:color="blue1">
+        <documentation>twitter friends</documentation>
+        <t:implementation.python script="twfriends.py"/>
+        <service name="twfriends"/>
+        <reference name="id"/>
+    </component>
+    
+    <component name="twstatus" t:color="blue1">
+        <documentation>twitter status</documentation>
+        <t:implementation.python script="twstatus.py"/>
+        <service name="twstatus"/>
+        <reference name="id"/>
+    </component>
+    
+    <component name="twtimeline" t:color="blue1">
+        <documentation>twitter timeline</documentation>
+        <t:implementation.python script="twtimeline.py"/>
+        <service name="twtimeline"/>
+        <reference name="id"/>
     </component>
     
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite b/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
new file mode 100644
index 0000000000..8325a905e6
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
@@ -0,0 +1,74 @@
+<?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://url"
+  name="palette">
+        
+    <service name="host" promote="host"/>
+    <service name="path" promote="path"/>
+    <service name="params" promote="params"/>
+    <service name="user" promote="user"/>
+    <service name="realm" promote="realm"/>
+    <service name="email" promote="email"/>
+
+    <component name="host" t:color="orange1">
+        <documentation>host</documentation>
+        <t:implementation.python script="host.py"/>
+        <service name="host"/>
+        <property name="host" t:visible="false"></property>
+    </component>
+    
+    <component name="path" t:color="orange1">
+        <documentation>path</documentation>
+        <t:implementation.python script="path.py"/>
+        <service name="path"/>
+        <property name="path" t:visible="false"></property>
+    </component>
+    
+    <component name="params" t:color="orange1">
+        <documentation>?params</documentation>
+        <t:implementation.python script="params.py"/>
+        <service name="params"/>
+        <property name="params" t:visible="false"></property>
+    </component>
+    
+    <component name="user" t:color="orange1">
+        <documentation>user</documentation>
+        <t:implementation.python script="user.py"/>
+        <service name="user"/>
+        <property name="user" t:visible="false"></property>
+    </component>
+    
+    <component name="realm" t:color="orange1">
+        <documentation>realm</documentation>
+        <t:implementation.python script="realm.py"/>
+        <service name="realm"/>
+        <property name="realm" t:visible="false"></property>
+    </component>
+    
+    <component name="email" t:color="orange1">
+        <documentation>email</documentation>
+        <t:implementation.python script="email.py"/>
+        <service name="email"/>
+        <property name="email" t:visible="false"></property>
+    </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 9a9ed0f087..7f8b81b5cb 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
@@ -25,10 +25,8 @@
     <service name="number" promote="number"/>
     <service name="text" promote="text"/>
     <service name="nothing" promote="nothing"/>
-    <service name="list" promote="list"/>
-    <service name="first" promote="first"/>
-    <service name="rest" promote="rest"/>
-    <service name="append" promote="append"/>
+    <service name="true" promote="true"/>
+    <service name="false" promote="false"/>
 
     <component name="number" t:color="orange1">
         <t:implementation.python script="number.py"/>
@@ -47,34 +45,14 @@
         <service name="nothing"/>
     </component>
     
-    <component name="list" t:color="orange1">
-        <documentation>list</documentation>
-        <t:implementation.python script="list_.py"/>
-        <service name="list"/>
-        <reference name="rest"/>
-        <property name="property">abc</property>
-    </component>
-    
-    <component name="first" t:color="orange1">
-        <documentation>first of list</documentation>
-        <t:implementation.python script="first.py"/>
-        <service name="first"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="rest" t:color="orange1">
-        <documentation>rest of list</documentation>
-        <t:implementation.python script="rest.py"/>
-        <service name="rest"/>
-        <reference name="value"/>
+    <component name="true" t:color="orange1">
+        <t:implementation.python script="true_.py"/>
+        <service name="true"/>
     </component>
     
-    <component name="append" t:color="orange1">
-        <documentation>append lists</documentation>
-        <t:implementation.python script="list_.py"/>
-        <service name="append"/>
-        <reference name="first"/>
-        <reference name="second"/>
+    <component name="false" t:color="orange1">
+        <t:implementation.python script="false_.py"/>
+        <service name="false"/>
     </component>
     
 </composite>