From 7df272063ba2167d797bda383680bfcf648418f8 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Sun, 17 Apr 2011 22:13:58 +0000 Subject: Add a few sample and test apps. Refactor some of the utility components and adjusted apps to use them. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1094208 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/edit/apps/buzzprofile/app.composite | 8 +- .../trunk/modules/edit/apps/buzzprofile/app.html | 24 + .../trunk/modules/edit/apps/me360/app.composite | 147 +++-- sca-cpp/trunk/modules/edit/apps/me360/app.html | 51 +- .../trunk/modules/edit/apps/nearme/app.composite | 653 ++++++++++----------- sca-cpp/trunk/modules/edit/apps/nearme/app.html | 47 +- .../modules/edit/apps/ourphotos/app.composite | 138 +++++ sca-cpp/trunk/modules/edit/apps/ourphotos/app.html | 36 ++ .../modules/edit/apps/shoppingcart/app.composite | 577 ++++++++++++++++++ .../trunk/modules/edit/apps/shoppingcart/app.html | 72 +++ .../trunk/modules/edit/apps/slice/app.composite | 40 ++ sca-cpp/trunk/modules/edit/apps/test/app.composite | 41 +- .../trunk/modules/edit/apps/testdb/app.composite | 28 +- sca-cpp/trunk/modules/edit/apps/testdb/app.html | 24 + .../modules/edit/apps/testevents/app.composite | 259 ++++---- .../trunk/modules/edit/apps/testevents/app.html | 39 +- .../trunk/modules/edit/apps/testhttp/app.composite | 67 ++- sca-cpp/trunk/modules/edit/apps/testhttp/app.html | 10 +- .../modules/edit/apps/testlogic/app.composite | 61 +- sca-cpp/trunk/modules/edit/apps/testlogic/app.html | 6 +- .../modules/edit/apps/testsearch/app.composite | 169 +++--- .../trunk/modules/edit/apps/testsearch/app.html | 24 + .../modules/edit/apps/testsocial/app.composite | 170 ++++-- .../trunk/modules/edit/apps/testsocial/app.html | 38 +- .../trunk/modules/edit/apps/testtext/app.composite | 110 ++-- sca-cpp/trunk/modules/edit/apps/testtext/app.html | 6 +- .../trunk/modules/edit/apps/testurl/app.composite | 77 ++- sca-cpp/trunk/modules/edit/apps/testurl/app.html | 6 +- .../modules/edit/apps/testvalues/app.composite | 413 +++++++++---- .../trunk/modules/edit/apps/testvalues/app.html | 7 +- .../modules/edit/apps/testwidgets/app.composite | 235 +++----- .../trunk/modules/edit/apps/testwidgets/app.html | 22 +- .../modules/edit/apps/testwidgets2/app.composite | 193 +++--- .../trunk/modules/edit/apps/testwidgets2/app.html | 55 +- .../trunk/modules/edit/dashboards/jane@localhost | 2 +- .../modules/edit/dashboards/jane@sca-store.com | 2 +- .../trunk/modules/edit/dashboards/joe@localhost | 2 +- .../modules/edit/dashboards/joe@sca-store.com | 2 +- .../edit/palettes/control/palette.composite | 78 +++ .../edit/palettes/database/palette.composite | 14 +- .../modules/edit/palettes/event/palette.composite | 61 -- .../modules/edit/palettes/http/palette.composite | 18 +- .../modules/edit/palettes/list/palette.composite | 93 --- .../modules/edit/palettes/lists/palette.composite | 137 +++++ .../modules/edit/palettes/math/palette.composite | 57 +- .../modules/edit/palettes/python/palette.composite | 4 +- .../modules/edit/palettes/search/palette.composite | 26 +- .../modules/edit/palettes/social/palette.composite | 30 + .../modules/edit/palettes/talk/palette.composite | 37 +- .../modules/edit/palettes/text/palette.composite | 4 +- .../edit/palettes/transform/palette.composite | 8 + .../modules/edit/palettes/value/palette.composite | 78 --- .../modules/edit/palettes/values/palette.composite | 87 +++ sca-cpp/trunk/modules/edit/store/featured | 2 +- sca-cpp/trunk/modules/edit/store/myapps | 1 + sca-cpp/trunk/modules/edit/store/new | 2 +- sca-cpp/trunk/modules/edit/store/services | 1 - sca-cpp/trunk/modules/edit/store/top | 2 +- 58 files changed, 2955 insertions(+), 1646 deletions(-) create mode 100644 sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/ourphotos/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/slice/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testdb/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testsearch/app.html create mode 100644 sca-cpp/trunk/modules/edit/palettes/control/palette.composite delete mode 100644 sca-cpp/trunk/modules/edit/palettes/event/palette.composite delete mode 100644 sca-cpp/trunk/modules/edit/palettes/list/palette.composite create mode 100644 sca-cpp/trunk/modules/edit/palettes/lists/palette.composite delete mode 100644 sca-cpp/trunk/modules/edit/palettes/value/palette.composite create mode 100644 sca-cpp/trunk/modules/edit/palettes/values/palette.composite create mode 100644 sca-cpp/trunk/modules/edit/store/myapps delete mode 100644 sca-cpp/trunk/modules/edit/store/services (limited to 'sca-cpp') diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite index 4a3902e47e..46ada96983 100644 --- a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite @@ -19,13 +19,13 @@ --> - + - + @@ -41,12 +41,12 @@ - + https://buzzprofile.sca-store.com:8453/components/profile/jsdelfino - + https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html new file mode 100644 index 0000000000..e0b04fe70a --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html @@ -0,0 +1,24 @@ + + +
+ +

