You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/10/20 07:00:00 UTC
svn commit: r1024521 - in /tuscany/sca-cpp/trunk: modules/java/test/
modules/json/ modules/python/ modules/server/ modules/server/htdocs/test/
modules/wsgi/ modules/wsgi/htdocs/test/ samples/store-cluster/domains/jane/
samples/store-cluster/domains/joe...
Author: jsdelfino
Date: Wed Oct 20 04:59:59 2010
New Revision: 1024521
URL: http://svn.apache.org/viewvc?rev=1024521&view=rev
Log:
Remove unnecessary javaClass hint attribute from JSON objects.
Modified:
tuscany/sca-cpp/trunk/modules/java/test/ServerImpl.java
tuscany/sca-cpp/trunk/modules/json/json-test.cpp
tuscany/sca-cpp/trunk/modules/python/server-test.py
tuscany/sca-cpp/trunk/modules/server/htdocs/test/entry.xml
tuscany/sca-cpp/trunk/modules/server/htdocs/test/feed.xml
tuscany/sca-cpp/trunk/modules/server/server-test.scm
tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml
tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml
tuscany/sca-cpp/trunk/modules/wsgi/server-test.py
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html
tuscany/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp
tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt
tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt
tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml
tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt
tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java
tuscany/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
tuscany/sca-cpp/trunk/samples/store-nosql/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm
tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-scheme/script-test.cpp
tuscany/sca-cpp/trunk/samples/store-scheme/script-test.scm
tuscany/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm
tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py
tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html
Modified: tuscany/sca-cpp/trunk/modules/java/test/ServerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/test/ServerImpl.java?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/test/ServerImpl.java (original)
+++ tuscany/sca-cpp/trunk/modules/java/test/ServerImpl.java Wed Oct 20 04:59:59 2010
@@ -30,10 +30,10 @@ public class ServerImpl {
public Iterable<?> get(final Iterable<String> 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);
}
Modified: tuscany/sca-cpp/trunk/modules/json/json-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/json-test.cpp?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/json-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/json/json-test.cpp Wed Oct 20 04:59:59 2010
@@ -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<value> r = content(readJSON(mklist(f), cx));
const list<value> v = elementsToValues(r);
const list<value> e = valuesToElements(v);
Modified: tuscany/sca-cpp/trunk/modules/python/server-test.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/server-test.py?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/server-test.py (original)
+++ tuscany/sca-cpp/trunk/modules/python/server-test.py Wed Oct 20 04:59:59 2010
@@ -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):
Modified: tuscany/sca-cpp/trunk/modules/server/htdocs/test/entry.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/htdocs/test/entry.xml?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/htdocs/test/entry.xml (original)
+++ tuscany/sca-cpp/trunk/modules/server/htdocs/test/entry.xml Wed Oct 20 04:59:59 2010
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111"/></entry>
+<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111"/></entry>
Modified: tuscany/sca-cpp/trunk/modules/server/htdocs/test/feed.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/htdocs/test/feed.xml?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/htdocs/test/feed.xml (original)
+++ tuscany/sca-cpp/trunk/modules/server/htdocs/test/feed.xml Wed Oct 20 04:59:59 2010
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title type="text">Sample Feed</title><id>123456789</id><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111"/></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>222</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Orange</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>3.55</price></item></content><link href="222"/></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>333</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Pear</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>1.55</price></item></content
><link href="333"/></entry></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title type="text">Sample Feed</title><id>123456789</id><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111"/></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>222</id><content type="application/xml"><item><name>Orange</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>3.55</price></item></content><link href="222"/></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>333</id><content type="application/xml"><item><name>Pear</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>1.55</price></item></content><link href="333"/></entry></feed>
Modified: tuscany/sca-cpp/trunk/modules/server/server-test.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-test.scm?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-test.scm (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-test.scm Wed Oct 20 04:59:59 2010
@@ -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)
Modified: tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml Wed Oct 20 04:59:59 2010
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
-<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111" /></entry>
+<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111" /></entry>
Modified: tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml Wed Oct 20 04:59:59 2010
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title type="text">Sample Feed</title><id>123456789</id><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111" /></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>222</id><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Orange</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>3.55</price></item></content><link href="222" /></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>333</id><content type="application/xml"><item>('name', 'Pear')<javaClass>services.Item</javaClass><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>1.55</price></item></conten
t><link href="333" /></entry></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title type="text">Sample Feed</title><id>123456789</id><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>111</id><content type="application/xml"><item><name>Apple</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>2.99</price></item></content><link href="111" /></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>222</id><content type="application/xml"><item><name>Orange</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>3.55</price></item></content><link href="222" /></entry><entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><id>333</id><content type="application/xml"><item><name>Pear</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>1.55</price></item></content><link href="333" /></entry></feed>
Modified: tuscany/sca-cpp/trunk/modules/wsgi/server-test.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/server-test.py?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/server-test.py (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/server-test.py Wed Oct 20 04:59:59 2010
@@ -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):
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/fruits-catalog.py Wed Oct 20 04:59:59 2010
@@ -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)))
)
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/fruits-catalog.py Wed Oct 20 04:59:59 2010
@@ -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)))
)
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp Wed Oct 20 04:59:59 2010
@@ -47,7 +47,7 @@ struct convert {
const list<value> mkfruit(const string& name, const string& code, const string& symbol, const double price) {
return list<value>() +
- mklist<value>("javaClass", string("services.Item")) + mklist<value>("name", name) + mklist<value>("currencyCode", code) + mklist<value>("currencySymbol", symbol) + mklist<value>("price", price);
+ mklist<value>("name", name) + mklist<value>("currencyCode", code) + mklist<value>("currencySymbol", symbol) + mklist<value>("price", price);
}
const failable<value> getcatalog(const lambda<value(const list<value>&)> converter, const lambda<value(const list<value>&)> currencyCode) {
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/getcatalog-result.txt Wed Oct 20 04:59:59 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/items-result.txt Wed Oct 20 04:59:59 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/test/shopping-cart-entry.xml Wed Oct 20 04:59:59 2010
@@ -1 +1 @@
-<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml"><item><javaClass>services.Item</javaClass><name>Orange</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>3.55</price></item></content></entry>
+<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml"><item><name>Orange</name><currencyCode>USD</currencyCode><currencySymbol>$</currencySymbol><price>3.55</price></item></content></entry>
Modified: tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -102,7 +102,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt (original)
+++ tuscany/sca-cpp/trunk/samples/store-gae/htdocs/test/items-result.txt Wed Oct 20 04:59:59 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java Wed Oct 20 04:59:59 2010
@@ -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))));
}
}
Modified: tuscany/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm (original)
+++ tuscany/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm Wed Oct 20 04:59:59 2010
@@ -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)))
)
)
Modified: tuscany/sca-cpp/trunk/samples/store-nosql/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-nosql/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-nosql/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-nosql/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm Wed Oct 20 04:59:59 2010
@@ -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)))
)
)
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/script-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/script-test.cpp?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/script-test.cpp (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/script-test.cpp Wed Oct 20 04:59:59 2010
@@ -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)))"));
}
{
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/script-test.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/script-test.scm?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/script-test.scm (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/script-test.scm Wed Oct 20 04:59:59 2010
@@ -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))
)
)
Modified: tuscany/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm Wed Oct 20 04:59:59 2010
@@ -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)))
)
)
Modified: tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/fruits-catalog.py Wed Oct 20 04:59:59 2010
@@ -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)))
)
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/fruits-catalog.py Wed Oct 20 04:59:59 2010
@@ -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)))
)
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html?rev=1024521&r1=1024520&r2=1024521&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html Wed Oct 20 04:59:59 2010
@@ -87,7 +87,6 @@ function addToCart() {
if (items[i].checked) {
var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +
'<item>' +
- '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
'<name>' + catalogItems[i].name + '</name>' +
'<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
'<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +