From d1ef2011feade03df3916a93930fbc2f60327aa8 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 23 May 2011 04:25:27 +0000 Subject: Cleanup and organize sample components, apps and html pages. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1126306 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/modules/edit/apps/me360/app.composite | 119 ++--- .../trunk/modules/edit/apps/me360/htdocs/app.html | 34 +- .../trunk/modules/edit/apps/nearme/app.composite | 502 +++++++++--------- .../trunk/modules/edit/apps/nearme/htdocs/app.html | 22 +- sca-cpp/trunk/modules/edit/apps/new/app.composite | 64 +++ sca-cpp/trunk/modules/edit/apps/new/app.stats | 1 + .../trunk/modules/edit/apps/new/htdocs/app.html | 33 ++ .../modules/edit/apps/ourphotos/app.composite | 110 ++-- .../modules/edit/apps/ourphotos/htdocs/app.html | 6 +- .../modules/edit/apps/shoppingcart/app.composite | 573 +++++++++++---------- .../modules/edit/apps/shoppingcart/htdocs/app.html | 52 +- .../trunk/modules/edit/apps/slice/app.composite | 22 +- sca-cpp/trunk/modules/edit/apps/test/app.composite | 49 +- .../trunk/modules/edit/apps/test/htdocs/app.html | 15 +- .../trunk/modules/edit/apps/testdb/app.composite | 78 +-- .../trunk/modules/edit/apps/testdb/htdocs/app.html | 2 +- .../modules/edit/apps/testevents/app.composite | 190 ++++--- .../modules/edit/apps/testevents/htdocs/app.html | 48 +- .../trunk/modules/edit/apps/testhttp/app.composite | 118 +++-- .../modules/edit/apps/testhttp/htdocs/app.html | 4 +- .../modules/edit/apps/testlogic/app.composite | 92 ++-- .../modules/edit/apps/testlogic/htdocs/app.html | 2 +- .../modules/edit/apps/testsearch/app.composite | 220 ++++---- .../modules/edit/apps/testsearch/htdocs/app.html | 2 +- .../modules/edit/apps/testsocial/app.composite | 152 +++--- .../modules/edit/apps/testsocial/htdocs/app.html | 2 +- .../trunk/modules/edit/apps/testtext/app.composite | 160 +++--- .../modules/edit/apps/testtext/htdocs/app.html | 2 +- .../trunk/modules/edit/apps/testurl/app.composite | 132 +++-- .../modules/edit/apps/testurl/htdocs/app.html | 2 +- .../modules/edit/apps/testvalues/app.composite | 427 ++++++++------- .../modules/edit/apps/testvalues/htdocs/app.html | 4 +- .../modules/edit/apps/testwidgets/app.composite | 134 ++--- .../modules/edit/apps/testwidgets/htdocs/app.html | 28 +- .../modules/edit/apps/testwidgets2/app.composite | 118 ++--- .../modules/edit/apps/testwidgets2/htdocs/app.html | 28 +- .../edit/palettes/control/palette.composite | 123 ++--- .../edit/palettes/database/palette.composite | 134 ++--- .../modules/edit/palettes/http/palette.composite | 183 +++---- .../modules/edit/palettes/lists/palette.composite | 232 ++++----- .../modules/edit/palettes/logic/palette.composite | 130 ++--- .../modules/edit/palettes/math/palette.composite | 207 ++++---- .../modules/edit/palettes/python/palette.composite | 55 +- .../modules/edit/palettes/search/palette.composite | 171 +++--- .../modules/edit/palettes/social/palette.composite | 234 ++++----- .../modules/edit/palettes/talk/palette.composite | 91 ++-- .../modules/edit/palettes/text/palette.composite | 143 ++--- .../edit/palettes/transform/palette.composite | 106 ++-- .../modules/edit/palettes/values/palette.composite | 144 +++--- 49 files changed, 2731 insertions(+), 2769 deletions(-) create mode 100644 sca-cpp/trunk/modules/edit/apps/new/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/new/app.stats create mode 100644 sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite index 234c8cd61a..f7991a117d 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite @@ -17,111 +17,94 @@ * specific language governing permissions and limitations * under the License. --> - - + - - - - - - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + fbprofile - - - + + + twitprofile - - - + + + buzzprofile - - - - + + + + + + + + + + + + + + + + + + - - + + - 100001053301307 + jsdelfino - - + + jsdelfino - - + + https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json - - + + jsdelfino - - + + jsdelfino - - + + - - + + diff --git a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html index 84427a8ce9..e57e246328 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html @@ -18,17 +18,17 @@ * under the License. -->
- - Twitter + +

