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/01/11 09:29:18 UTC
svn commit: r897785 - in /tuscany/sca-cpp/trunk: etc/ modules/json/
modules/python/ modules/server/ test/store-python/
test/store-python/htdocs/ test/store-scheme/ test/store-scheme/htdocs/
Author: jsdelfino
Date: Mon Jan 11 08:29:17 2010
New Revision: 897785
URL: http://svn.apache.org/viewvc?rev=897785&view=rev
Log:
Minor fixes to server and python evaluator to get python store working. Some changes to python and scheme store test cases to simplify them a bit and make them consistent. Enabled a few more server test combinations.
Added:
tuscany/sca-cpp/trunk/test/store-python/server-test
- copied, changed from r896332, tuscany/sca-cpp/trunk/test/store-python/store-composite-test
tuscany/sca-cpp/trunk/test/store-scheme/script-test.cpp
- copied, changed from r896332, tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.cpp
tuscany/sca-cpp/trunk/test/store-scheme/script-test.scm
- copied, changed from r896332, tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.scm
tuscany/sca-cpp/trunk/test/store-scheme/server-test
- copied, changed from r896332, tuscany/sca-cpp/trunk/test/store-scheme/store-composite-test
Removed:
tuscany/sca-cpp/trunk/test/store-python/store-composite-test
tuscany/sca-cpp/trunk/test/store-scheme/store-composite-test
tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.cpp
tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.scm
Modified:
tuscany/sca-cpp/trunk/etc/git-exclude
tuscany/sca-cpp/trunk/modules/json/json.hpp
tuscany/sca-cpp/trunk/modules/python/eval.hpp
tuscany/sca-cpp/trunk/modules/server/client-test.cpp
tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp
tuscany/sca-cpp/trunk/modules/server/server-test.py
tuscany/sca-cpp/trunk/test/store-python/Makefile.am
tuscany/sca-cpp/trunk/test/store-python/currency-converter.py
tuscany/sca-cpp/trunk/test/store-python/fruits-catalog.py
tuscany/sca-cpp/trunk/test/store-python/htdocs/store.html
tuscany/sca-cpp/trunk/test/store-python/shopping-cart.py
tuscany/sca-cpp/trunk/test/store-python/store.py
tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am
tuscany/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm
tuscany/sca-cpp/trunk/test/store-scheme/htdocs/store.html
tuscany/sca-cpp/trunk/test/store-scheme/shopping-cart.scm
tuscany/sca-cpp/trunk/test/store-scheme/store.scm
Modified: tuscany/sca-cpp/trunk/etc/git-exclude
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/etc/git-exclude?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/etc/git-exclude (original)
+++ tuscany/sca-cpp/trunk/etc/git-exclude Mon Jan 11 08:29:17 2010
@@ -75,7 +75,5 @@
mcache-client-test
curl-test
scdl-test
-store-function-test
-store-object-test
-store-script-test
+script-test
Modified: tuscany/sca-cpp/trunk/modules/json/json.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/json.hpp?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/json.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/json/json.hpp Mon Jan 11 08:29:17 2010
@@ -381,6 +381,18 @@
return writeJSON(valuesToElements(mklist<value>(mklist<value>("id", id), mklist<value>("result", val))), cx);
}
+/**
+ * Return a portable function name from a JSON-RPC function name.
+ * Strip the "system." and "Service." prefixes added by some JSON-RPC clients.
+ */
+const string funcName(const string& f) {
+ if (length(f) > 7 && find(f, "system.", 0) == 0)
+ return c_str(f) + 7;
+ if (length(f) > 8 && find(f, "Service.", 0) == 0)
+ return c_str(f) + 8;
+ return f;
+}
+
}
}
Modified: tuscany/sca-cpp/trunk/modules/python/eval.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/eval.hpp?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/eval.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/python/eval.hpp Mon Jan 11 08:29:17 2010
@@ -152,7 +152,7 @@
case value::Bool:
return (bool)v? Py_True : Py_False;
default:
- return NULL;
+ return Py_None;
}
}
Modified: tuscany/sca-cpp/trunk/modules/server/client-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/client-test.cpp?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/client-test.cpp Mon Jan 11 08:29:17 2010
@@ -86,7 +86,7 @@
const bool testEval() {
testEval("http://localhost:8090/test");
- //testEval("http://localhost:8090/cpp");
+ testEval("http://localhost:8090/cpp");
testEval("http://localhost:8090/python");
return true;
}
@@ -129,7 +129,7 @@
const bool testEvalPerf() {
testEvalPerf("Scheme", "http://localhost:8090/test");
- //testEvalPerf("C++", "http://localhost:8090/cpp");
+ testEvalPerf("C++", "http://localhost:8090/cpp");
testEvalPerf("Python", "http://localhost:8090/python");
return true;
}
@@ -147,7 +147,7 @@
const bool testPost() {
testPost("http://localhost:8090/test");
- //testPost("http://localhost:8090/cpp");
+ testPost("http://localhost:8090/cpp");
testPost("http://localhost:8090/python");
return true;
}
@@ -193,7 +193,7 @@
const bool testPostPerf() {
testPostPerf("Scheme", "http://localhost:8090/test");
- //testPostPerf("C++", "http://localhost:8090/cpp");
+ testPostPerf("C++", "http://localhost:8090/cpp");
testPostPerf("Python", "http://localhost:8090/python");
return true;
}
@@ -252,16 +252,16 @@
const bool testPostThreadPerf() {
testPostThreadPerf("Scheme", "http://localhost:8090/test");
- //testPostThreadPerf("C++", "http://localhost:8090/cpp");
- //testPostThreadPerf("Python", "http://localhost:8090/python");
+ testPostThreadPerf("C++", "http://localhost:8090/cpp");
+ testPostThreadPerf("Python", "http://localhost:8090/python");
return true;
}
#else
-const bool postProc(const int count, const value& val) {
+const bool postProc(const string& uri, const int count, const value& val) {
http::CURLSession ch;
- const lambda<bool()> pl = postLoop(val, ch);
+ const lambda<bool()> pl = postLoop(uri, val, ch);
time(pl, 0, count);
return true;
}
@@ -316,9 +316,9 @@
}
const bool testPostForkPerf() {
- testPostThreadPerf("Scheme", "http://localhost:8090/test");
- //testPostThreadPerf("C++", "http://localhost:8090/cpp");
- testPostThreadPerf("Python", "http://localhost:8090/python");
+ testPostForkPerf("Scheme", "http://localhost:8090/test");
+ //testPostForkPerf("C++", "http://localhost:8090/cpp");
+ testPostForkPerf("Python", "http://localhost:8090/python");
return true;
}
@@ -363,18 +363,18 @@
tuscany::cout << "Testing..." << tuscany::endl;
tuscany::server::testGet();
- tuscany::server::testGetPerf();
tuscany::server::testPost();
+ tuscany::server::testPut();
+ tuscany::server::testDel();
+ tuscany::server::testEval();
+ tuscany::server::testGetPerf();
tuscany::server::testPostPerf();
#ifdef _REENTRANT
tuscany::server::testPostThreadPerf();
#else
tuscany::server::testPostForkPerf();
#endif
- tuscany::server::testEval();
tuscany::server::testEvalPerf();
- tuscany::server::testPut();
- tuscany::server::testDel();
tuscany::cout << "OK" << tuscany::endl;
Modified: tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp Mon Jan 11 08:29:17 2010
@@ -100,7 +100,7 @@
// Extract the request id, method and params
const value id = cadr(ia);
- const value func = c_str(string(cadr(ma)));
+ const value func = c_str(json::funcName(string(cadr(ma))));
// Apply the requested function
const failable<value> val = failableResult(impl(cons(func, httpd::queryParams(args))));
@@ -145,7 +145,7 @@
// Extract the request id, method and params
const value id = cadr(assoc(value("id"), args));
- const value func = c_str(cadr(assoc(value("method"), args)));
+ const value func = c_str(json::funcName(cadr(assoc(value("method"), args))));
const list<value> params = (list<value>)cadr(assoc(value("params"), args));
// Evaluate the request expression
Modified: tuscany/sca-cpp/trunk/modules/server/server-test.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-test.py?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-test.py (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-test.py Mon Jan 11 08:29:17 2010
@@ -5,6 +5,16 @@
# ATOMPub test case
+def getall():
+ 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))))
+
+def get(id):
+ entry = (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", "USD"), ("'currencySymbol", "$"), ("'price", 2.99))
+ return ("Item", id, entry)
+
def post(entry):
return "123456789"
Modified: tuscany/sca-cpp/trunk/test/store-python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/Makefile.am?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-python/Makefile.am Mon Jan 11 08:29:17 2010
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-TESTS = store-composite-test
+TESTS = server-test
Modified: tuscany/sca-cpp/trunk/test/store-python/currency-converter.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/currency-converter.py?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/currency-converter.py (original)
+++ tuscany/sca-cpp/trunk/test/store-python/currency-converter.py Mon Jan 11 08:29:17 2010
@@ -1,14 +1,12 @@
# Currency converter implementation
def convert(fr, to, amount):
- if (to == "EUR")
+ if to == "EUR":
return amount * 0.70
- else
- return amount
+ return amount
def symbol(currency):
- if (currency == "EUR")
+ if currency == "EUR":
return "E"
- else
- return "$"
+ return "$"
Modified: tuscany/sca-cpp/trunk/test/store-python/fruits-catalog.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/fruits-catalog.py?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/fruits-catalog.py (original)
+++ tuscany/sca-cpp/trunk/test/store-python/fruits-catalog.py Mon Jan 11 08:29:17 2010
@@ -3,17 +3,15 @@
def get(converter):
def convert(price):
return converter("convert", "USD", "USD", price)
- code = "USD")
+ code = "USD"
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)))
+ (("'javaClass", "services.Item"), ("'name", "Pear"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55)))
)
# TODO remove these JSON-RPC specific functions
-def system.listMethods(converter):
- return ("Service.get")
-
-Service.get = get
+def listMethods(converter):
+ return ("Service.get",)
Modified: tuscany/sca-cpp/trunk/test/store-python/htdocs/store.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/htdocs/store.html?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/htdocs/store.html (original)
+++ tuscany/sca-cpp/trunk/test/store-python/htdocs/store.html Mon Jan 11 08:29:17 2010
@@ -51,7 +51,7 @@
catalogItems = items;
// TEMP
- shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+ shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
}
function shoppingCart_getResponse(feed) {
@@ -68,7 +68,7 @@
if (entries.length != 0) {
try {
- shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+ shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
}
catch(e){
alert(e);
Copied: tuscany/sca-cpp/trunk/test/store-python/server-test (from r896332, tuscany/sca-cpp/trunk/test/store-python/store-composite-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/server-test?p2=tuscany/sca-cpp/trunk/test/store-python/server-test&p1=tuscany/sca-cpp/trunk/test/store-python/store-composite-test&r1=896332&r2=897785&rev=897785&view=diff
==============================================================================
(empty)
Modified: tuscany/sca-cpp/trunk/test/store-python/shopping-cart.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/shopping-cart.py?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/shopping-cart.py (original)
+++ tuscany/sca-cpp/trunk/test/store-python/shopping-cart.py Mon Jan 11 08:29:17 2010
@@ -1,77 +1,65 @@
# Shopping cart implementation
+import uuid
+import sys
cartId = "1234"
-#TODO finish conversion from scheme to python
-
# Get the shopping cart from the cache
# Return an empty cart if not found
-(define (getcart id cache)
- (define cart (cache "get" id))
- (if (nul cart)
- (list)
- cart)
-)
+def getcart(id, cache):
+ cart = cache("get", id)
+ if cart is None:
+ return ()
+ return cart
# Post a new item to the cart, create a new cart if necessary
-(define (post item cache)
- (define id (uuid))
- (define newItem (list (car item) id (caddr item)))
- (define cart (cons newItem (getcart cartId cache)))
- (cache "put" cartId cart)
- id
-)
+def post(item, cache):
+ id = str(uuid.uuid1())
+ cart = ((item[0], id, item[2]),) + getcart(cartId, cache)
+ cache("put", cartId, cart)
+ return id
# Return the content of the cart
-(define (getall cache)
- (cons "Your Cart" (cons cartId (getcart cartId cache)))
-)
+def getall(cache):
+ return ("Your Cart", cartId) + getcart(cartId, cache)
# Find an item in the cart
-(define (find id cart)
- (if (nul cart)
- (cons "Item" (list "0" (list)))
- (if (= id (cadr (car cart)))
- (car cart)
- (find id (cdr cart))))
-)
+def find(id, cart):
+ if cart == ():
+ return ("Item", "0", ())
+ elif id == cart[0][1]:
+ return cart[0]
+ else:
+ return find(id, cart[1:])
# Get an item from the cart
-(define (get id cache)
- (find id (getcart cartId cache))
-)
+def get(id, cache):
+ return find(id, getcart(cartId, cache))
# Delete the whole cart
-(define (deleteall cache)
- (cache "delete" cartId)
-)
+def deleteall(cache):
+ return cache("delete", cartId)
# Delete an item from the cart
-(define (delete id cache)
- true
-)
+def delete(id, cache):
+ return true
# Return the price of an item
-(define (price item)
- (cadr (assoc 'price (caddr item)))
-)
+def price(item):
+ return float(filter(lambda x: x[0] == "'price", item[2])[0][1])
# Sum the prices of a list of items
-(define (sum items)
- (if (nul items)
- 0
- (+ (price (car items)) (sum (cdr items))))
-)
+def sum(items):
+ if items == ():
+ return 0
+ return price(items[0]) + sum(items[1:])
# Return the total price of the items in the cart
-(define (gettotal cache)
- (define cart (getcart cartId cache))
- (sum cart)
-)
+def gettotal(cache):
+ cart = getcart(cartId, cache)
+ return sum(cart)
# TODO remove these JSON-RPC specific functions
-def system.listMethods(cache):
- return ("Service.getTotal")
-
-Service.getTotal = gettotal
+def listMethods(cache):
+ return ("Service.gettotal",)
Modified: tuscany/sca-cpp/trunk/test/store-python/store.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/store.py?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/store.py (original)
+++ tuscany/sca-cpp/trunk/test/store-python/store.py Mon Jan 11 08:29:17 2010
@@ -22,9 +22,6 @@
return shoppingCart("delete", id)
# TODO remove these JSON-RPC specific functions
-def system.listMethods(catalog, shoppingCart, shoppingTotal):
- return ("Service.get", "Service.getTotal")
-
-Service.getCatalog = getcatalog
-Service.getTotal = gettotal
+def listMethods(catalog, shoppingCart, shoppingTotal):
+ return ("Service.get", "Service.gettotal")
Modified: tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am Mon Jan 11 08:29:17 2010
@@ -15,12 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-noinst_PROGRAMS = store-script-test
+noinst_PROGRAMS = script-test
INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE}
-store_script_test_SOURCES = store-script-test.cpp
-store_script_test_LDADD = -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs
-
-TESTS = store-script-test store-composite-test
+script_test_SOURCES = script-test.cpp
+script_test_LDADD = -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs
+
+TESTS = script-test server-test
Modified: tuscany/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm Mon Jan 11 08:29:17 2010
@@ -12,6 +12,5 @@
)
; TODO remove these JSON-RPC specific functions
-(define (system.listMethods converter) (list "Service.get"))
-(define Service.get get)
+(define (listMethods converter) (list "Service.get"))
Modified: tuscany/sca-cpp/trunk/test/store-scheme/htdocs/store.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/htdocs/store.html?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/htdocs/store.html (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/htdocs/store.html Mon Jan 11 08:29:17 2010
@@ -51,7 +51,7 @@
catalogItems = items;
// TEMP
- shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+ shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
}
function shoppingCart_getResponse(feed) {
@@ -68,7 +68,7 @@
if (entries.length != 0) {
try {
- shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+ shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
}
catch(e){
alert(e);
Copied: tuscany/sca-cpp/trunk/test/store-scheme/script-test.cpp (from r896332, tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/script-test.cpp?p2=tuscany/sca-cpp/trunk/test/store-scheme/script-test.cpp&p1=tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.cpp&r1=896332&r2=897785&rev=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.cpp (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/script-test.cpp Mon Jan 11 08:29:17 2010
@@ -39,7 +39,7 @@
bool testScript() {
gc_scoped_pool pool;
- ifstream is("store-script-test.scm");
+ ifstream is("script-test.scm");
ostringstream os;
scheme::evalDriverRun(is, os);
assert(contains(str(os), "(\"Sample Feed\" \""));
@@ -52,7 +52,7 @@
bool testEval() {
{
gc_scoped_pool pool;
- ifstream is("store-script-test.scm");
+ ifstream is("script-test.scm");
ostringstream os;
scheme::setupDisplay(os);
scheme::Env globalEnv = scheme::setupEnvironment();
@@ -66,7 +66,7 @@
{
gc_scoped_pool pool;
- ifstream is("store-script-test.scm");
+ ifstream is("script-test.scm");
ostringstream os;
scheme::setupDisplay(os);
Copied: tuscany/sca-cpp/trunk/test/store-scheme/script-test.scm (from r896332, tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.scm)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/script-test.scm?p2=tuscany/sca-cpp/trunk/test/store-scheme/script-test.scm&p1=tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.scm&r1=896332&r2=897785&rev=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/store-script-test.scm (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/script-test.scm Mon Jan 11 08:29:17 2010
@@ -121,29 +121,3 @@
(display (storeui_service "getall" added2))
(display (storeui_service "gettotal"))
-; Store UI JSON-RPC interop test case
-
-(define (system.listMethods) (list "Service.get" "Service.getTotal"))
-
-(define (Service.get) (storeui_service "getcatalog"))
-
-(define (.get) (storeui_service "getcatalog"))
-
-(define (Service.getTotal) (storeui_service "gettotal"))
-
-; Store UI ATOMPub interop test case
-
-(define (getall) (storeui_service "getall" added2))
-
-(define (get id) (storeui_service "getentry" id))
-
-(define (post entry)
- (display entry)
- (uuid)
-)
-
-(define (delete id)
- (display id)
- true
-)
-
Copied: tuscany/sca-cpp/trunk/test/store-scheme/server-test (from r896332, tuscany/sca-cpp/trunk/test/store-scheme/store-composite-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/server-test?p2=tuscany/sca-cpp/trunk/test/store-scheme/server-test&p1=tuscany/sca-cpp/trunk/test/store-scheme/store-composite-test&r1=896332&r2=897785&rev=897785&view=diff
==============================================================================
(empty)
Modified: tuscany/sca-cpp/trunk/test/store-scheme/shopping-cart.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/shopping-cart.scm?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/shopping-cart.scm (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/shopping-cart.scm Mon Jan 11 08:29:17 2010
@@ -68,6 +68,5 @@
)
; TODO remove these JSON-RPC specific functions
-(define (system.listMethods cache) (list "Service.getTotal"))
-(define Service.getTotal gettotal)
+(define (listMethods cache) (list "Service.gettotal"))
Modified: tuscany/sca-cpp/trunk/test/store-scheme/store.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/store.scm?rev=897785&r1=897784&r2=897785&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/store.scm (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/store.scm Mon Jan 11 08:29:17 2010
@@ -29,7 +29,5 @@
)
; TODO remove these JSON-RPC specific functions
-(define (system.listMethods catalog shoppingCart shoppingTotal) (list "Service.get" "Service.getTotal"))
-(define Service.getCatalog getcatalog)
-(define Service.getTotal gettotal)
+(define (listMethods catalog shoppingCart shoppingTotal) (list "Service.getcatalog" "Service.gettotal"))