Copied: tuscany/sca-cpp/trunk/modules/edit/dashboards/[email protected] (from 
r1086049, tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost)
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/dashboards/jane%40sca-store.com?p2=tuscany/sca-cpp/trunk/modules/edit/dashboards/jane%40sca-store.com&p1=tuscany/sca-cpp/trunk/modules/edit/dashboards/joe%40localhost&r1=1086049&r2=1088507&rev=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost (original)
+++ tuscany/sca-cpp/trunk/modules/edit/dashboards/[email protected] Mon Apr  4 
08:45:59 2011
@@ -1 +1 @@
-((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "An app that shows my social 
profiles") (id "me360")) (entry (title "An app that shows friends near me") (id 
"nearme")) (entry (title "An app that returns somebody's Buzz profile") (id 
"buzzprofile")))
+((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "Test search components") (id 
"testsearch")) (entry (title "Test database components") (id "testdb")) (entry 
(title "An app that shows my social profiles") (id "me360")) (entry (title "An 
app that shows friends near me") (id "nearme")) (entry (title "An app that 
returns somebody's Buzz profile") (id "buzzprofile")))

Modified: tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/dashboards/joe%40localhost?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost (original)
+++ tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost Mon Apr  4 
08:45:59 2011
@@ -1 +1 @@
-((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "An app that shows my social 
profiles") (id "me360")) (entry (title "An app that shows friends near me") (id 
"nearme")) (entry (title "An app that returns somebody's Buzz profile") (id 
"buzzprofile")))
+((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "Test search components") (id 
"testsearch")) (entry (title "Test database components") (id "testdb")) (entry 
(title "An app that shows my social profiles") (id "me360")) (entry (title "An 
app that shows friends near me") (id "nearme")) (entry (title "An app that 
returns somebody's Buzz profile") (id "buzzprofile")))

Modified: tuscany/sca-cpp/trunk/modules/edit/dashboards/[email protected]
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/dashboards/joe%40sca-store.com?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/dashboards/[email protected] (original)
+++ tuscany/sca-cpp/trunk/modules/edit/dashboards/[email protected] Mon Apr  4 
08:45:59 2011
@@ -1 +1 @@
-((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "An app that shows my social 
profiles") (id "me360")) (entry (title "An app that shows friends near me") (id 
"nearme")) (entry (title "An app that returns somebody's Buzz profile") (id 
"buzzprofile")))
+((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "Test search components") (id 
"testsearch")) (entry (title "Test database components") (id "testdb")) (entry 
(title "An app that shows my social profiles") (id "me360")) (entry (title "An 
app that shows friends near me") (id "nearme")) (entry (title "An app that 
returns somebody's Buzz profile") (id "buzzprofile")))

Modified: tuscany/sca-cpp/trunk/modules/edit/edit.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/edit.composite?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/edit.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/edit.composite Mon Apr  4 08:45:59 2011
@@ -172,6 +172,26 @@
         </service>
     </component>
 
+    <component name="AppDataFileCache">
+        <implementation.cpp path="../../components/cache" 
library="libdatacache"/>
+        <service name="AppDataFileCache">
+            <t:binding.http uri="appdatafilecache"/>
+        </service>
+        <reference name="l1reader" target="Memcache"/>
+        <reference name="l1writer" target="Memcache"/>
+        <reference name="l2reader" target="AppDataFileDB"/>
+        <reference name="l2writer" target="AppDataFileDB"/>
+    </component>
+
+    <component name="AppDataFileDB">
+        <implementation.cpp path="../../components/filedb" 
library="libfiledb"/>
+        <property name="dbname">tmp/appdata/filedb</property>
+        <property name="format">scheme</property>
+        <service name="AppDataFileDB">
+            <t:binding.http uri="appdatafiledb"/>
+        </service>
+    </component>
+
     <component name="Memcache">
         <implementation.cpp path="../../components/cache" 
library="libmemcache"/>
         <service name="Memcache">

Added: tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite?rev=1088507&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite 
(added)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite Mon 
Apr  4 08:45:59 2011
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1";
+  targetNamespace="http://database";
+  name="palette">
+        
+    <service name="filedb" promote="filedb"/>
+    <service name="nosqldb" promote="nosqldb"/>
+    <service name="sqldb" promote="sqldb"/>
+    <service name="get" promote="get"/>
+    <service name="post" promote="post"/>
+    <service name="put" promote="put"/>
+    <service name="delete" promote="delete"/>
+
+    <component name="filedb" t:title="File database" t:color="green1">
+        <t:implementation.python script="nuvem/filedb.py"/>
+        <service name="filedb"/>
+        <reference name="db" target="AppDataFileCache" t:visible="false"/>
+        <property name="host" t:visible="false"/>
+    </component>
+    
+    <component name="nosqldb" t:title="Indexed database" t:color="green1">
+        <t:implementation.python script="nuvem/nosqldb.py"/>
+        <service name="nosqldb"/>
+        <reference name="db" target="AppDataNoSQLCache" t:visible="false"/>
+        <property name="host" t:visible="false"/>
+    </component>
+    
+    <component name="sqldb" t:title="SQL database" t:color="green1">
+        <t:implementation.python script="nuvem/sqldb.py"/>
+        <service name="sqldb"/>
+        <reference name="db" target="AppDataSQLCache" t:visible="false"/>
+        <property name="host" t:visible="false"/>
+    </component>
+    
+    <component name="get" t:title="get" t:color="green1">
+        <t:implementation.python script="nuvem/get.py"/>
+        <service name="get"/>
+        <reference name="collection"/>
+        <reference name="id"/>
+    </component>
+    
+    <component name="post" t:title="post" t:color="green1">
+        <t:implementation.python script="nuvem/post.py"/>
+        <service name="post"/>
+        <reference name="collection"/>
+        <reference name="id"/>
+        <reference name="value"/>
+    </component>
+    
+    <component name="put" t:title="put" t:color="green1">
+        <t:implementation.python script="nuvem/put.py"/>
+        <service name="put"/>
+        <reference name="collection"/>
+        <reference name="id"/>
+        <reference name="value"/>
+    </component>
+    
+    <component name="delete" t:title="delete" t:color="green1">
+        <t:implementation.python script="nuvem/delete.py"/>
+        <service name="delete"/>
+        <reference name="collection"/>
+        <reference name="id"/>
+    </component>
+    
+</composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/event/palette.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/event/palette.composite?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/event/palette.composite 
(original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/event/palette.composite Mon Apr 
 4 08:45:59 2011
@@ -23,7 +23,7 @@
   name="palette">
         
     <service name="page" promote="page"/>
-    <service name="button" promote="button"/>
+    <service name="widget" promote="widget"/>
     <service name="every" promote="every"/>
     <service name="location" promote="location"/>
 
@@ -35,9 +35,9 @@
         <reference name="content"/>
     </component>
     
-    <component name="button" t:title="on {compname} click" t:color="green1">
-        <t:implementation.python script="nuvem/button.py"/>
-        <service name="button" t:visible="false"/>
+    <component name="widget" t:title="on {compname} widget" t:color="green1">
+        <t:implementation.python script="nuvem/widget.py"/>
+        <service name="widget" t:visible="false"/>
         <reference name="content"/>
     </component>
     

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite 
(original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite Mon Apr  
4 08:45:59 2011
@@ -25,6 +25,7 @@
     <service name="host" promote="host"/>
     <service name="path" promote="path"/>
     <service name="params" promote="params"/>
+    <service name="param" promote="param"/>
     <service name="user" promote="user"/>
     <service name="email" promote="email"/>
     <service name="get" promote="get"/>
@@ -50,6 +51,13 @@
         <property name="query" t:visible="false"></property>
     </component>
     
+    <component name="param" t:title="?param" t:color="green1">
+        <t:implementation.python script="nuvem/param.py"/>
+        <service name="param"/>
+        <reference name="name"/>
+        <property name="query" t:visible="false"></property>
+    </component>
+    
     <component name="user" t:title="user" t:color="green1">
         <t:implementation.python script="nuvem/user.py"/>
         <service name="user"/>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/list/palette.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/list/palette.composite?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/list/palette.composite 
(original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/list/palette.composite Mon Apr  
4 08:45:59 2011
@@ -22,6 +22,7 @@
   targetNamespace="http://list";
   name="palette">
         
+    <service name="pair" promote="pair"/>
     <service name="list" promote="list"/>
     <service name="first" promote="first"/>
     <service name="rest" promote="rest"/>
@@ -31,7 +32,14 @@
     <service name="find" promote="find"/>
     <service name="range" promote="range"/>
 
-    <component name="list" t:title="make list" t:color="yellow1">
+    <component name="pair" t:title="pair" t:color="yellow1">
+        <t:implementation.python script="nuvem/pair.py"/>
+        <service name="pair"/>
+        <reference name="name"/>
+        <reference name="value"/>
+    </component>
+    
+    <component name="list" t:title="list" t:color="yellow1">
         <t:implementation.python script="nuvem/list_.py"/>
         <service name="list"/>
         <reference name="item" t:clonable="true"/>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite 
(original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite Mon 
Apr  4 08:45:59 2011
@@ -25,14 +25,17 @@
     <service name="googlesearch" promote="googlesearch"/>
     <service name="yahoosearch" promote="yahoosearch"/>
     <service name="bingsearch" promote="bingsearch"/>
-    <service name="geomap" promote="geomap"/>
+    <service name="googlemap" promote="googlemap"/>
     <service name="weather" promote="weather"/>
     <service name="traffic" promote="traffic"/>
 
-    <component name="googlesearch" t:title="google search **" t:color="red1">
-        <t:implementation.python script="nuvem/googlesearch.py"/>
+    <component name="googlesearch" t:title="google search" t:color="red1">
+        <t:implementation.python script="nuvem/gsearch.py"/>
         <service name="googlesearch"/>
         <reference name="query"/>
+        <reference name="s" t:visible="false">
+            <t:binding.http 
uri="http://ajax.googleapis.com/ajax/services/search/web"/>
+        </reference>
     </component>
     
     <component name="yahoosearch" t:title="yahoo search **" t:color="red1">
@@ -47,16 +50,22 @@
         <reference name="query"/>
     </component>
     
-    <component name="geomap" t:title="map **" t:color="red1">
-        <t:implementation.python script="nuvem/geomap.py"/>
-        <service name="geomap"/>
-        <reference name="location"/>
+    <component name="googlemap" t:title="google map" t:color="red1">
+        <t:implementation.python script="nuvem/gmap.py"/>
+        <service name="googlemap"/>
+        <reference name="locations"/>
+        <reference name="s" t:visible="false">
+            <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+        </reference>
     </component>
     
-    <component name="weather" t:title="weather **" t:color="red1">
-        <t:implementation.python script="nuvem/weather.py"/>
+    <component name="weather" t:title="weather" t:color="red1">
+        <t:implementation.python script="nuvem/gweather.py"/>
         <service name="weather"/>
-        <reference name="location"/>
+        <reference name="zip"/>
+        <reference name="ws" t:visible="false">
+            <t:binding.http uri="http://www.google.com/ig/api"/>
+        </reference>
     </component>
     
     <component name="traffic" t:title="traffic **" t:color="red1">

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/value/palette.composite
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/value/palette.composite?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/value/palette.composite 
(original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/value/palette.composite Mon Apr 
 4 08:45:59 2011
@@ -26,10 +26,10 @@
     <service name="number" promote="number"/>
     <service name="name" promote="name"/>
     <service name="valueof" promote="valueof"/>
-    <service name="assoc" promote="assoc"/>
     <service name="nothing" promote="nothing"/>
     <service name="true" promote="true"/>
     <service name="false" promote="false"/>
+    <service name="now" promote="now"/>
 
     <component name="text" t:title="text" t:color="orange1">
         <t:implementation.python script="nuvem/text.py"/>
@@ -55,13 +55,6 @@
         <property name="name">name</property>
     </component>
     
-    <component name="assoc" t:title="assoc" t:color="orange1">
-        <t:implementation.python script="nuvem/assoc.py"/>
-        <service name="assoc"/>
-        <reference name="name"/>
-        <reference name="value"/>
-    </component>
-    
     <component name="nothing" t:title="nothing" t:color="orange1">
         <t:implementation.python script="nuvem/nothing.py"/>
         <service name="nothing"/>
@@ -77,4 +70,9 @@
         <service name="false"/>
     </component>
     
+    <component name="now" t:title="now" t:color="orange1">
+        <t:implementation.python script="nuvem/now.py"/>
+        <service name="now"/>
+    </component>
+    
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/store/tests
URL: 
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/store/tests?rev=1088507&r1=1088506&r2=1088507&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/store/tests (original)
+++ tuscany/sca-cpp/trunk/modules/edit/store/tests Mon Apr  4 08:45:59 2011
@@ -1 +1 @@
-((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")))
+((entry (title "An empty test app") (id "test")) (entry (title "Test values 
and lists") (id "testvalues")) (entry (title "Test social components") (id 
"testsocial")) (entry (title "Test URL components") (id "testurl")) (entry 
(title "Test logic components") (id "testlogic")) (entry (title "Test text 
processing components") (id "testtext")) (entry (title "Test HTTP components") 
(id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry 
(title "Test more widgets") (id "testwidgets2")) (entry (title "Test event 
components") (id "testevents")) (entry (title "Test search components") (id 
"testsearch")) (entry (title "Test database components") (id "testdb")))


Reply via email to