Me360

 - - Buzz + + Facebook - - + +
- + @@ -38,11 +38,14 @@
table=fbprofile ...
- - + + Twitter + + +
- + @@ -52,17 +55,14 @@
table=twitprofile ...
- -

Me360

- - - Facebook + + Buzz - + - + diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite index dbe637538a..f3736451a0 100644 --- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite @@ -17,428 +17,428 @@ * specific language governing permissions and limitations * under the License. --> - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + + + + me + + + + + + mapimg + + + + + + x + + + + + + 1 + + + + + + 2 + + + + + + 3 + + + + + + time3 + + + + + + time2 + + + + + + time1 + + + + + + mytime + + + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + - - + + getlocs - - + + getlocs - - + + nearme - - + + nearme - - - + + + - - + + - - + + 5000 - - + + longitude - + - - + + latitude - + - - + + friend1 - + - - + + friend2 - + - - + + friend3 - + - - + + friend1 - + - - + + friend2 - + - - + + friend3 - + - - + + - - - - - - - me - - - - - - mapimg - - - - - - x - - - - - - 1 - - - - - - 2 - - - - - - 3 - - - - - - time3 - - - - - - time2 - - - - - - time1 - - - - - - mytime + - - + + - - - - + + + + - - + + %a %b %d, %I:%M %p - - + + /components/map - - + + green - - - - + + + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html index 1077688b6c..fba4b0464c 100644 --- a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html @@ -18,37 +18,37 @@ * under the License. -->
- +

Nearme

 -

me

+

=me

 - updating... + =mytime - + My friends - + - last seen... + =time1 - + - last seen... + =time2 - + - last seen... + =time3 - +
diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.composite b/sca-cpp/trunk/modules/edit/apps/new/app.composite new file mode 100644 index 0000000000..253168ff21 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/new/app.composite @@ -0,0 +1,64 @@ + + + + + + + + + Change this example to do what you want + + + + + + me + + + + + + time + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.stats b/sca-cpp/trunk/modules/edit/apps/new/app.stats new file mode 100644 index 0000000000..513c902468 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/new/app.stats @@ -0,0 +1 @@ +((entry (title "An empty app template") (id "new"))) diff --git a/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html new file mode 100644 index 0000000000..de39e20956 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html @@ -0,0 +1,33 @@ + + +
+ +

Hello

+ + +

=me

+ + + The time is: + + + =time + +
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite index 8d27c3b6c8..13ed9a2248 100644 --- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite @@ -17,122 +17,122 @@ * specific language governing permissions and limitations * under the License. --> - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + src - - + + m - - + + image - - + + - - + + - - - + + + images - - - + + + - - - + + + - - + + - - - - + + + + - + - - + + <img src="{0}" width="320"/> - - + + jsdelfino - - + + 61049883@N06 - - + + image - - + + - + - - + + - + diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html index 489e6fe825..1ddb89fa30 100644 --- a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html @@ -18,14 +18,14 @@ * under the License. -->
- +

Our Photos

 - +