Test buzzprofile component

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite index 6188773f22..fb03b89d3c 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite @@ -18,20 +18,9 @@ * under the License. --> - - - - 100001053301307 - - - - - - - @@ -40,30 +29,15 @@ - - - - - - - - - - - - fbprofile - - - - - me360 - - - - - twitprofile + + + + + + + - + @@ -71,64 +45,89 @@ - - - - - - - - - + - buzzprofile - - - - - - + buzz - + - - + + + - - - - - + + + + + + + - - - - - + + + + - - - - - - + + + + + - + - jsdelfino + https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json + + + + + + + + + + + + + + + - + - https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json + 100001053301307 + + + + + + fbprofile - + jsdelfino + + + + jsdelfino + + + + + + twitprofile + + + + + + buzzprofile + diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.html b/sca-cpp/trunk/modules/edit/apps/me360/app.html index ebc98e5072..31ed5e58bd 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/app.html +++ b/sca-cpp/trunk/modules/edit/apps/me360/app.html @@ -18,41 +18,58 @@ * under the License. -->
- + +

Me360

+ + Facebook - - + + Twitter + + +
- - + + - - + +
namevaluetable...
namevalue......
- - + +
- - + + - - + +
namevaluetable...
namevalue......
- - Twitter + + Buzz - -

Me360

+ + + + + + + + + + + + +
table...
......
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite index 74af00ee41..d81de55232 100644 --- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite @@ -18,468 +18,427 @@ * under the License. --> - - - - - - - - - + - + - - - - - + + + + - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - longitude + + + + + - - - - latitude + + + + + - - - - friend2 + + + + /components/map - - - - friend3 + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - me + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + - + - + latitude - - - - green - - - - - - - - - - - - - - - - + - + friend2 - + - + friend3 - + - + friend1 - - - - - - - - - - - - - - - + + + + + x - - - - - + + + + + 1 - - - - - + + + + + 2 - - - - friend1 + + + + + 3 - - - - - - - - + + + + + - + - - - - mapimg + + + + + - - - - - + + + + + - - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + friend1 - + - + friend2 - - - - - - - - - - - - - + - + friend3 - - - - - + + + + green - - - - - + + + + + + + + - - - - friend1 + + + + + time2 + + + + + + time1 + + + + + + mapimg - - - - friend2 + + + + + mytime + + + + + + me + + + + + + time3 - + - friend3 + getlocs - - - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + - - - - myloc + + + + + - - - - friend1loc + + + + + + - - - - friend2loc + + + + + + + - - - - friend3loc + + + + + + + + - - - - 1 + + + + + - + - 2 + nearme - + - 3 + getlocs - + - X + nearme - - - - - - - + + + + + + + - - - - + + + + + - - - - - + + + + 5000 - - - - + + + + + - - - - - + + + + + + + + - - - - - + + + + - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + + - - - - /components/map?friend1={friend1}&friend2={friend2}&friend3={friend3} + + + + longitude + - - - - - + + + + - - - - 5000 + + + + %a %b %d, %I:%M %p diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/app.html index 32dd393d69..364a46a1c8 100644 --- a/sca-cpp/trunk/modules/edit/apps/nearme/app.html +++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.html @@ -18,46 +18,37 @@ * under the License. -->
- - - - +

