From b334d8f3cfb7b43e705ed0b7c7aa6e2ce23e5bd6 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Sun, 27 Mar 2011 21:59:06 +0000 Subject: Add tests for HTTP components and widgets. Refactor and simplify some of the samples composites and component categories. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1086047 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/edit/apps/buzzprofile/app.composite | 54 ++++++ .../trunk/modules/edit/apps/me360/app.composite | 130 ++++++++++---- sca-cpp/trunk/modules/edit/apps/me360/app.html | 57 +++--- .../trunk/modules/edit/apps/nearme/app.composite | 6 +- sca-cpp/trunk/modules/edit/apps/test/app.composite | 26 ++- sca-cpp/trunk/modules/edit/apps/test/app.html | 17 +- .../modules/edit/apps/testevents/app.composite | 199 +++++++++++++++++++++ .../trunk/modules/edit/apps/testevents/app.html | 54 ++++++ .../trunk/modules/edit/apps/testget/app.composite | 65 ------- sca-cpp/trunk/modules/edit/apps/testget/app.html | 20 --- .../trunk/modules/edit/apps/testhttp/app.composite | 87 +++++++++ sca-cpp/trunk/modules/edit/apps/testhttp/app.html | 35 ++++ .../modules/edit/apps/testsocial/app.composite | 132 +++++++++----- .../trunk/modules/edit/apps/testtext/app.composite | 6 +- .../modules/edit/apps/testvalues/app.composite | 41 +++-- .../trunk/modules/edit/apps/testvalues/app.html | 6 +- .../modules/edit/apps/testwidgets/app.composite | 181 +++++++++++++++++++ .../trunk/modules/edit/apps/testwidgets/app.html | 58 ++++++ .../modules/edit/apps/testwidgets2/app.composite | 165 +++++++++++++++++ .../trunk/modules/edit/apps/testwidgets2/app.html | 83 +++++++++ .../trunk/modules/edit/dashboards/joe@localhost | 2 +- .../modules/edit/dashboards/joe@sca-store.com | 2 +- .../modules/edit/palettes/event/palette.composite | 26 ++- .../modules/edit/palettes/http/palette.composite | 91 ++++++++++ .../modules/edit/palettes/logic/palette.composite | 16 -- .../modules/edit/palettes/math/palette.composite | 16 +- .../modules/edit/palettes/python/palette.composite | 42 +++++ .../modules/edit/palettes/search/palette.composite | 27 ++- .../modules/edit/palettes/sensor/palette.composite | 62 ------- .../modules/edit/palettes/social/palette.composite | 39 ++-- .../modules/edit/palettes/talk/palette.composite | 8 +- .../modules/edit/palettes/url/palette.composite | 68 ------- sca-cpp/trunk/modules/edit/store/coolapps | 1 - sca-cpp/trunk/modules/edit/store/featured | 1 + sca-cpp/trunk/modules/edit/store/new | 1 + sca-cpp/trunk/modules/edit/store/services | 1 + sca-cpp/trunk/modules/edit/store/tests | 1 + sca-cpp/trunk/modules/edit/store/top | 1 + 38 files changed, 1426 insertions(+), 401 deletions(-) create mode 100644 sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testevents/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testevents/app.html delete mode 100644 sca-cpp/trunk/modules/edit/apps/testget/app.composite delete mode 100644 sca-cpp/trunk/modules/edit/apps/testget/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testhttp/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testhttp/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html create mode 100644 sca-cpp/trunk/modules/edit/palettes/http/palette.composite create mode 100644 sca-cpp/trunk/modules/edit/palettes/python/palette.composite delete mode 100644 sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite delete mode 100644 sca-cpp/trunk/modules/edit/palettes/url/palette.composite delete mode 100644 sca-cpp/trunk/modules/edit/store/coolapps create mode 100644 sca-cpp/trunk/modules/edit/store/featured create mode 100644 sca-cpp/trunk/modules/edit/store/new create mode 100644 sca-cpp/trunk/modules/edit/store/services create mode 100644 sca-cpp/trunk/modules/edit/store/tests create mode 100644 sca-cpp/trunk/modules/edit/store/top (limited to 'sca-cpp/trunk/modules') diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite new file mode 100644 index 0000000000..4a3902e47e --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite index c75b7c7179..21f61aa97b 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite @@ -18,47 +18,117 @@ * under the License. --> - - + + - 12345678 + 100001053301307 - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + fbprofile + + + + + me360 + + + + + twitprofile - - + + + + + - - + + + + + + + + + + - profiles + buzzprofile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsdelfino + + + + + https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json - - + + - joe + jsdelfino diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.html b/sca-cpp/trunk/modules/edit/apps/me360/app.html index b09564dc5c..148e0a43c9 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/app.html +++ b/sca-cpp/trunk/modules/edit/apps/me360/app.html @@ -18,28 +18,41 @@ * under the License. -->
- -