table=buzzprofile ...
- + diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite index 919a79f0f0..565bffa371 100644 --- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite @@ -17,464 +17,497 @@ * specific language governing permissions and limitations * under the License. --> - - + + + + - - - - - + + + - - + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - - - + + + - - - - - - - - - + + + + - - + + - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + + + + + + + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - - - + + + + - - + + - - + + fruit - - + + total - - + + total - - + + getcart - - + + order - - + + getcart - - + + carthtml - - + + order - - + + carthtml - - + + total - - + + catalog - - + + catalog - - + + total - - + + fruit - - + + + + getcart + + + getcart - - + + emptyCart - - + + cataloghtml - - + + carthtml - - + + + + + + 2.99 - - + + 3.55 - - + + 2 - - + + 1.55 - - - + + + + 0 + + + + - - + + fruit - + - - - + + + catalog - - - + + + Kiwi - - - + + + delresult - - - + + + sendresult - - - - + + + + total - - - + + + message - - - + + + message - - - + + + cart - - - + + + putresult - - - + + + Mango - - - + + + Passion - - + + - - + + - + @@ -482,86 +515,86 @@ - - - - + + + + - - + + - - + + xmppsca.1@gmail.com - - + + Welcome to my online store - - + + - xmppsca.2@gmail.com + jsdelfino@gmail.com - - + + Your order has been processed. Your total: ${1} - - + + <span id="fruit" class="checkbox"><input type="checkbox" value="{0}"/>${1} - {0}</span> - - + + ${1} - {0} - - + + xmpp4sca - - - - + + + + - - + + - + - - + + - + - - + + - + - - + + fruit - - + + fruit - - + + - + diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html index 7d32ddd5b7..0464f3e4c4 100644 --- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html @@ -18,20 +18,23 @@ * under the License. -->
+ +

Shopping Cart

+ Welcome - - Your Cart: - - + Catalog - + + + +
list=images
...
- + @@ -39,11 +42,26 @@
list=catalog
...
- + + Your cart: + + + $ + + + =total + + + + + + + + - + @@ -51,22 +69,4 @@
list=cart
...
- -

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 index ba16436c3e..847d9c4892 100644 --- a/sca-cpp/trunk/modules/edit/apps/slice/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite @@ -17,24 +17,24 @@ * specific language governing permissions and limitations * under the License. --> - + - - + + 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 7e4828573a..253168ff21 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite @@ -17,11 +17,48 @@ * specific language governing permissions and limitations * under the License. --> - - - - - - Hello World + + + + + + + Change this example to do what you want + + + + + + me + + + + + + time + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html index 5c7c7219bb..de39e20956 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html @@ -17,4 +17,17 @@ * specific language governing permissions and limitations * under the License. --> -
+
+ +

Hello

+ + +

=me

+ + + The time is: + + + =time + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite index ddad3cd7a1..e635f964bb 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite @@ -17,82 +17,82 @@ * specific language governing permissions and limitations * under the License. --> - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + testkey - - + + testvalue - - + + testkey - - + + testkey diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html index 734ec8f687..856966ff50 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. -->
- +

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 ffe17c3cd4..6389622481 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite @@ -17,155 +17,179 @@ * specific language governing permissions and limitations * under the License. --> - + + + + + - + - - - - + + + + + + + + + + + + abc - - + + + + + + + + - + + + + + + + - - - + + + - - - + + + - - - - + + + + - + - - + + - - - + + + - - + + compxyz - - + + + + https://testhttp.sca-store.com:8453/components/property + + + 3000 - - + + testfield - + - - + + - + - - - + + + status - - - + + + status - - - + + + status - - - + + + status - - - + + + testtext - - - + + + location - - - - + + + + - - - - - - + - - - - - - - + + page opens - - + + xyz - - + + ok button clicked - - + + cancel button clicked - - + + timer fired - - - - + + + + https://testhttp.sca-store.com:8453/components/property + + + + + - + diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html index 36b07205c7..6698c6faa8 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html @@ -18,40 +18,40 @@ * under the License. -->
- - - - - - - - Latitude: + +

Test events

 - - text + + - - text + + Status: - - Longitude: + + =status - + Field value: - text + =testtext - - Status: + + Longitude: - - text + + =longitude - - + + Latitude: - -

Test events