Nearme

 - - - - - last seen... + +

me

 - - Friend 3: + + - - + + - - Friend 2: + + - + last seen... - - - - - Friend 1: - - + last seen... - - Last seen: + + last seen... - + updating... - - me + + + + + My friends
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite new file mode 100644 index 0000000000..2031da70f5 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite @@ -0,0 +1,138 @@ + + + + + + + 61049883@N06 + + + + + jsdelfino + + + + + + + + + + + image + + + + + image + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + images + + + + + + + + + + + + + <img src="{0}" width="320"/> + + + + + src + + + + + + + + + + + + + m + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html new file mode 100644 index 0000000000..5b2645db8b --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html @@ -0,0 +1,36 @@ + + +
+ +

Our Photos

+ + + + + + + + + + + +
list
...
+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite new file mode 100644 index 0000000000..8cec2914ba --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite @@ -0,0 +1,577 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + getcart + + + + + + + + + + + + message + + + + + + message + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + total + + + + + 2.99 + + + + + + Mango + + + + + + Passion + + + + + 3.55 + + + + + 1.55 + + + + + + + + + + + + + + + + + catalog + + + + + + + + + + + fruit + + + + + + + + + + + cataloghtml + + + + + fruit + + + + + + + + + + + fruit + + + + + fruit + + + + + getcart + + + + + + + + + + + + + + + + + + carthtml + + + + + emptyCart + + + + + Your order has been processed. Your total: ${1} + + + + + sum + + + + + getcart + + + + + ${1} - {0} + + + + + + + + + + + + + + + + + + + + + + total + + + + + carthtml + + + + + + cart + + + + + + + + + + + + + + + + + + + putresult + + + + + + Kiwi + + + + + + delresult + + + + + price + + + + + + total + + + + + + + + + + + + + + + + + + + + + + + order + + + + + + + + + + + carthtml + + + + + + + + + + + total + + + + + order + + + + + + + + + + + <span id="fruit" class="checkbox"><input type="checkbox" value="{0}"/>${1} - {0}</span> + + + + + catalog + + + + + + catalog + + + + + fruit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + total + + + + + + + + + + + + + + + + + + + Welcome to my online store + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + xmppsca.2@gmail.com + + + + + + + + + + + + + + + + + + + + + + sendresult + + + + + + + + + + + + + + + + + + + xmppsca.1@gmail.com + + + + + xmpp4sca + + diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html new file mode 100644 index 0000000000..4a7bc1557b --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html @@ -0,0 +1,72 @@ + + +
+ + Welcome + + + Your Cart: + + + Catalog + + + + + + + + + + + +
list
...
+ + + + + + + + + + + +
list
...
+ + +

Shopping Cart

+ + + + + + + + + + + + $ + + + 0 + +
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.composite b/sca-cpp/trunk/modules/edit/apps/slice/app.composite new file mode 100644 index 0000000000..009b31b3b6 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite @@ -0,0 +1,40 @@ + + + + + + + 0 + + + + + + slice + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite index 7b5df3c630..37abe589ad 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite @@ -18,27 +18,28 @@ * under the License. --> - - - - - - - - + + + + + Hello World - - - - - - + + + + + + + + - - - - - - + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite index 48530ae93f..1a764eb20e 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite @@ -18,12 +18,7 @@ * under the License. --> - - - - testkey - - + testkey @@ -34,19 +29,19 @@ - + testvalue - + - + @@ -60,26 +55,26 @@ - + - + - + - + @@ -91,7 +86,12 @@ - + + + + testkey + + testkey diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/app.html new file mode 100644 index 0000000000..734ec8f687 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.html @@ -0,0 +1,24 @@ + + +
+ +