My social profiles

- - - - - -

Facebook profile

- - - text + + Facebook + + + + + + + + + + + + + +
namevalue
namevalue
+ + + + + + + + + + + + + +
namevalue
namevalue
+ + + Twitter - -

Twitter profile

- - - text - - - - - - + +

My profiles
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite index d3a4dffebf..777c11b885 100644 --- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite @@ -82,7 +82,7 @@ joe - + @@ -109,12 +109,12 @@ - + - + diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite index 337694ceb9..29969de5c1 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite @@ -17,4 +17,28 @@ * specific language governing permissions and limitations * under the License. --> - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.html b/sca-cpp/trunk/modules/edit/apps/test/app.html index a43eca03e0..5c7c7219bb 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.html +++ b/sca-cpp/trunk/modules/edit/apps/test/app.html @@ -17,19 +17,4 @@ * specific language governing permissions and limitations * under the License. --> -
- - - - - - - - - - - - -
namevalue
namevalue
- -
+
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite new file mode 100644 index 0000000000..bc7ac2a4be --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + page opened + + + + + status + + + + + status + + + + + + + + + + + + + + + + + status + + + + + + + + + + + testfield + + + + + testtext + + + + + data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ok button clicked + + + + + cancel button clicked + + + + + + + + + + + + + + + + + + + + + + + + data + + + + + + + + + + + + + + + + timer fired + + + + + 3000 + + + + + + + + + + + + + + + + + + + + data + + + + + status + + diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/app.html new file mode 100644 index 0000000000..2ad817bec9 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.html @@ -0,0 +1,54 @@ + + +
+ + + + + Status: + + + Field value: + + + text + + + text + + + Longitude: + + + Latitude: + + + + + + + + + text + + + text + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testget/app.composite b/sca-cpp/trunk/modules/edit/apps/testget/app.composite deleted file mode 100644 index 9f841afed6..0000000000 --- a/sca-cpp/trunk/modules/edit/apps/testget/app.composite +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - http://www.google.com - - - - - - - - - - - - - - - - - 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 - - diff --git a/sca-cpp/trunk/modules/edit/apps/testget/app.html b/sca-cpp/trunk/modules/edit/apps/testget/app.html deleted file mode 100644 index 5c7c7219bb..0000000000 --- a/sca-cpp/trunk/modules/edit/apps/testget/app.html +++ /dev/null @@ -1,20 +0,0 @@ - - -
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite new file mode 100644 index 0000000000..983e814513 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html new file mode 100644 index 0000000000..544287aa6d --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html @@ -0,0 +1,35 @@ + + +
+ + + + frame ... + + + + + + + frame ... + + + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite index b2db2e0ee6..e0d765b510 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite @@ -18,49 +18,14 @@ * under the License. --> - - - - 100001053301307 - - - - - - - - - - - - - me360 - - - - - - - - + - + + + - - - - jsdelfino - - - - - - - - - @@ -79,15 +44,94 @@ twprofile - - - - fbprofile - + + + + + + + + + + + + + + + + + + + jsdelfino + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + me360 + + + + + fbprofile + + + + + 100001053301307 + + + + + jsdelfino + + + + + jsdelfino + + + + + + + + + + + + + jsdelfino + diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite index bcc16ccad4..34db4b61bb 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite @@ -127,14 +127,14 @@ def - + - + @@ -207,7 +207,7 @@ fox - + diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite index d0bb61b129..c371fb68f1 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite @@ -18,20 +18,14 @@ * under the License. --> - - - - - xyz - - + abc - + @@ -41,7 +35,7 @@ - + @@ -89,13 +83,13 @@ 10 - + - + @@ -106,7 +100,7 @@ - + @@ -251,6 +245,24 @@ + + + + + + + + + + + + + + + + + xyz + @@ -258,9 +270,4 @@ - - - - - diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html index 5c7c7219bb..0c832411d7 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html @@ -17,4 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -
+
+ +

Header2

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite new file mode 100644 index 0000000000..a7b83b7577 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + testh1 + + + + + test header 1 + + + + + testentry + + + + + test entry field + + + + + test checkbox + + + + + testbutton + + + + + test button + + + + + testlink + + + + + testimg + + + + + http://tuscany.apache.org/images/TuscanyLogo.jpg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + testsection + + + + + test section + + + + + testcheckbox + + + + + test + + + + + + + + + + + + + + + + + testtext + + + + + test text + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://tuscany.apache.org + + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html new file mode 100644 index 0000000000..7db0f3e36f --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html @@ -0,0 +1,58 @@ + + +
+ +

Header1

