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

4 files changed, 9 insertions, 10 deletions

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 = '<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>' +

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))
   )
 )