Test db components

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite index bbf0a52851..04c6eea787 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite @@ -18,177 +18,154 @@ * under the License. --> - - - - - - - - - - - - - - - - - - - - - + - page opened - - - - - status + cancel button clicked - - - - status + + + + timer fired - - - - - - - - - - - + + + + page opens - - - + + + + status - - - - - + + + + ok button clicked - - - + + + + testtext - - - - data + + + + - - - - - - + + + + testfield + - - - - - + + + + + + + + - - - - - + + + + 3000 - - - - ok button clicked + + + + + status - - - - cancel button clicked + + + + + location - - - - - + + + + + - + - - - - - + + + + + status - - - - data + + + + + + + - - - - + + + + + + - - - - - + + + + + - + + + + + + + + + + + status + + - timer fired + abc - - - - 3000 + + + + + - - - - - + + + + + - - - - - - - - - - - - - data + + + + xyz - - - - status + + + + + + - + - testfield - - - - - - + compxyz diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/app.html index 2ad817bec9..94ffd7a609 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.html @@ -18,37 +18,40 @@ * under the License. -->
- - + + - - Status: + + - - Field value: + + Latitude: - + text - + text - + Longitude: - - Latitude: + + Field value: - - + + text - - + + Status: - + text - - text + + + + +

Test events
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite index 983e814513..d403fcb32a 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite @@ -19,69 +19,112 @@ --> - + - + - + - + http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&lat=38.99&lon=-77.01&listLatLon=&lat1=&lon1=&lat2=&lon2=&resolutionSub=&listLat1=&listLon1=&listLat2=&listLon2=&resolutionList=&endPoint1Lat=&endPoint1Lon=&endPoint2Lat=&endPoint2Lon=&listEndPoint1Lat=&listEndPoint1Lon=&listEndPoint2Lat=&listEndPoint2Lon=&zipCodeList=&listZipCodeList=&centerPointLat=&centerPointLon=&distanceLat=&distanceLon=&resolutionSquare=&listCenterPointLat=&listCenterPointLon=&listDistanceLat=&listDistanceLon=&listResolutionSquare=&citiesLevel=&listCitiesLevel=&sector=&gmlListLatLon=&featureType=&requestedTime=&startTime=&endTime=&compType=&propertyName=&product=time-series&begin=2004-01-01T00%3A00%3A00&end=2015-03-10T00%3A00%3A00&maxt=maxt&Submit=Submit - + http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&destination=Concord,MA&waypoints=Charlestown,MA|Lexington,MA&sensor=false - + - + http://feedproxy.google.com/TechCrunch - + http://www.google.com - + - + cnn.com - + - + https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=t:60,40&chl=Hello|World + + + + + + + + + + + + + + + + + + + + + cnn.com + + + + + + + + + + + + + + + (CNN) + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html index 544287aa6d..2faf6fa886 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html @@ -18,14 +18,10 @@ * under the License. -->
- - - - frame ... - - + +

Test HTTP components

 - + frame ... diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite index f8b354f3e1..a5ab623b3c 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite @@ -19,7 +19,7 @@ --> - + @@ -32,92 +32,119 @@ - + 5 - + greater than 5 - + not greater than 5 - + 3 - + - + - + 5 - + - + 5 - + - + - + 3.14116 * 5 * 5 - + 3.14116 * ref.get(r) * ref.get(r) - + 5 - + val = 3.14116 * ref.get(r) * ref.get(r) - + http://people.apache.org/~jsdelfino/tuscany/test/surface.py + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + 0.5 + diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html index 5c7c7219bb..c2dc3a21c2 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html @@ -17,4 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -
+
+ +