+ + + + + + + + + section + + + text + + + + checkbox + + + + link + + + + + Apache + + + + + http://www.apache.org/ + + + + + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite new file mode 100644 index 0000000000..6ad9b104eb --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite @@ -0,0 +1,165 @@ + + + + + + + test value + + + + + testtable1 + + + + + + + + + + + + + + + + + + + testtable2 + + + + + + + + + + + + + + + + + + a + + + + + 1 + + + + + + + + + + + 2 + + + + + + + + + + + b + + + + + + + + + + + + + + + + + + + + + testhtml + + + + + <b>test bold text</b> + + + + + + + + + + + testlink + + + + + http://www.apache.org/ + + + + + + + + + + + + Apache + + + + + + + + + + + testframe + + + + + http://www.cnn.com + + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html new file mode 100644 index 0000000000..4e246df55e --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html @@ -0,0 +1,83 @@ + + +
+ + + + + + + + + + + + +
namevalue
namevalue
+ + + + + + + + + + + + + + + + +
namevalue
namevalue
+ + + + + + + + + + + + + +
namevalue
namevalue
+ + + text + + + + link + + + + + + frame ... + + + +
diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost index 9c40c7bd58..81ceb8f53d 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 Get Component") (id "testget")) (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 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"))) 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 9c40c7bd58..81ceb8f53d 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 Get Component") (id "testget")) (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 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"))) diff --git a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite index c887b17d57..0bb69eeccd 100644 --- a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite @@ -25,24 +25,36 @@ + - + - + + + - + - button - + - - 60 + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite new file mode 100644 index 0000000000..fb46490dea --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite index 0db971bdfd..e24d93a987 100644 --- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite @@ -29,8 +29,6 @@ - - @@ -81,18 +79,4 @@ - - - - - - - - - - - - - - diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite index 61638b50a2..d3c99d74c4 100644 --- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite @@ -26,8 +26,9 @@ + - + * @@ -36,7 +37,7 @@ - + / @@ -45,7 +46,7 @@ - + + @@ -54,7 +55,7 @@ - + - @@ -63,4 +64,11 @@ + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite new file mode 100644 index 0000000000..d6b8ebcaaf --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite index 08c41ac5ec..eab03ac835 100644 --- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite @@ -25,23 +25,44 @@ + + + - + - + - + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite b/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite deleted file mode 100644 index 755d111ae8..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/sensor/palette.composite +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite index 3fc3d4f162..fdd174afb0 100644 --- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite @@ -23,12 +23,12 @@ name="palette"> - + - + - + @@ -40,22 +40,31 @@ - - - + + + + + + + + + - - - + + + + + + @@ -71,12 +80,18 @@ + + + - - - + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite index c45262a786..ad65ffdc1d 100644 --- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite @@ -27,13 +27,13 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite b/sca-cpp/trunk/modules/edit/palettes/url/palette.composite deleted file mode 100644 index dc3b40e6a7..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-cpp/trunk/modules/edit/store/coolapps b/sca-cpp/trunk/modules/edit/store/coolapps deleted file mode 100644 index 9c40c7bd58..0000000000 --- a/sca-cpp/trunk/modules/edit/store/coolapps +++ /dev/null @@ -1 +0,0 @@ -((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 Get Component") (id "testget")) (entry (title "An App that shows my Social Profiles") (id "me360")) (entry (title "An App that shows Friends Near Me") (id "nearme"))) diff --git a/sca-cpp/trunk/modules/edit/store/featured b/sca-cpp/trunk/modules/edit/store/featured new file mode 100644 index 0000000000..df702cae8f --- /dev/null +++ b/sca-cpp/trunk/modules/edit/store/featured @@ -0,0 +1 @@ +((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme"))) diff --git a/sca-cpp/trunk/modules/edit/store/new b/sca-cpp/trunk/modules/edit/store/new new file mode 100644 index 0000000000..df702cae8f --- /dev/null +++ b/sca-cpp/trunk/modules/edit/store/new @@ -0,0 +1 @@ +((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme"))) diff --git a/sca-cpp/trunk/modules/edit/store/services b/sca-cpp/trunk/modules/edit/store/services new file mode 100644 index 0000000000..431193e8e6 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/store/services @@ -0,0 +1 @@ +((entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile"))) diff --git a/sca-cpp/trunk/modules/edit/store/tests b/sca-cpp/trunk/modules/edit/store/tests new file mode 100644 index 0000000000..ee6cbbe788 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/store/tests @@ -0,0 +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"))) diff --git a/sca-cpp/trunk/modules/edit/store/top b/sca-cpp/trunk/modules/edit/store/top new file mode 100644 index 0000000000..df702cae8f --- /dev/null +++ b/sca-cpp/trunk/modules/edit/store/top @@ -0,0 +1 @@ +((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme"))) -- cgit v1.2.3