+ + =latitude + + + + + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite index f9955c5640..a632809760 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite @@ -17,7 +17,8 @@ * specific language governing permissions and limitations * under the License. --> - + + @@ -25,106 +26,153 @@ - - + + + + + + + + + - + - + - + - + - + - + - + - - + + - - + + + + + + + + + + + https://testhttp.sca-store.com:8453/components/property + + + + + + + + - - + + + + + test + + + + + + user + + + + + + name + + + - - + + http://www.google.com - - + + http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&destination=Concord,MA&waypoints=Charlestown,MA|Lexington,MA&sensor=false - - + + 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://feedproxy.google.com/TechCrunch - - + + cnn.com - - + + - https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=t:60,40&chl=Hello|World + https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=60,40&chl=Hello|World - - + + cnn.com - - + + (CNN) - - + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html index ddbd0ebc48..b0c20ef5e6 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html @@ -18,11 +18,11 @@ * under the License. -->
- +

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 d9b209fe10..86d4ed3365 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> - + @@ -26,124 +26,124 @@ - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + 5 - - + + 3 - - + + 5 - - + + 5 - - + + 5 - - + + 0.5 - - + + 0.5 - - + + - - + + - - + + greater than 5 - - + + not greater than 5 - - + + 3.14116 * 5 * 5 - - + + 3.14116 * ref.get(r) * ref.get(r) - - + + http://people.apache.org/~jsdelfino/tuscany/test/surface.py - - + + val = 3.14116 * ref.get(r) * ref.get(r) diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html index c2dc3a21c2..4e9efdaa22 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html @@ -18,7 +18,7 @@ * 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 3846266b74..2448aca193 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite @@ -17,190 +17,224 @@ * specific language governing permissions and limitations * under the License. --> - + + + - - + + - - + + - + + + + + + + + + - - + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + + + + A + + + + + + A + + + + + + B + + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - + + 94070 - - + + + + 37.507156 + + + 37.507156 - - + + -122.260526 - - + + + + -122.260526 + + + - - + + - - - - - A - - - - - - A - - - - - - B - - - + + apache tuscany - - + + + + San Carlos, CA + + + apache tuscany - - + + 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 - - + + green - - + + San Francisco, CA - - + + San Carlos, CA - - + + yellow - - + + green - - + + apache tuscany - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html index 3760a04794..ca5462f07a 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. -->
- +

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 ad7c983098..b331349b20 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite @@ -17,74 +17,74 @@ * specific language governing permissions and limitations * under the License. --> - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + - - - + + + twitprofile - - - + + + name - - - + + + twittimeline - - - + + + twitfriends - - - + + + twitfollowers - + @@ -92,88 +92,88 @@ - - - - + + + + - - + + 100001053301307 - - + + jsdelfino - - + + jsdelfino - - + + jsdelfino - - + + jsdelfino - - + + xmppsca.2@gmail.com - - + + Hello, the time is {0} - - + + xmppsca.1@gmail.com - - + + xmpp4sca - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html index 9630d36d0f..5fe616ca16 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. -->
- +

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 22436f5019..54771ecec8 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> - + @@ -27,189 +27,189 @@ - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + a - - - + + + b - - + + - - + + - - + + abc - - + + cd - - + + x - - + + abcxdefxghi - - + + The {0} brown {1} - - + + The {a} brown {b} - - + + quick - - + + fox - - + + quick - - + + fox - - + + city (.*) state (.*) - - + + ABC - - + + city San Francisco state CA - - + + abcxdefxghi - - + + x - - + + y - - + + x - - + + abc - - + + def - - + + abcdef - - + + diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html index 99f719ef40..1c7612d0e0 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html @@ -18,7 +18,7 @@ * 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 2bb49a9e81..68f9e36675 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite @@ -17,105 +17,129 @@ * specific language governing permissions and limitations * under the License. --> - + + + - - + + - - + + - - + + + + + parmx + + + + + + parmy + + + + + + parmn + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + key2 + + + 123 - - + + - - + + - - - - - parmx - - - - - - parmy - - - - - - parmn - - - + + - - + + http://sca-store.com/ - - + + + + key2 + + + test - - + + path - - + + xx - - + + yy - - + + - - + + diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html index 9641f58ba5..8c47186044 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html @@ -18,7 +18,7 @@ * 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 6793aceef1..172fbb90d9 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite @@ -17,339 +17,353 @@ * specific language governing permissions and limitations * under the License. --> - + - - + - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + * - - + + abc - - + + nb - - + + d - - + + sum - - + + i - - + + a.b - - + + - - + + 12 - - + + 10 - - + + 123 - - + + 0 - - + + 10 - - + + 0 - - + + 123 - - + + 456 - - + + 0 - - + + 10 - - + + 2 - - + + 34 - - + + 3 - - + + 0 - - - + + + a - - - + + + a - - - + + + entry - - - + + + entry - - - + + + test - - - + + + + + d + + + + + + x + + + + d - - - + + + ccc - - - + + + b - - - + + + c - - - + + + c - - - + + + b - - - + + + a - - - + + + x - - + + - - + + - - + + - - + + @@ -357,96 +371,121 @@ - - + + - - + + - - - + + + - - + + + + + + + - - - - + + + + - - + + + + xyz + + + xyz - - + + + + y + + + bbb - - + + abc - - + + def - - + + ccc - - + + BBB - - + + hello - - + + CCC - - + + abc - - + + - - + + nb - - + + sum - - + + i + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html index 97889b7a9d..79bb081a97 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html @@ -18,10 +18,10 @@ * under the License. -->
- +