Test logic components

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite index 3170a1a726..dc6a42753c 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite @@ -19,7 +19,7 @@ --> - + @@ -27,13 +27,8 @@ - - - - apache+tuscany - - + @@ -41,13 +36,13 @@ - + 94070 - + @@ -55,24 +50,24 @@ - + 94070 - + - + http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&zoom=14&size=512x512&maptype=roadmap%20&markers=color:blue|label:S|40.702147,-74.015794&markers=color:green|label:G|40.711614,-74.012318%20&markers=color:red|color:red|label:C|40.718217,-73.998284&sensor=false - + @@ -81,7 +76,7 @@ - + @@ -89,105 +84,123 @@ - - - - - - - - - - A + + + + -122.260526 - - - - - + + + + green - - - - B + + + + green - + - -122.260526 + 37.507156 + + + + + + + + + + + + A + + + + + + + + - + + + + + A + + - - - - yellow + + + + + B - + - + - green + yellow - + - San+Francisco,+CA + San Francisco, CA - + - San+Carlos,+CA + San Carlos, CA - + - - + + - - - - A + + + + + + + + - + - green + apache tuscany - - - - - - - - - - - - - + + + + apache tuscany - - - - 37.507156 + + + + apache tuscany - - - - - + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/app.html new file mode 100644 index 0000000000..3760a04794 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.html @@ -0,0 +1,24 @@ + + +
+ +

Test search components

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite index 4da0708d11..26642deccb 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite @@ -18,33 +18,7 @@ * under the License. --> - - - - - - - - - - - - - - - - - - twprofile - - - - - - - - - + @@ -52,13 +26,7 @@ - - - - jsdelfino - - - + @@ -66,8 +34,7 @@ - - + @@ -75,27 +42,27 @@ - - - - me360 - - + 100001053301307 - + jsdelfino - + jsdelfino - + + + + jsdelfino + + @@ -103,35 +70,110 @@ - + + + + + + + + + jsdelfino - - - - + + + + + + + + + + + + name - + + + + + twitprofile + + + + + + twittimeline + + + + + + twitfriends + + + + + + twitfollowers + + - - + + + + + - - - - fbprofile + + + + xmppsca.2@gmail.com - - - - - - - + + + + Hello, the time is {0} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + xmppsca.1@gmail.com + + + + + xmpp4sca diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html index bd02e095b0..9630d36d0f 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html @@ -18,41 +18,7 @@ * under the License. -->
- - - - - - - - - - - - -
namevalue
namevalue
- - -

My social profiles

- - - Facebook profile - - - - - - - - - - - - - -
namevalue
namevalue
- - - Twitter profile + +

Test social components
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite index 9a9b41a939..56cde3999c 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite @@ -26,21 +26,21 @@ - + - + - + @@ -48,63 +48,63 @@ - + - + - + abc - + ABC - + abcxdefxghi - + x - + y - + abcdef - + cd - + x - + x - + abcxdefxghi @@ -116,31 +116,31 @@ - + abc - + def - + - + - + The {0} brown {1} @@ -152,17 +152,17 @@ - + quick - + fox - + The {a} brown {b} @@ -170,57 +170,47 @@ - - + + - - - - - - - - - - - - - - - - a - - - - - b - - - - - quick - - - - - fox - - + - + city San Francisco state CA - + city (.*) state (.*) + + + + + a + + + + + quick + + + + + + b + + + + + fox + diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/app.html index 5c7c7219bb..99f719ef40 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.html @@ -17,4 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -
+
+ +

Test text processing components

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite index e1998e1f46..6cda648ac1 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite @@ -19,39 +19,104 @@ --> - + - + - + - + - + - + + + + + + + + + + + + http://sca-store.com/ + + + + + + + + + + + + + + + test + + + + + path + + + + + + parmx + + + + + + parmy + + + + + + parmn + + + + + 123 + + + + + yy + + + + + xx + diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/app.html index 5c7c7219bb..9641f58ba5 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.html @@ -17,4 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -
+
+ +

