From ac736cca82bc8ed1a482baa5a2635acc18bc88ec Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Wed, 20 Oct 2010 04:59:59 +0000 Subject: Remove unnecessary javaClass hint attribute from JSON objects. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1024521 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/java/test/ServerImpl.java | 8 ++++---- sca-cpp/trunk/modules/json/json-test.cpp | 2 +- sca-cpp/trunk/modules/python/server-test.py | 8 ++++---- sca-cpp/trunk/modules/server/htdocs/test/entry.xml | 2 +- sca-cpp/trunk/modules/server/htdocs/test/feed.xml | 2 +- sca-cpp/trunk/modules/server/server-test.scm | 8 ++++---- sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml | 2 +- sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml | 2 +- sca-cpp/trunk/modules/wsgi/server-test.py | 8 ++++---- .../trunk/samples/store-cluster/domains/jane/fruits-catalog.py | 6 +++--- sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py | 6 +++--- .../trunk/samples/store-cluster/htdocs/domains/jane/index.html | 1 - sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html | 1 - sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp | 2 +- sca-cpp/trunk/samples/store-cpp/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt | 2 +- sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt | 2 +- .../trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml | 2 +- sca-cpp/trunk/samples/store-gae/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt | 2 +- sca-cpp/trunk/samples/store-java/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java | 6 +++--- sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm | 6 +++--- sca-cpp/trunk/samples/store-nosql/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-python/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm | 6 +++--- sca-cpp/trunk/samples/store-scheme/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-scheme/script-test.cpp | 6 +++--- sca-cpp/trunk/samples/store-scheme/script-test.scm | 6 +++--- sca-cpp/trunk/samples/store-sql/fruits-catalog.scm | 6 +++--- sca-cpp/trunk/samples/store-sql/htdocs/index.html | 1 - sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py | 6 +++--- sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py | 6 +++--- sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html | 1 - sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html | 1 - 35 files changed, 56 insertions(+), 67 deletions(-) (limited to 'sca-cpp') diff --git a/sca-cpp/trunk/modules/java/test/ServerImpl.java b/sca-cpp/trunk/modules/java/test/ServerImpl.java index 05012c22cf..9de68fdb75 100644 --- a/sca-cpp/trunk/modules/java/test/ServerImpl.java +++ b/sca-cpp/trunk/modules/java/test/ServerImpl.java @@ -30,10 +30,10 @@ public class ServerImpl { public Iterable get(final Iterable id) { if (isNil(id)) return list("Sample Feed", "123456789", - list("Item", "111", list(list("'javaClass", "services.Item"), list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99))), - list("Item", "222", list(list("'javaClass", "services.Item"), list("'name", "Orange"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 3.55))), - list("Item", "333", list(list("'javaClass", "services.Item"), list("'name", "Pear"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 1.55)))); - final Iterable entry = list(list("'javaClass", "services.Item"), list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99)); + list("Item", "111", list(list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99))), + list("Item", "222", list(list("'name", "Orange"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 3.55))), + list("Item", "333", list(list("'name", "Pear"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 1.55)))); + final Iterable entry = list(list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99)); return list("Item", car(id), entry); } diff --git a/sca-cpp/trunk/modules/json/json-test.cpp b/sca-cpp/trunk/modules/json/json-test.cpp index 707a785968..9bae859ce2 100644 --- a/sca-cpp/trunk/modules/json/json-test.cpp +++ b/sca-cpp/trunk/modules/json/json-test.cpp @@ -125,7 +125,7 @@ bool testJSONRPC() { assert(str(os) == "{\"id\":1,\"result\":[\"Service.get\",\"Service.getTotal\"]}"); } { - const string f("{\"id\":1,\"result\":[\"Sample Feed\",\"123456789\",[\"Item\",\"111\",{\"javaClass\":\"services.Item\",\"name\":\"Apple\",\"currencyCode\":\"USD\",\"currencySymbol\":\"$\",\"price\":2.99}],[\"Item\",\"222\",{\"javaClass\":\"services.Item\",\"name\":\"Orange\",\"currencyCode\":\"USD\",\"currencySymbol\":\"$\",\"price\":3.55}],[\"Item\",\"333\",{\"javaClass\":\"services.Item\",\"name\":\"Pear\",\"currencyCode\":\"USD\",\"currencySymbol\":\"$\",\"price\":1.55}]]}"); + const string f("{\"id\":1,\"result\":[\"Sample Feed\",\"123456789\",[\"Item\",\"111\",{\"name\":\"Apple\",\"currencyCode\":\"USD\",\"currencySymbol\":\"$\",\"price\":2.99}],[\"Item\",\"222\",{\"name\":\"Orange\",\"currencyCode\":\"USD\",\"currencySymbol\":\"$\",\"price\":3.55}],[\"Item\",\"333\",{\"name\":\"Pear\",\"currencyCode\":\"USD\",\"currencySymbol\":\"$\",\"price\":1.55}]]}"); const list r = content(readJSON(mklist(f), cx)); const list v = elementsToValues(r); const list e = valuesToElements(v); diff --git a/sca-cpp/trunk/modules/python/server-test.py b/sca-cpp/trunk/modules/python/server-test.py index dcda763043..29404c3753 100644 --- a/sca-cpp/trunk/modules/python/server-test.py +++ b/sca-cpp/trunk/modules/python/server-test.py @@ -25,11 +25,11 @@ def echo(x): def get(id): if id == (): return ("Sample Feed", "123456789", - ("Item", "111", (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99))), - ("Item", "222", (("'javaClass", "services.Item"), ("'name", "Orange"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 3.55))), - ("Item", "333", (("'javaClass", "services.Item"), ("name", "Pear"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 1.55)))) + ("Item", "111", (("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99))), + ("Item", "222", (("'name", "Orange"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 3.55))), + ("Item", "333", (("'name", "Pear"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 1.55)))) - entry = (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99)) + entry = (("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99)) return ("Item", id[0], entry) def post(collection, item): diff --git a/sca-cpp/trunk/modules/server/htdocs/test/entry.xml b/sca-cpp/trunk/modules/server/htdocs/test/entry.xml index 86b8a10547..6528c793e3 100644 --- a/sca-cpp/trunk/modules/server/htdocs/test/entry.xml +++ b/sca-cpp/trunk/modules/server/htdocs/test/entry.xml @@ -1,2 +1,2 @@ -Item111services.ItemAppleUSD$2.99 +Item111AppleUSD$2.99 diff --git a/sca-cpp/trunk/modules/server/htdocs/test/feed.xml b/sca-cpp/trunk/modules/server/htdocs/test/feed.xml index 5e37de6580..bcb304f9c2 100644 --- a/sca-cpp/trunk/modules/server/htdocs/test/feed.xml +++ b/sca-cpp/trunk/modules/server/htdocs/test/feed.xml @@ -1,2 +1,2 @@ -Sample Feed123456789Item111services.ItemAppleUSD$2.99Item222services.ItemOrangeUSD$3.55Item333services.ItemPearUSD$1.55 +Sample Feed123456789Item111AppleUSD$2.99Item222OrangeUSD$3.55Item333PearUSD$1.55 diff --git a/sca-cpp/trunk/modules/server/server-test.scm b/sca-cpp/trunk/modules/server/server-test.scm index 5d545ecf8b..c23adb7f51 100644 --- a/sca-cpp/trunk/modules/server/server-test.scm +++ b/sca-cpp/trunk/modules/server/server-test.scm @@ -24,11 +24,11 @@ (define (get id) (if (nul id) '("Sample Feed" "123456789" - ("Item" "111" ((javaClass "services.Item") (name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99))) - ("Item" "222" ((javaClass "services.Item") (name "Orange") (currencyCode "USD") (currencySymbol "$") (price 3.55))) - ("Item" "333" ((javaClass "services.Item") (name "Pear") (currencyCode "USD") (currencySymbol "$") (price 1.55)))) + ("Item" "111" ((name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99))) + ("Item" "222" ((name "Orange") (currencyCode "USD") (currencySymbol "$") (price 3.55))) + ("Item" "333" ((name "Pear") (currencyCode "USD") (currencySymbol "$") (price 1.55)))) - (list "Item" (car id) '((javaClass "services.Item") (name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99)))) + (list "Item" (car id) '((name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99)))) ) (define (post collection item) diff --git a/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml b/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml index 5796cd655f..d26a46f25b 100644 --- a/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml +++ b/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml @@ -1,2 +1,2 @@ -Item111services.ItemAppleUSD$2.99 +Item111AppleUSD$2.99 diff --git a/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml b/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml index d15b265f15..0be99f6eaf 100644 --- a/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml +++ b/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml @@ -1,2 +1,2 @@ -Sample Feed123456789Item111services.ItemAppleUSD$2.99Item222services.ItemOrangeUSD$3.55Item333('name', 'Pear')services.ItemUSD$1.55 +Sample Feed123456789Item111AppleUSD$2.99Item222OrangeUSD$3.55Item333PearUSD$1.55 diff --git a/sca-cpp/trunk/modules/wsgi/server-test.py b/sca-cpp/trunk/modules/wsgi/server-test.py index 9e084a3f92..28f88efefc 100644 --- a/sca-cpp/trunk/modules/wsgi/server-test.py +++ b/sca-cpp/trunk/modules/wsgi/server-test.py @@ -27,11 +27,11 @@ def get(id): return ("text/plain", ("It works!",)) if id == (): return ("Sample Feed", "123456789", - ("Item", "111", (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99))), - ("Item", "222", (("'javaClass", "services.Item"), ("'name", "Orange"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 3.55))), - ("Item", "333", (("'javaClass", "services.Item"), ("name", "Pear"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 1.55)))) + ("Item", "111", (("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99))), + ("Item", "222", (("'name", "Orange"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 3.55))), + ("Item", "333", (("'name", "Pear"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 1.55)))) - entry = (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99)) + entry = (("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99)) return ("Item", id[0], entry) def post(collection, item): diff --git a/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py b/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py index 3d108f42eb..fb85d12bc7 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py +++ b/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py @@ -23,8 +23,8 @@ def getcatalog(converter, currencyCode): return converter("convert", "USD", code, price) symbol = converter("symbol", code) return ( - (("'javaClass", "services.Item"), ("'name", "Passion"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), - (("'javaClass", "services.Item"), ("'name", "Mango"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), - (("'javaClass", "services.Item"), ("'name", "Pineapple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) + (("'name", "Passion"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), + (("'name", "Mango"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), + (("'name", "Pineapple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) ) diff --git a/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py b/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py index 2a6d726fdc..b5eb035ae3 100644 --- a/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py +++ b/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py @@ -23,8 +23,8 @@ def getcatalog(converter, currencyCode): return converter("convert", "USD", code, price) symbol = converter("symbol", code) return ( - (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), - (("'javaClass", "services.Item"), ("'name", "Orange"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), - (("'javaClass", "services.Item"), ("'name", "Pear"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) + (("'name", "Apple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), + (("'name", "Orange"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), + (("'name", "Pear"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) ) diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html index 9fc3247e22..b60e18690a 100644 --- a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html +++ b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html index e8b722d0d6..37ed010229 100644 --- a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html +++ b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp b/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp index a6c1056080..cc0dc0849a 100644 --- a/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp +++ b/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp @@ -47,7 +47,7 @@ struct convert { const list mkfruit(const string& name, const string& code, const string& symbol, const double price) { return list() + - mklist("javaClass", string("services.Item")) + mklist("name", name) + mklist("currencyCode", code) + mklist("currencySymbol", symbol) + mklist("price", price); + mklist("name", name) + mklist("currencyCode", code) + mklist("currencySymbol", symbol) + mklist("price", price); } const failable getcatalog(const lambda&)> converter, const lambda&)> currencyCode) { diff --git a/sca-cpp/trunk/samples/store-cpp/htdocs/index.html b/sca-cpp/trunk/samples/store-cpp/htdocs/index.html index c27e54f753..15e857895e 100644 --- a/sca-cpp/trunk/samples/store-cpp/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-cpp/htdocs/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt b/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt index 34a2420298..56f87d2778 100644 --- a/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt +++ b/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt @@ -1 +1 @@ -{"id":1,"result":[{"javaClass":"services.Item","name":"Apple","currencyCode":"USD","currencySymbol":"$","price":2.99},{"javaClass":"services.Item","name":"Orange","currencyCode":"USD","currencySymbol":"$","price":3.55},{"javaClass":"services.Item","name":"Pear","currencyCode":"USD","currencySymbol":"$","price":1.55}]} \ No newline at end of file +{"id":1,"result":[{"name":"Apple","currencyCode":"USD","currencySymbol":"$","price":2.99},{"name":"Orange","currencyCode":"USD","currencySymbol":"$","price":3.55},{"name":"Pear","currencyCode":"USD","currencySymbol":"$","price":1.55}]} \ No newline at end of file diff --git a/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt b/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt index 34a2420298..788b7cdf89 100644 --- a/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt +++ b/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt @@ -1 +1 @@ -{"id":1,"result":[{"javaClass":"services.Item","name":"Apple","currencyCode":"USD","currencySymbol":"$","price":2.99},{"javaClass":"services.Item","name":"Orange","currencyCode":"USD","currencySymbol":"$","price":3.55},{"javaClass":"services.Item","name":"Pear","currencyCode":"USD","currencySymbol":"$","price":1.55}]} \ No newline at end of file +{"id":1,"result":[{"name":"Mango","currencyCode":"USD","currencySymbol":"$","price":2.99},{"name":"Passion","currencyCode":"USD","currencySymbol":"$","price":3.55},{"name":"Kiwi","currencyCode":"USD","currencySymbol":"$","price":1.55}]} \ No newline at end of file diff --git a/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml b/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml index 5e8fc7c1f3..25a284294c 100644 --- a/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml +++ b/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml @@ -1 +1 @@ -Itemservices.ItemOrangeUSD$3.55 +ItemOrangeUSD$3.55 diff --git a/sca-cpp/trunk/samples/store-gae/htdocs/index.html b/sca-cpp/trunk/samples/store-gae/htdocs/index.html index 9f0e436b11..aee6ad5f70 100644 --- a/sca-cpp/trunk/samples/store-gae/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-gae/htdocs/index.html @@ -102,7 +102,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt b/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt index 6c2d599106..bbc07e8917 100644 --- a/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt +++ b/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt @@ -1 +1 @@ -{"id":1,"result":[{"price":2.9900000000000002,"javaClass":"services.Item","currencyCode":"USD","name":"Apple","currencySymbol":"$"},{"price":3.5499999999999998,"javaClass":"services.Item","currencyCode":"USD","name":"Orange","currencySymbol":"$"},{"price":1.55,"javaClass":"services.Item","currencyCode":"USD","name":"Pear","currencySymbol":"$"}]} \ No newline at end of file +{"id":1,"result":[{"price":2.9900000000000002,"currencyCode":"USD","name":"Platano","currencySymbol":"$"},{"price":3.5499999999999998,"currencyCode":"USD","name":"Banana","currencySymbol":"$"},{"price":1.55,"currencyCode":"USD","name":"Guanabana","currencySymbol":"$"}]} \ No newline at end of file diff --git a/sca-cpp/trunk/samples/store-java/htdocs/index.html b/sca-cpp/trunk/samples/store-java/htdocs/index.html index c27e54f753..15e857895e 100644 --- a/sca-cpp/trunk/samples/store-java/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-java/htdocs/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java b/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java index 2bdb2728a6..7ceffeb943 100644 --- a/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java +++ b/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java @@ -43,9 +43,9 @@ public class FruitsCatalogImpl { final Converter c = new Converter(); final String symbol = converter.symbol(code); - return list(list(list("'javaClass", "services.Item"), list("'name", "Apple"), list("'currencyCode", code), list("'currencySymbol", symbol), list("'price", c.convert(2.99))), - list(list("'javaClass", "services.Item"), list("'name", "Orange"), list("'currencyCode", code), list("'currencySymbol", symbol), list("'price", c.convert(3.55))), - list(list("'javaClass", "services.Item"), list("'name", "Pear"), list("'currencyCode", code), list("'currencySymbol", symbol), list("'price", c.convert(1.55)))); + return list(list(list("'name", "Apple"), list("'currencyCode", code), list("'currencySymbol", symbol), list("'price", c.convert(2.99))), + list(list("'name", "Orange"), list("'currencyCode", code), list("'currencySymbol", symbol), list("'price", c.convert(3.55))), + list(list("'name", "Pear"), list("'currencyCode", code), list("'currencySymbol", symbol), list("'price", c.convert(1.55)))); } } diff --git a/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm b/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm index 1e84fc7d5e..8368a1f369 100644 --- a/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm +++ b/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm @@ -22,9 +22,9 @@ (define (convert price) (converter "convert" "USD" code price)) (define symbol (converter "symbol" code)) (list - (list (list 'javaClass "services.Item") (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 2.99))) - (list (list 'javaClass "services.Item") (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 3.55))) - (list (list 'javaClass "services.Item") (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 1.55))) + (list (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 2.99))) + (list (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 3.55))) + (list (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 1.55))) ) ) diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html b/sca-cpp/trunk/samples/store-nosql/htdocs/index.html index c27e54f753..15e857895e 100644 --- a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-nosql/htdocs/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-python/htdocs/index.html b/sca-cpp/trunk/samples/store-python/htdocs/index.html index 50c9e52e7e..f7cf87f722 100644 --- a/sca-cpp/trunk/samples/store-python/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-python/htdocs/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm b/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm index 1e84fc7d5e..8368a1f369 100644 --- a/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm +++ b/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm @@ -22,9 +22,9 @@ (define (convert price) (converter "convert" "USD" code price)) (define symbol (converter "symbol" code)) (list - (list (list 'javaClass "services.Item") (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 2.99))) - (list (list 'javaClass "services.Item") (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 3.55))) - (list (list 'javaClass "services.Item") (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 1.55))) + (list (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 2.99))) + (list (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 3.55))) + (list (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 1.55))) ) ) diff --git a/sca-cpp/trunk/samples/store-scheme/htdocs/index.html b/sca-cpp/trunk/samples/store-scheme/htdocs/index.html index c27e54f753..15e857895e 100644 --- a/sca-cpp/trunk/samples/store-scheme/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-scheme/htdocs/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-scheme/script-test.cpp b/sca-cpp/trunk/samples/store-scheme/script-test.cpp index c8eecb65c3..c05c287a20 100644 --- a/sca-cpp/trunk/samples/store-scheme/script-test.cpp +++ b/sca-cpp/trunk/samples/store-scheme/script-test.cpp @@ -44,8 +44,8 @@ bool testScript() { scheme::evalDriverRun(is, os); assert(contains(str(os), "(\"Sample Feed\" \"")); assert(contains(str(os), "\" (\"Item\" \"")); - assert(contains(str(os), "\" ((javaClass \"services.Item\") (name \"Orange\") (currencyCode \"USD\") (currencySymbol \"$\") (price 3.55))) (\"Item\" \"")); - assert(contains(str(os), "\" ((javaClass \"services.Item\") (name \"Apple\") (currencyCode \"USD\") (currencySymbol \"$\") (price 2.99))))")); + assert(contains(str(os), "\" ((name \"Orange\") (currencyCode \"USD\") (currencySymbol \"$\") (price 3.55))) (\"Item\" \"")); + assert(contains(str(os), "\" ((name \"Apple\") (currencyCode \"USD\") (currencySymbol \"$\") (price 2.99))))")); return true; } @@ -61,7 +61,7 @@ bool testEval() { ostringstream vs; vs << val; - assert(contains(str(vs), "(((javaClass \"services.Item\") (name \"Apple\") (currencyCode \"USD\") (currencySymbol \"$\") (price 2.99)) ((javaClass \"services.Item\") (name \"Orange\") (currencyCode \"USD\") (currencySymbol \"$\") (price 3.55)) ((javaClass \"services.Item\") (name \"Pear\") (currencyCode \"USD\") (currencySymbol \"$\") (price 1.55)))")); + assert(contains(str(vs), "(((name \"Apple\") (currencyCode \"USD\") (currencySymbol \"$\") (price 2.99)) ((name \"Orange\") (currencyCode \"USD\") (currencySymbol \"$\") (price 3.55)) ((name \"Pear\") (currencyCode \"USD\") (currencySymbol \"$\") (price 1.55)))")); } { diff --git a/sca-cpp/trunk/samples/store-scheme/script-test.scm b/sca-cpp/trunk/samples/store-scheme/script-test.scm index 96959d9d55..2120949701 100644 --- a/sca-cpp/trunk/samples/store-scheme/script-test.scm +++ b/sca-cpp/trunk/samples/store-scheme/script-test.scm @@ -45,9 +45,9 @@ (define symbol (converter "symbol" code)) (list - (list (list 'javaClass "services.Item") (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price 2.99)) - (list (list 'javaClass "services.Item") (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price 3.55)) - (list (list 'javaClass "services.Item") (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price 1.55)) + (list (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price 2.99)) + (list (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price 3.55)) + (list (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price 1.55)) ) ) diff --git a/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm b/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm index 1e84fc7d5e..8368a1f369 100644 --- a/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm +++ b/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm @@ -22,9 +22,9 @@ (define (convert price) (converter "convert" "USD" code price)) (define symbol (converter "symbol" code)) (list - (list (list 'javaClass "services.Item") (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 2.99))) - (list (list 'javaClass "services.Item") (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 3.55))) - (list (list 'javaClass "services.Item") (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 1.55))) + (list (list 'name "Apple") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 2.99))) + (list (list 'name "Orange") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 3.55))) + (list (list 'name "Pear") (list 'currencyCode code) (list 'currencySymbol symbol) (list 'price (convert 1.55))) ) ) diff --git a/sca-cpp/trunk/samples/store-sql/htdocs/index.html b/sca-cpp/trunk/samples/store-sql/htdocs/index.html index c27e54f753..15e857895e 100644 --- a/sca-cpp/trunk/samples/store-sql/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-sql/htdocs/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py b/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py index 3d108f42eb..fb85d12bc7 100644 --- a/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py +++ b/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py @@ -23,8 +23,8 @@ def getcatalog(converter, currencyCode): return converter("convert", "USD", code, price) symbol = converter("symbol", code) return ( - (("'javaClass", "services.Item"), ("'name", "Passion"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), - (("'javaClass", "services.Item"), ("'name", "Mango"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), - (("'javaClass", "services.Item"), ("'name", "Pineapple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) + (("'name", "Passion"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), + (("'name", "Mango"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), + (("'name", "Pineapple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) ) diff --git a/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py b/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py index 2a6d726fdc..b5eb035ae3 100644 --- a/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py +++ b/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py @@ -23,8 +23,8 @@ def getcatalog(converter, currencyCode): return converter("convert", "USD", code, price) symbol = converter("symbol", code) return ( - (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), - (("'javaClass", "services.Item"), ("'name", "Orange"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), - (("'javaClass", "services.Item"), ("'name", "Pear"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) + (("'name", "Apple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))), + (("'name", "Orange"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))), + (("'name", "Pear"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55))) ) diff --git a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html index 9fc3247e22..b60e18690a 100644 --- a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html +++ b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + diff --git a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html index e8b722d0d6..37ed010229 100644 --- a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html +++ b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html @@ -87,7 +87,6 @@ function addToCart() { if (items[i].checked) { var entry = 'Item' + '' + - '' + catalogItems[i].javaClass + '' + '' + catalogItems[i].name + '' + '' + catalogItems[i].currencyCode + '' + '' + catalogItems[i].currencySymbol + '' + -- cgit v1.2.3