Test values and lists

 - text + =value
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite index 6b08e18f3b..690f1761e3 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite @@ -17,131 +17,131 @@ * specific language governing permissions and limitations * under the License. --> - + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + testpath2 - - - + + + testh1 - - - - + + + + testpath1 - - - + + + testimg - - - + + + testtext - - - + + + testlink - - - + + + testcheckbox - - - + + + testentry - - - + + + testbutton - - - + + + testsection - - - - + + + + - - + + test header 1 - - + + test button - - + + test entry field - - + + http://tuscany.apache.org - - + + test checkbox - - + + http://tuscany.apache.org/images/TuscanyLogo.jpg - - + + test section - - + + test text - - + + test path diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html index ff255ee45d..0b5022513d 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html @@ -19,43 +19,43 @@ -->
-

Header1

+

=testh1

 - section + =testsection - + - + - - checkbox + + =testcheckbox - - http://www.apache.org/ + + =testlink2 - - link + + =testlink - - Apache + + =testlink3 - text + =testtext - text + =testpath1.testpath2
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite index 1a14eec510..84d87bf184 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite @@ -17,113 +17,113 @@ * specific language governing permissions and limitations * under the License. --> - + - - + + - - - - - - - - - + + + + + + + + + - - - + + + - - + + - - - + + + - - + + 1 - - + + 2 - - - + + + testframe - - - + + + testlink - - - + + + testhtml - - - + + + testlist1 - - - + + + testlist2 - - - + + + a - - - + + + b - - - - + + + + - - + + test value - - + + <b>test bold text</b> - - + + http://www.apache.org/ - - + + Apache - - + + http://www.cnn.com diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html index 2bf6593f02..a42c96bdff 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html @@ -18,14 +18,14 @@ * under the License. -->
- +

Test widget components

 - - + +
- + @@ -35,11 +35,11 @@
table=testlist1 ...
- - + +
- + @@ -49,11 +49,11 @@
table=testlist2 ...
- - + +
- + @@ -64,16 +64,16 @@
table=b ...
- text + =testhtml - - link + + =testlink diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite index 1ab4d4a54f..d22b9482ee 100644 --- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite @@ -1,78 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite index f9dab736f8..42d67af548 100644 --- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite @@ -1,84 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite index 317cf338ed..6b518f0a35 100644 --- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite @@ -1,107 +1,80 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - x - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite index 2272a107c7..4190398e80 100644 --- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite @@ -1,137 +1,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite index e24d93a987..0c5a769567 100644 --- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite @@ -1,82 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite index f835d8df03..f8d7ced4b8 100644 --- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite @@ -1,123 +1,88 @@ - - - - - - - - - - - - - - - - - - - - * - - - - - - - - - / - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + / + + + + + + + + + + + + + + + + + + * + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite index 2cabac1a26..315a44b105 100644 --- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite @@ -1,42 +1,17 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite index 04cc674962..eb359ee84f 100644 --- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite @@ -1,93 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite index fea8fba4e1..d319fc9c45 100644 --- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite @@ -1,136 +1,102 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite index 050316acb1..af293b97f5 100644 --- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite @@ -1,61 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite index a8844b172e..4b643000ef 100644 --- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite @@ -1,89 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite index a762a46b2a..febefec9a1 100644 --- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite @@ -1,69 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite index 75c4bca5bb..8f143e42bf 100644 --- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite @@ -1,87 +1,61 @@ - - - - - - - - - - - - - - - - - - name - - - - - - text - - - - - - 123 - - - - - - name - - - - - - name - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + comment + + + + + + + + + + name + + + + + name + + + + + + + + + + + + + + 123 + + + + + text + + + + + + + + + name + -- cgit v1.2.3