Test url components

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite index 953363a750..8de688216a 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite @@ -19,157 +19,104 @@ --> - + abc - + - + - - - - + + + + - + - + d - - - - a - - - - - abc - - - - - d - - - - - def - - + 0 - + 10 - + - + - + - + - + 3 - + nb - - - - - - - - - - - - - sum - - - - - i - - - - - + - - - - - - - - - - - + 0 - + 10 - + 2 - + sum - + i @@ -182,7 +129,7 @@ - + nb @@ -194,80 +141,312 @@ - + 123 - + 456 - + - - - - - - - - + 12 - + 34 - - - - + + + + + + + + + + + + + + + + + + + + + + + a.b + + + + + + + + + + + + a + + + + + abc - - - - + + + + d + + + + + def + + + + + + ccc + + + + + ccc + + + + + + b + + + + + bbb + + + + + CCC + + + + + 123 + + + + + BBB + + + + + + b + + + + + + c + + + + + + c + + + + + + a - + - - + + - - - - + + + + + + - - - - - - - + + + + + + + + + + + + x + + + + + + + + + + + + + + + + + + + hello + + + + + + entry + + + + + + + + + + + + + - + + + + abc + + + + + + entry + + + + + + test + + + + + + + + + + + 0 + + + + + 10 + + + + + + + + xyz - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + i + + + + + + + + + + + + + + + + + + + + 0 + + + + + sum + + + + + + a diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html index 0c832411d7..9ac6e55434 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html @@ -18,7 +18,10 @@ * under the License. -->
- -

Header2

+ + text + + +

Test values and lists
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite index 479cfa67e4..27e93dc15f 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite @@ -18,192 +18,131 @@ * under the License. --> - - - - - - - - - - - - - - - - - - testh1 + + + + + testpath2 - + - test header 1 + test path - - - - testentry + + + + + testpath1 - - - - test entry field + + + + + testimg - + - test checkbox + http://tuscany.apache.org/images/TuscanyLogo.jpg - - - - testbutton + + + + + testtext - + - test button + test text - - - + + + + testlink - - - - testimg + + + + http://tuscany.apache.org - + + + + + testcheckbox + + - http://tuscany.apache.org/images/TuscanyLogo.jpg + test checkbox - - - - + + + + testentry - - - - - + + + + test entry field - - - - + + + + testbutton - - - - - + + + + test button - - - + + + + testsection - + test section - - - - testcheckbox - - - - - test - - - - - - - - - - - - - - - - - testtext + + + + + testh1 - + - test text - - - - - - - - - - - - + test header 1 - + - - - - - - - - - + + + + + + + + + - - - - http://tuscany.apache.org - - - - - testpath1 - - - - - - - - - - - testpath2 - - - - - test path - - - - - - + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html index ee20dcef38..ce561f3a98 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html @@ -18,15 +18,9 @@ * under the License. -->
- -

Header1

- - - - section @@ -42,20 +36,26 @@ link - + + text + + +

Header1

+ + Apache - + http://www.apache.org/ - + - - text + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite index 133b214b92..1fc61a4f22 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite @@ -18,148 +18,113 @@ * under the License. --> - + - test value - - - - - testlist1 + http://www.apache.org/ - - - - - - - + + + + Apache - - - - - + + + + http://www.cnn.com - - - - testlist2 + + + + + testframe - + - - + + - - - - - - - - - - a - - - - - 1 - - - - - - - - - - - 2 - - - - - - - - - - - b - - - - - - - - - - + + + + + testlink - - - - + + + - - - - testhtml - + <b>test bold text</b> - - - - - - - - - - testlink + + + + + testlist1 - + - http://www.apache.org/ + test value - + + + + + testlist2 + + - - + + - - - - Apache + + + + + a - - - - - + + + + 1 - - - - testframe + + + + 2 - - - - http://www.cnn.com + + + + + b + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html index 4e246df55e..b20cf24c02 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html @@ -18,66 +18,69 @@ * under the License. -->
- - + +

Test widget components

+ + +
- - + + - - + +
namevaluetable...
namevalue......
- - - - - + +
- - + + - - + +
namevaluetable...
namevalue......
- - + +
- - + + - - + +
namevaluetable...
namevalue......
- + text - + link - + frame ... + + +
diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost b/sca-cpp/trunk/modules/edit/dashboards/jane@localhost index f78bc0b38e..402b4260e4 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost +++ b/sca-cpp/trunk/modules/edit/dashboards/jane@localhost @@ -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 "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"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (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"))) diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com b/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com index f78bc0b38e..402b4260e4 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com +++ b/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com @@ -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 "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"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (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"))) diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost index f78bc0b38e..402b4260e4 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost +++ b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost @@ -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 "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"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (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"))) diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com b/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com index f78bc0b38e..402b4260e4 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com +++ b/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com @@ -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 "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"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (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"))) diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite new file mode 100644 index 0000000000..fbc27c0bfe --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite index 2b37912ed4..f9dab736f8 100644 --- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite @@ -30,35 +30,35 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite deleted file mode 100644 index 51675139aa..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite index fc6ba48a55..317cf338ed 100644 --- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite @@ -28,6 +28,7 @@ + @@ -54,7 +55,7 @@ - + x @@ -70,27 +71,34 @@ - + + + + + + + + - + - + - + diff --git a/sca-cpp/trunk/modules/edit/palettes/list/palette.composite b/sca-cpp/trunk/modules/edit/palettes/list/palette.composite deleted file mode 100644 index 36cde72a17..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/list/palette.composite +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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..2272a107c7 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite index d3c99d74c4..f835d8df03 100644 --- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite @@ -27,8 +27,15 @@ + + + + + + + - + * @@ -37,7 +44,7 @@ - + / @@ -46,7 +53,7 @@ - + + @@ -55,7 +62,7 @@ - + - @@ -71,4 +78,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite index d6b8ebcaaf..2cabac1a26 100644 --- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite @@ -25,14 +25,14 @@ - + - + diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite index d6e4a0fa1e..04cc674962 100644 --- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite @@ -26,10 +26,11 @@ + - + @@ -38,16 +39,22 @@ - - + + + + + - - + + + + + @@ -59,6 +66,15 @@ + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite index fdd174afb0..fea8fba4e1 100644 --- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite @@ -30,6 +30,9 @@ + + + @@ -103,4 +106,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite index ad65ffdc1d..050316acb1 100644 --- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite @@ -22,37 +22,40 @@ targetNamespace="http://talk" name="palette"> - - - - + + + + - - - + + + - - - + + + - - - + + + + - - - - + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite index bef3a84a1b..a8844b172e 100644 --- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite @@ -60,13 +60,13 @@ - + - + diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite index 24db398347..a762a46b2a 100644 --- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite @@ -26,6 +26,7 @@ + @@ -49,6 +50,7 @@ + @@ -58,4 +60,10 @@ + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/value/palette.composite b/sca-cpp/trunk/modules/edit/palettes/value/palette.composite deleted file mode 100644 index 1cd9022493..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/value/palette.composite +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - abc - - - - - - 0 - - - - - - name - - - - - - name - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite new file mode 100644 index 0000000000..75c4bca5bb --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + name + + + + + + text + + + + + + 123 + + + + + + name + + + + + + name + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/store/featured b/sca-cpp/trunk/modules/edit/store/featured index df702cae8f..7fd59364cf 100644 --- a/sca-cpp/trunk/modules/edit/store/featured +++ b/sca-cpp/trunk/modules/edit/store/featured @@ -1 +1 @@ -((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice"))) diff --git a/sca-cpp/trunk/modules/edit/store/myapps b/sca-cpp/trunk/modules/edit/store/myapps new file mode 100644 index 0000000000..7fd59364cf --- /dev/null +++ b/sca-cpp/trunk/modules/edit/store/myapps @@ -0,0 +1 @@ +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice"))) diff --git a/sca-cpp/trunk/modules/edit/store/new b/sca-cpp/trunk/modules/edit/store/new index df702cae8f..402b4260e4 100644 --- a/sca-cpp/trunk/modules/edit/store/new +++ b/sca-cpp/trunk/modules/edit/store/new @@ -1 +1 @@ -((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (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"))) diff --git a/sca-cpp/trunk/modules/edit/store/services b/sca-cpp/trunk/modules/edit/store/services deleted file mode 100644 index 431193e8e6..0000000000 --- a/sca-cpp/trunk/modules/edit/store/services +++ /dev/null @@ -1 +0,0 @@ -((entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile"))) diff --git a/sca-cpp/trunk/modules/edit/store/top b/sca-cpp/trunk/modules/edit/store/top index df702cae8f..7fd59364cf 100644 --- a/sca-cpp/trunk/modules/edit/store/top +++ b/sca-cpp/trunk/modules/edit/store/top @@ -1 +1 @@ -((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice"))) -- cgit v1.2.3