Author: jsdelfino
Date: Sun Oct 11 00:01:09 2009
New Revision: 823982
URL: http://svn.apache.org/viewvc?rev=823982&view=rev
Log:
Added support for JSON-RPC to httpd module. Fixed issues with double numbers in
json.hpp. Added store .html and .js files to store test case.
Added:
tuscany/cpp/sca/test/store-script/htdocs/
tuscany/cpp/sca/test/store-script/htdocs/.htaccess
- copied, changed from r823981, tuscany/cpp/sca/modules/httpd/Makefile.am
tuscany/cpp/sca/test/store-script/htdocs/store.html
tuscany/cpp/sca/test/store-script/htdocs/store.js
tuscany/cpp/sca/test/store-script/store.scm
- copied, changed from r823981,
tuscany/cpp/sca/test/store-script/store-script.scm
Removed:
tuscany/cpp/sca/test/store-script/store-script.scm
Modified:
tuscany/cpp/sca/modules/httpd/Makefile.am
tuscany/cpp/sca/modules/httpd/mod.cpp
tuscany/cpp/sca/modules/json/json-test.cpp
tuscany/cpp/sca/modules/json/json.hpp
tuscany/cpp/sca/test/store-script/store-script-test.cpp
Modified: tuscany/cpp/sca/modules/httpd/Makefile.am
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/modules/httpd/Makefile.am?rev=823982&r1=823981&r2=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/modules/httpd/Makefile.am (original)
+++ tuscany/cpp/sca/modules/httpd/Makefile.am Sun Oct 11 00:01:09 2009
@@ -18,7 +18,7 @@
libdir=$(prefix)/lib
lib_LTLIBRARIES = libmod_tuscany.la
-INCLUDES = -I. -I$(top_builddir)/kernel -I${HTTPD_INCLUDE} -I${APR_INCLUDE}
+INCLUDES = -I. -I$(top_builddir)/kernel -I${HTTPD_INCLUDE} -I${APR_INCLUDE}
-I${LIBXML2_INCLUDE} -I${LIBMOZJS_INCLUDE}
libmod_tuscany_la_SOURCES = mod.cpp
-libmod_tuscany_la_LIBADD = -lpthread
+libmod_tuscany_la_LIBADD = -lpthread -L${LIBXML2_LIB} -lxml2 -L${LIBMOZJS_LIB}
-lmozjs
Modified: tuscany/cpp/sca/modules/httpd/mod.cpp
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/modules/httpd/mod.cpp?rev=823982&r1=823981&r2=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/modules/httpd/mod.cpp (original)
+++ tuscany/cpp/sca/modules/httpd/mod.cpp Sun Oct 11 00:01:09 2009
@@ -26,6 +26,7 @@
#include <string>
#include <iostream>
#include <sstream>
+#include <fstream>
#include "apr_strings.h"
#include "apr_fnmatch.h"
@@ -48,6 +49,10 @@
#include "list.hpp"
#include "slist.hpp"
+#include "value.hpp"
+#include "monad.hpp"
+#include "../json/json.hpp"
+#include "../eval/driver.hpp"
extern "C" {
extern module AP_MODULE_DECLARE_DATA mod_tuscany;
@@ -66,13 +71,38 @@
* Directory configuration.
*/
struct DirConf {
- const char* root;
- const char* path;
- const char* uri;
+ const char* contribution;
const char* component;
+ const char* implementation;
};
/**
+ * Returns the server conf for a request.
+ */
+const ServerConf& serverConf(const request_rec* r) {
+ return *(ServerConf*)ap_get_module_config(r->server->module_config,
&mod_tuscany);
+}
+const std::string home(request_rec* r) {
+ return serverConf(r).home;
+}
+
+/**
+ * Returns the dir conf for a request.
+ */
+const DirConf& dirConf(const request_rec* r) {
+ return *(DirConf*)ap_get_module_config(r->per_dir_config, &mod_tuscany);
+}
+const std::string contribution(request_rec* r) {
+ return dirConf(r).contribution;
+}
+const std::string component(request_rec* r) {
+ return dirConf(r).component;
+}
+const std::string implementation(request_rec* r) {
+ return dirConf(r).implementation;
+}
+
+/**
* Returns an HTTP request path as a list of strings.
*/
const list<std::string> path(const request_rec* r) {
@@ -83,17 +113,6 @@
}
/**
- * Returns an HTTP query string as a list of lists of strings.
- */
-const list<list<std::string> > args(const request_rec* r) {
- const char* a = r->args;
- if (a == NULL)
- return list<list<std::string> >();
- const lambda<list<std::string>(std::string, std::string)> tok(tokenize);
- return map(curry(tok, std::string("=")), tokenize("&", a));
-}
-
-/**
* Log HTTP request info to standard out for now, for debugging purposes.
*/
bool logRequests = true;
@@ -109,12 +128,11 @@
return s;
}
-const bool logRequest(request_rec* r, const ServerConf& sc, const DirConf& dc)
{
+const bool logRequest(request_rec* r) {
std::cout << "mod-tuscany..." << std::endl;
- std::cout << "tuscany home: " << sc.home << std::endl;
- std::cout << "tuscany root: " << dc.root << std::endl;
- std::cout << "tuscany path: " << dc.path << std::endl;
- std::cout << "component: " << dc.component << std::endl;
+ std::cout << "tuscany home: " << home(r) << std::endl;
+ std::cout << "contribution: " << contribution(r) << std::endl;
+ std::cout << "component: " << component(r) << std::endl;
std::cout << "protocol: " << optional(r->protocol) << std::endl;
std::cout << "method: " << optional(r->method) << std::endl;
std::cout << "method number: " << r->method_number << std::endl;
@@ -124,41 +142,172 @@
std::cout << "uri: " << optional(r->uri) << std::endl;
std::cout << "path info: " << optional(r->path_info) << std::endl;
std::cout << "path: " << path(r) << std::endl;
- std::cout << "args info: " << optional(r->args) << std::endl;
- std::cout << "args: " << args(r) << std::endl;
+ std::cout << "args: " << optional(r->args) << std::endl;
+ std::cout.flush();
return true;
}
+const value evalLoop(std::istream& is, const value& req, Env& globalEnv) {
+ value in = read(is);
+ if (isNil(in))
+ return eval(req, globalEnv);
+ eval(in, globalEnv);
+ return evalLoop(is, req, globalEnv);
+}
+
+/**
+ * Returns a list of key value pairs from the args in a query string.
+ */
+const list<value> queryArg(std::string s) {
+ const list<std::string> t = tokenize("=", s);
+ return makeList<value>(car(t).c_str(), cadr(t));
+}
+
+const list<list<value> > queryArgs(const request_rec* r) {
+ const char* a = r->args;
+ if (a == NULL)
+ return list<list<value> >();
+ return map<std::string, list<value>>(queryArg, tokenize("&", a));
+}
+
+/**
+ * Returns a list of param values other than the id and method args from a list
+ * of key value pairs.
+ */
+const list<value> queryParams(list<list<value> > a) {
+ if (isNil(a))
+ return list<value>();
+ if (car(a) == value("id") || car(a) == value("method"))
+ return queryParams(cdr(a));
+ return cons(cadr(car(a)), queryParams(cdr(a)));
+}
+
/**
* Handle an HTTP GET request.
*/
const int get(request_rec* r) {
- std::string str("<result>OK</result>");
- if (false) {
- r->status = HTTP_NOT_FOUND;
- return OK;
- }
- // Handle a conditional GET
- std::string etag(ap_md5(r->pool, (const unsigned char*)str.c_str()));
+ // Setup the script evaluator
+ Env globalEnv = setupEnvironment();
+ std::ostringstream nullos;
+ setupEvalOut(nullos);
+
+ // Open the component implementation
+ const std::string impl = contribution(r) + implementation(r);
+ std::ifstream is(impl.c_str(), std::ios_base::in);
+ if (is.fail() || is.bad())
+ return HTTP_NOT_FOUND;
+
+ // Extract the request id, method and params from the query string
+ const list<list<value> > args = queryArgs(r);
+ const value id = cadr(assoc(value("id"), args));
+ const value method = std::string(cadr(assoc(value("method"),
args))).c_str();
+ const list<value> params = queryParams(args);
+
+ // Build expr to evaluate
+ const value expr = cons<value>(method, params);
+ std::cout<< "expr: " << expr << std::endl;
+ std::cout.flush();
+
+ // Evaluate the expr
+ const tuscany::value val = evalLoop(is, expr, globalEnv);
+ if (isNil(val))
+ return HTTP_INTERNAL_SERVER_ERROR;
+ std::cout<< "val: " << val << std::endl;
+ std::cout.flush();
+
+ // Convert the expr value to JSON
+ const JSONContext cx;
+ failable<list<std::string>, std::string> jsval = writeJSON(cx,
makeList<value>(makeList<value>("id", id), makeList<value>("result", val)));
+ if (!hasValue(jsval))
+ return HTTP_INTERNAL_SERVER_ERROR;
+
+ // Send the response
+ ap_set_content_type(r, "application/json-rpc");
+ std::ostringstream os;
+ write(jsval, os);
+ std::string sval = os.str();
+ std::string etag(ap_md5(r->pool, (const unsigned char*)sval.c_str()));
const char* match = apr_table_get(r->headers_in, "If-None-Match");
- if (match != NULL && etag == match) {
+ if (match != NULL && etag == match)
r->status = HTTP_NOT_MODIFIED;
- return OK;
- }
-
- // Send response
- ap_set_content_type(r, "text/xml");
apr_table_setn(r->headers_out, "ETag", etag.c_str());
- ap_rputs(str.c_str(), r);
+ ap_rputs(sval.c_str(), r);
return OK;
}
/**
+ * Read the content of a POST.
+ */
+const list<std::string> read(request_rec* r) {
+ char b[2048];
+ const int n = ap_get_client_block(r, b, 2048);
+ if (n <= 0)
+ return list<std::string>();
+ return cons(std::string(b, n), read(r));
+}
+
+/**
+ * Converts the args received in a POST to a list of key value pairs.
+ */
+const list<list<value> > postArgs(list<value> a) {
+ if (isNil(a))
+ return list<list<value> >();
+ const list<value> l = car(a);
+ return cons(l, postArgs(cdr(a)));
+}
+
+/**
* Handle an HTTP POST request.
*/
const int post(request_rec* r) {
+
+ // Setup the script evaluator
+ Env globalEnv = setupEnvironment();
+ std::ostringstream nullos;
+ setupEvalOut(nullos);
+
+ // Open the component implementation
+ const std::string impl = contribution(r) + implementation(r);
+ std::ifstream is(impl.c_str(), std::ios_base::in);
+ if (is.fail() || is.bad())
+ return HTTP_NOT_FOUND;
+
+ // Read the JSON request
+ const list<std::string> req = read(r);
+ JSONContext cx;
+ const list<value> json = readJSON(cx, req);
+ const list<list<value> > args = postArgs(json);
+
+ // Extract the request id, method and params
+ const value id = cadr(assoc(value("id"), args));
+ const value method = std::string(cadr(assoc(value("method"),
args))).c_str();
+ const list<value> params = (list<value>)cadr(assoc(value("params"), args));
+
+ // Build expr to evaluate
+ const value expr = cons<value>(method, params);
+ std::cout<< "expr: " << expr << std::endl;
+ std::cout.flush();
+
+ // Evaluate the expr
+ const tuscany::value val = evalLoop(is, expr, globalEnv);
+ if (isNil(val))
+ return HTTP_INTERNAL_SERVER_ERROR;
+ std::cout<< "val: " << val << std::endl;
+ std::cout.flush();
+
+ // Convert the expr value to JSON
+ failable<list<std::string>, std::string> jsval = writeJSON(cx,
makeList<value>(makeList<value>("id", id), makeList<value>("result", val)));
+ if (!hasValue(jsval))
+ return HTTP_INTERNAL_SERVER_ERROR;
+
+ // Send the JSON response
+ ap_set_content_type(r, "application/json-rpc");
+ std::ostringstream os;
+ write(jsval, os);
+ ap_rputs(os.str().c_str(), r);
+
return OK;
}
@@ -166,26 +315,6 @@
* Handle an HTTP PUT request.
*/
const int put(request_rec* r) {
- std::ostringstream sos;
- char buffer[2049];
- for ( ; ; )
- {
- int size = ap_get_client_block(r, buffer, 2048);
- if (size > 0)
- {
- buffer[size] = '\0';
- sos << buffer;
- }
- else if (size == 0)
- {
- break;
- }
- else if (size < 0)
- {
- return HTTP_INTERNAL_SERVER_ERROR;
- }
- }
- std::string input = sos.str();
return OK;
}
@@ -203,13 +332,9 @@
if(strcmp(r->handler, "mod_tuscany"))
return DECLINED;
- // Get the server and dir config
- ServerConf& serverConf =
*(ServerConf*)ap_get_module_config(r->server->module_config, &mod_tuscany);
- DirConf& dirConf = *(DirConf*)ap_get_module_config(r->per_dir_config,
&mod_tuscany);
-
// Log the request
if(logRequests)
- logRequest(r, serverConf, dirConf);
+ logRequest(r);
// Set up the read policy
const int rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK);
@@ -220,10 +345,9 @@
r->chunked = true;
apr_table_setn(r->headers_out, "Connection", "close");
+ // Handle HTTP method
if (r->header_only)
return OK;
-
- // Handle HTTP method
if(r->method_number == M_GET)
return get(r);
if(r->method_number == M_POST)
@@ -243,31 +367,24 @@
conf->home = apr_pstrdup(cmd->pool, arg);
return NULL;
}
-const char *confPath(cmd_parms *cmd, void *c, const char *arg) {
+const char *confContribution(cmd_parms *cmd, void *c, const char *arg) {
DirConf *conf = (DirConf*)c;
- conf->path = apr_pstrdup(cmd->pool, arg);
+ conf->contribution = apr_pstrdup(cmd->pool, arg);
return NULL;
}
-const char *confRoot(cmd_parms *cmd, void *c, const char *arg) {
- DirConf *conf = (DirConf*)c;
- conf->root = apr_pstrdup(cmd->pool, arg);
- return NULL;
-}
-const char *confURI(cmd_parms *cmd, void *c, const char *arg) {
+const char *confComponent(cmd_parms *cmd, void *c, const char *arg) {
DirConf *conf = (DirConf*)c;
- conf->uri = apr_pstrdup(cmd->pool, arg);
+ conf->component = apr_pstrdup(cmd->pool, arg);
return NULL;
}
-const char *confComponent(cmd_parms *cmd, void *c, const char *arg) {
+const char *confImplementation(cmd_parms *cmd, void *c, const char *arg) {
DirConf *conf = (DirConf*)c;
- conf->component = apr_pstrdup(cmd->pool, arg);
+ conf->implementation = apr_pstrdup(cmd->pool, arg);
return NULL;
}
void *makeDirConf(apr_pool_t *p, char *dirspec) {
DirConf* conf = (DirConf*)apr_palloc(p, sizeof(*conf));
- conf->path = "";
- conf->root = "";
- conf->uri = "";
+ conf->contribution = "";
conf->component = "";
return conf;
}
@@ -281,11 +398,10 @@
* HTTP server module declarations.
*/
const command_rec commands[] = {
- AP_INIT_TAKE1("home", (const char*(*)())confHome, NULL, RSRC_CONF,
"Tuscany home directory"),
- AP_INIT_TAKE1("path", (const char*(*)())confPath, NULL, ACCESS_CONF,
"Tuscany SCA composite search path"),
- AP_INIT_TAKE1("root", (const char*(*)())confRoot, NULL, ACCESS_CONF,
"Tuscany root SCA configuration path"),
- AP_INIT_TAKE1("uri", (const char*(*)())confURI, NULL, ACCESS_CONF,
"Tuscany SCA system base URI"),
- AP_INIT_TAKE1("component", (const char*(*)())confComponent, NULL,
ACCESS_CONF, "SCA component name"),
+ AP_INIT_TAKE1("TuscanyHome", (const char*(*)())confHome, NULL, RSRC_CONF,
"Tuscany home directory"),
+ AP_INIT_TAKE1("SCAContribution", (const char*(*)())confContribution, NULL,
ACCESS_CONF, "SCA contribution location"),
+ AP_INIT_TAKE1("SCAComponent", (const char*(*)())confComponent, NULL,
ACCESS_CONF, "SCA component name"),
+ AP_INIT_TAKE1("SCAImplementation", (const char*(*)())confImplementation,
NULL, ACCESS_CONF, "SCA component implementation"),
{NULL}
};
Modified: tuscany/cpp/sca/modules/json/json-test.cpp
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/modules/json/json-test.cpp?rev=823982&r1=823981&r2=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/modules/json/json-test.cpp (original)
+++ tuscany/cpp/sca/modules/json/json-test.cpp Sun Oct 11 00:01:09 2009
@@ -34,7 +34,7 @@
bool testJSEval() {
JSONContext cx;
- std::string script("(function testJSON(n){ return
JSON.parse(JSON.stringify(n)) })(5)");
+ const std::string script("(function testJSON(n){ return
JSON.parse(JSON.stringify(n)) })(5)");
jsval rval;
assert(JS_EvaluateScript(cx, cx.getGlobal(), script.c_str(),
script.length(), "testJSON.js", 1, &rval));
const std::string r(JS_GetStringBytes(JS_ValueToString(cx, rval)));
@@ -48,21 +48,20 @@
}
bool testJSON() {
- JSONContext cx;
+ const JSONContext cx;
- list<value> phones = makeList<value> (std::string("408-1234"),
std::string("650-1234"));
- list<value> l = makeList<value> (makeList<value> ("phones", phones),
makeList<value> ("lastName", std::string("test\ttab")), makeList<value>
("firstName", std::string("test1")));
+ const list<value> phones = makeList<value> (std::string("408-1234"),
std::string("650-1234"));
+ const list<value> l = makeList<value> (makeList<value> ("phones", phones),
makeList<value> ("lastName", std::string("test\ttab")), makeList<value>
("firstName", std::string("test1")));
print(l, std::cout);
std::cout << std::endl;
std::ostringstream os;
- lambda<std::ostringstream*(std::ostringstream*, std::string)>
writer(jsonWriter);
- writeJSON(cx, writer, &os, l);
+ writeJSON<std::ostringstream*>(cx, jsonWriter, &os, l);
std::cout << os.str() << std::endl;
std::istringstream is(os.str());
- list<std::string> il = makeStreamList(is);
- list<value> r = readJSON(cx, il);
+ const list<std::string> il = makeStreamList(is);
+ const list<value> r = readJSON(cx, il);
print(r, std::cout);
std::cout << std::endl;
assert(r == l);
@@ -74,6 +73,14 @@
return true;
}
+bool testJSONRPC() {
+ const std::string lm("{\"id\": 1, \"method\": \"system.listMethods\",
\"params\": []}");
+ JSONContext cx;
+ const list<value> v = readJSON(cx, makeList(lm));
+ std::cout << v << std::endl;
+ return true;
+}
+
}
int main() {
@@ -81,6 +88,7 @@
tuscany::testJSEval();
tuscany::testJSON();
+ tuscany::testJSONRPC();
std::cout << "OK" << std::endl;
Modified: tuscany/cpp/sca/modules/json/json.hpp
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/modules/json/json.hpp?rev=823982&r1=823981&r2=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/modules/json/json.hpp (original)
+++ tuscany/cpp/sca/modules/json/json.hpp Sun Oct 11 00:01:09 2009
@@ -32,6 +32,7 @@
#include <string>
#include "list.hpp"
#include "value.hpp"
+#include "monad.hpp"
namespace tuscany {
@@ -172,8 +173,9 @@
return value((bool)JSVAL_TO_BOOLEAN(jsv));
}
case JSTYPE_NUMBER: {
- jsdouble* jsd = JSVAL_TO_DOUBLE(jsv);
- return value((double)*jsd);
+ jsdouble jsd;
+ JS_ValueToNumber(cx, jsv, &jsd);
+ return value((double)jsd);
}
case JSTYPE_OBJECT: {
JSObject* o = JSVAL_TO_OBJECT(jsv);
@@ -191,39 +193,39 @@
/**
* Consumes JSON strings and populates a JS object.
*/
-bool consumeJSON(const JSONContext& cx, JSONParser* parser, const
list<std::string>& ilist) {
+failable<bool, std::string> consumeJSON(const JSONContext& cx, JSONParser*
parser, const list<std::string>& ilist) {
if (isNil(ilist))
return true;
JSString* jstr = JS_NewStringCopyZ(cx, car(ilist).c_str());
if(!JS_ConsumeJSONText(cx, parser, JS_GetStringChars(jstr),
JS_GetStringLength(jstr)))
- return false;
+ return "JS_ConsumeJSONText failed";
return consumeJSON(cx, parser, cdr(ilist));
}
/**
* Read JSON tokens from list of strings.
*/
-const list<value> readJSON(const JSONContext& cx, const list<std::string>&
ilist) {
+const failable<list<value>, std::string> readJSON(const JSONContext& cx, const
list<std::string>& ilist) {
jsval val;
JSONParser* parser = JS_BeginJSONParse(cx, &val);
if(parser == NULL)
- return list<value> ();
+ return std::string("JS_BeginJSONParse failed");
- bool ok = consumeJSON(cx, parser, ilist);
+ const failable<bool, std::string> consumed = consumeJSON(cx, parser,
ilist);
if(!JS_FinishJSONParse(cx, parser, JSVAL_NULL))
- return list<value> ();
- if(!ok)
- return list<value> ();
+ return std::string("JS_FinishJSONParse failed");
+ if(!hasValue(consumed))
+ return std::string(consumed);
- return jsValToValue(cx, val);
+ return list<value>(jsValToValue(cx, val));
}
/**
* Returns true if a list represents a JS array.
*/
const bool isJSArray(const list<value>& l) {
- if(l == list<value> ())
+ if(isNil(l))
return false;
value v = car(l);
if(isList(v)) {
@@ -240,8 +242,7 @@
*/
JSObject* valuesToJSElements(const JSONContext& cx, JSObject* a, const
list<value>& l, int i) {
const jsval valueToJSVal(const JSONContext& cx, const value& val);
-
- if (l == list<value>())
+ if (isNil(l))
return a;
jsval pv = valueToJSVal(cx, car(l));
JS_SetElement(cx, a, i, &pv);
@@ -253,8 +254,7 @@
*/
JSObject* valuesToJSProperties(const JSONContext& cx, JSObject* o, const
list<value>& l) {
const jsval valueToJSVal(const JSONContext& cx, const value& val);
-
- if(l == list<value> ())
+ if(isNil(l))
return o;
const list<value> p = car(l);
jsval pv = valueToJSVal(cx, cadr(p));
@@ -274,8 +274,7 @@
return BOOLEAN_TO_JSVAL((bool)val);
}
case value::Number: {
- jsdouble d = (double)val;
- return DOUBLE_TO_JSVAL(&d);
+ return DOUBLE_TO_JSVAL(JS_NewDouble(cx, (double)val));
}
case value::List: {
if (isJSArray(val)) {
@@ -312,12 +311,13 @@
}
/**
- * Write a list of values as a JSON document.
+ * Convert a list of values to a JSON document.
*/
-template<typename R> const R writeJSON(const JSONContext& cx, const
lambda<R(R, std::string)>& reduce, const R& initial, const list<value>& l) {
+template<typename R> const failable<R, std::string> writeJSON(const
JSONContext& cx, const lambda<R(R, std::string)>& reduce, const R& initial,
const list<value>& l) {
jsval val = valueToJSVal(cx, l);
JSONWriteContext<R> wcx(cx, reduce, initial);
- JS_Stringify(cx, &val, NULL, JSVAL_NULL, writeCallback<R>, &wcx);
+ if (!JS_Stringify(cx, &val, NULL, JSVAL_NULL, writeCallback<R>, &wcx))
+ return std::string("JS_Stringify failed");
return wcx.accum;
}
@@ -326,11 +326,13 @@
}
/**
- * Write a list of values as a JSON document represented as a list of strings.
+ * Convert a list of values to a JSON document represented as a list of
strings.
*/
-const list<std::string> writeJSON(const JSONContext& cx, const list<value>& l)
{
- lambda<list<std::string>(list<std::string>, std::string)>
writer(writeJSONList);
- return reverse(writeJSON(cx, writer, list<std::string>(), l));
+const failable<list<std::string>, std::string> writeJSON(const JSONContext&
cx, const list<value>& l) {
+ const failable<list<std::string>, std::string> ls =
writeJSON<list<std::string> >(cx, writeJSONList, list<std::string>(), l);
+ if (!hasValue(ls))
+ return ls;
+ return reverse(list<std::string>(ls));
}
}
Copied: tuscany/cpp/sca/test/store-script/htdocs/.htaccess (from r823981,
tuscany/cpp/sca/modules/httpd/Makefile.am)
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/test/store-script/htdocs/.htaccess?p2=tuscany/cpp/sca/test/store-script/htdocs/.htaccess&p1=tuscany/cpp/sca/modules/httpd/Makefile.am&r1=823981&r2=823982&rev=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/modules/httpd/Makefile.am (original)
+++ tuscany/cpp/sca/test/store-script/htdocs/.htaccess Sun Oct 11 00:01:09 2009
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,10 +16,4 @@
# specific language governing permissions and limitations
# under the License.
-libdir=$(prefix)/lib
-lib_LTLIBRARIES = libmod_tuscany.la
-
-INCLUDES = -I. -I$(top_builddir)/kernel -I${HTTPD_INCLUDE} -I${APR_INCLUDE}
-
-libmod_tuscany_la_SOURCES = mod.cpp
-libmod_tuscany_la_LIBADD = -lpthread
+DirectoryIndex store.html
Added: tuscany/cpp/sca/test/store-script/htdocs/store.html
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/test/store-script/htdocs/store.html?rev=823982&view=auto
==============================================================================
--- tuscany/cpp/sca/test/store-script/htdocs/store.html (added)
+++ tuscany/cpp/sca/test/store-script/htdocs/store.html Sun Oct 11 00:01:09 2009
@@ -0,0 +1,162 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<html>
+<head>
+<title>Store</title>
+
+<script type="text/javascript" src="store.js"></script>
+
+<script language="JavaScript">
+
+ //@Reference
+ var catalog = new tuscany.sca.Reference("catalog");
+
+ //@Reference
+ //var shoppingCart = new tuscany.sca.Reference("shoppingCart");
+
+ //@Reference
+ //var shoppingTotal = new tuscany.sca.Reference("shoppingTotal");
+
+ var catalogItems;
+
+ function catalog_getResponse(items,exception) {
+ if(exception){
+ alert(exception.message);
+ return;
+ }
+ var catalog = "";
+
+ for (var i=0; i<items.length; i++) {
+ var item = items[i].name + ' - ' +
items[i].price;
+ catalog += '<input name="items" type="checkbox"
value="' +
+ item + '">' + item + '
<br>';
+ }
+ document.getElementById('catalog').innerHTML=catalog;
+ catalogItems = items;
+ }
+
+ function shoppingCart_getResponse(feed) {
+ if (feed != null) {
+ var entries = feed.getElementsByTagName("entry");
+ var list = "";
+ for (var i=0; i<entries.length; i++) {
+ var content =
entries[i].getElementsByTagName("content")[0];
+ var name =
content.getElementsByTagName("name")[0].firstChild.nodeValue;
+ var price =
content.getElementsByTagName("price")[0].firstChild.nodeValue;
+ list += name + ' - ' + price + ' <br>';
+ }
+ document.getElementById("shoppingCart").innerHTML =
list;
+
+ if (entries.length != 0) {
+ try {
+
//shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+ }
+ catch(e){
+ alert(e);
+ }
+ }
+ }
+ }
+
+ function shoppingTotal_getTotalResponse(total,exception) {
+ if(exception) {
+ alert(exception.message);
+ return;
+ }
+ document.getElementById('total').innerHTML = total;
+ }
+
+ function shoppingCart_postResponse(entry) {
+ //shoppingCart.get("", shoppingCart_getResponse);
+ }
+
+ function addToCart() {
+ var items = document.catalogForm.items;
+ var j = 0;
+ for (var i=0; i<items.length; i++)
+ if (items[i].checked) {
+
+ var entry = '<entry
xmlns="http://www.w3.org/2005/Atom";><title>item</title><content
type="text/xml">' +
+ '<Item xmlns="http://services/";>' +
+ '<name xmlns="">' + catalogItems[i].name + '</name>' +
'<price xmlns="">' + catalogItems[i].price + '</price>' +
+ '</Item>' + '</content></entry>';
+ shoppingCart.post(entry,
shoppingCart_postResponse);
+ items[i].checked = false;
+ }
+ }
+ function checkoutCart() {
+ document.getElementById('store').innerHTML='<h2>' +
+ 'Thanks for Shopping With Us!</h2>'+
+ '<h2>Your Order</h2>'+
+ '<form name="orderForm">'+
+
document.getElementById('shoppingCart').innerHTML+
+ '<br>'+
+
document.getElementById('total').innerHTML+
+ '<br>'+
+ '<br>'+
+ '<input type="submit" value="Continue
Shopping">'+
+ '</form>';
+ shoppingCart.del("", null);
+ }
+ function deleteCart() {
+ shoppingCart.del("", null);
+ document.getElementById('shoppingCart').innerHTML = "";
+ document.getElementById('total').innerHTML = "";
+ }
+
+ function init() {
+
+ try {
+ catalog.get(catalog_getResponse);
+ //shoppingCart.get("",
shoppingCart_getResponse);
+ }
+ catch(e){
+ alert(e);
+ }
+ }
+
+</script>
+
+</head>
+
+<body onload="init()">
+<h1>Store</h1>
+ <div id="store">
+ <h2>Catalog</h2>
+ <form name="catalogForm">
+ <div id="catalog" ></div>
+ <br>
+ <input type="button" onClick="addToCart()" value="Add to Cart">
+ </form>
+
+ <br>
+
+ <h2>Your Shopping Cart</h2>
+ <form name="shoppingCartForm">
+ <div id="shoppingCart"></div>
+ <br>
+ <div id="total"></div>
+ <br>
+ <input type="button" onClick="checkoutCart()" value="Checkout">
+ <input type="button" onClick="deleteCart()" value="Empty">
+ <a href="../ShoppingCart/Cart/">(feed)</a>
+ </form>
+ </div>
+</body>
+</html>
Added: tuscany/cpp/sca/test/store-script/htdocs/store.js
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/test/store-script/htdocs/store.js?rev=823982&view=auto
==============================================================================
--- tuscany/cpp/sca/test/store-script/htdocs/store.js (added)
+++ tuscany/cpp/sca/test/store-script/htdocs/store.js Sun Oct 11 00:01:09 2009
@@ -0,0 +1,661 @@
+
+/* Apache Tuscany SCA Widget header */
+
+/*
+ * JSON-RPC JavaScript client
+ *
+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
+ *
+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+ *
+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/*
+ * Modifications for Apache Tuscany:
+ * - JSONRpcClient_createMethod changed so callback is last arg
+ */
+
+/* escape a character */
+
+escapeJSONChar =
+function escapeJSONChar(c)
+{
+ if(c == "\"" || c == "\\") return "\\" + c;
+ else if (c == "\b") return "\\b";
+ else if (c == "\f") return "\\f";
+ else if (c == "\n") return "\\n";
+ else if (c == "\r") return "\\r";
+ else if (c == "\t") return "\\t";
+ var hex = c.charCodeAt(0).toString(16);
+ if(hex.length == 1) return "\\u000" + hex;
+ else if(hex.length == 2) return "\\u00" + hex;
+ else if(hex.length == 3) return "\\u0" + hex;
+ else return "\\u" + hex;
+};
+
+
+/* encode a string into JSON format */
+
+escapeJSONString =
+function escapeJSONString(s)
+{
+ /* The following should suffice but Safari's regex is b0rken
+ (doesn't support callback substitutions)
+ return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
+ escapeJSONChar) + "\"";
+ */
+
+ /* Rather inefficient way to do it */
+ var parts = s.split("");
+ for(var i=0; i < parts.length; i++) {
+ var c =parts[i];
+ if(c == '"' ||
+ c == '\\' ||
+ c.charCodeAt(0) < 32 ||
+ c.charCodeAt(0) >= 128)
+ parts[i] = escapeJSONChar(parts[i]);
+ }
+ return "\"" + parts.join("") + "\"";
+};
+
+
+/* Marshall objects to JSON format */
+
+toJSON = function toJSON(o)
+{
+ if(o == null) {
+ return "null";
+ } else if(o.constructor == String) {
+ return escapeJSONString(o);
+ } else if(o.constructor == Number) {
+ return o.toString();
+ } else if(o.constructor == Boolean) {
+ return o.toString();
+ } else if(o.constructor == Date) {
+ return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
+ } else if(o.constructor == Array) {
+ var v = [];
+ for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
+ return "[" + v.join(", ") + "]";
+ } else {
+ var v = [];
+ for(attr in o) {
+ if(o[attr] == null) v.push("\"" + attr + "\": null");
+ else if(typeof o[attr] == "function"); /* skip */
+ else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
+ }
+ return "{" + v.join(", ") + "}";
+ }
+};
+
+
+/* JSONRpcClient constructor */
+
+JSONRpcClient =
+function JSONRpcClient_ctor(serverURL, user, pass, objectID)
+{
+ this.serverURL = serverURL;
+ this.user = user;
+ this.pass = pass;
+ this.objectID = objectID;
+
+ /* Add standard methods */
+ if(this.objectID) {
+ this._addMethods(["listMethods"]);
+ var req = this._makeRequest("listMethods", []);
+ } else {
+ this._addMethods(["system.listMethods"]);
+ var req = this._makeRequest("system.listMethods", []);
+ }
+ var m = this._sendRequest(req);
+ this._addMethods(m);
+};
+
+
+/* JSONRpcCLient.Exception */
+
+JSONRpcClient.Exception =
+function JSONRpcClient_Exception_ctor(code, message, javaStack)
+{
+ this.code = code;
+ var name;
+ if(javaStack) {
+ this.javaStack = javaStack;
+ var m = javaStack.match(/^([^:]*)/);
+ if(m) name = m[0];
+ }
+ if(name) this.name = name;
+ else this.name = "JSONRpcClientException";
+ this.message = message;
+};
+
+JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
+JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
+JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
+JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
+JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
+JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
+
+JSONRpcClient.Exception.prototype = new Error();
+
+JSONRpcClient.Exception.prototype.toString =
+function JSONRpcClient_Exception_toString(code, msg)
+{
+ return this.name + ": " + this.message;
+};
+
+
+/* Default top level exception handler */
+
+JSONRpcClient.default_ex_handler =
+function JSONRpcClient_default_ex_handler(e) { alert(e); };
+
+
+/* Client settable variables */
+
+JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
+JSONRpcClient.profile_async = false;
+JSONRpcClient.max_req_active = 1;
+JSONRpcClient.requestId = 1;
+
+
+/* JSONRpcClient implementation */
+
+JSONRpcClient.prototype._createMethod =
+function JSONRpcClient_createMethod(methodName)
+{
+ var fn=function()
+ {
+ var args = [];
+ var callback = null;
+ for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
+
+/* TUSCANY change callback to be last arg instead of first to match
binding.ajax
+ if(typeof args[0] == "function") callback = args.shift();
+*/
+ if(typeof args[arguments.length-1] == "function") callback = args.pop();
+
+ var req = fn.client._makeRequest.call(fn.client, fn.methodName,
+ args, callback);
+ if(callback == null) {
+ return fn.client._sendRequest.call(fn.client, req);
+ } else {
+ JSONRpcClient.async_requests.push(req);
+ JSONRpcClient.kick_async();
+ return req.requestId;
+ }
+ };
+ fn.client = this;
+ fn.methodName = methodName;
+ return fn;
+};
+
+JSONRpcClient.prototype._addMethods =
+function JSONRpcClient_addMethods(methodNames)
+{
+ for(var i=0; i<methodNames.length; i++) {
+ var obj = this;
+ var names = methodNames[i].split(".");
+ for(var n=0; n<names.length-1; n++) {
+ var name = names[n];
+ if(obj[name]) {
+ obj = obj[name];
+ } else {
+ obj[name] = new Object();
+ obj = obj[name];
+ }
+ }
+ var name = names[names.length-1];
+ if(!obj[name]) {
+ var method = this._createMethod(methodNames[i]);
+ obj[name] = method;
+ }
+ }
+};
+
+JSONRpcClient._getCharsetFromHeaders =
+function JSONRpcClient_getCharsetFromHeaders(http)
+{
+ try {
+ var contentType = http.getResponseHeader("Content-type");
+ var parts = contentType.split(/\s*;\s*/);
+ for(var i =0; i < parts.length; i++) {
+ if(parts[i].substring(0, 8) == "charset=")
+ return parts[i].substring(8, parts[i].length);
+ }
+ } catch (e) {}
+ return "UTF-8"; /* default */
+};
+
+/* Async queue globals */
+JSONRpcClient.async_requests = [];
+JSONRpcClient.async_inflight = {};
+JSONRpcClient.async_responses = [];
+JSONRpcClient.async_timeout = null;
+JSONRpcClient.num_req_active = 0;
+
+JSONRpcClient._async_handler =
+function JSONRpcClient_async_handler()
+{
+ JSONRpcClient.async_timeout = null;
+
+ while(JSONRpcClient.async_responses.length > 0) {
+ var res = JSONRpcClient.async_responses.shift();
+ if(res.canceled) continue;
+ if(res.profile) res.profile.dispatch = new Date();
+ try {
+ res.cb(res.result, res.ex, res.profile);
+ } catch(e) {
+ JSONRpcClient.toplevel_ex_handler(e);
+ }
+ }
+
+ while(JSONRpcClient.async_requests.length > 0 &&
+ JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
+ var req = JSONRpcClient.async_requests.shift();
+ if(req.canceled) continue;
+ req.client._sendRequest.call(req.client, req);
+ }
+};
+
+JSONRpcClient.kick_async =
+function JSONRpcClient_kick_async()
+{
+ if(JSONRpcClient.async_timeout == null)
+ JSONRpcClient.async_timeout =
+ setTimeout(JSONRpcClient._async_handler, 0);
+};
+
+JSONRpcClient.cancelRequest =
+function JSONRpcClient_cancelRequest(requestId)
+{
+ /* If it is in flight then mark it as canceled in the inflight map
+ and the XMLHttpRequest callback will discard the reply. */
+ if(JSONRpcClient.async_inflight[requestId]) {
+ JSONRpcClient.async_inflight[requestId].canceled = true;
+ return true;
+ }
+
+ /* If its not in flight yet then we can just mark it as canceled in
+ the the request queue and it will get discarded before being sent. */
+ for(var i in JSONRpcClient.async_requests) {
+ if(JSONRpcClient.async_requests[i].requestId == requestId) {
+ JSONRpcClient.async_requests[i].canceled = true;
+ return true;
+ }
+ }
+
+ /* It may have returned from the network and be waiting for its callback
+ to be dispatched, so mark it as canceled in the response queue
+ and the response will get discarded before calling the callback. */
+ for(var i in JSONRpcClient.async_responses) {
+ if(JSONRpcClient.async_responses[i].requestId == requestId) {
+ JSONRpcClient.async_responses[i].canceled = true;
+ return true;
+ }
+ }
+
+ return false;
+};
+
+JSONRpcClient.prototype._makeRequest =
+function JSONRpcClient_makeRequest(methodName, args, cb)
+{
+ var req = {};
+ req.client = this;
+ req.requestId = JSONRpcClient.requestId++;
+
+ var obj = {};
+ obj.id = req.requestId;
+ if (this.objectID)
+ obj.method = ".obj#" + this.objectID + "." + methodName;
+ else
+ obj.method = methodName;
+ obj.params = args;
+
+ if (cb) req.cb = cb;
+ if (JSONRpcClient.profile_async)
+ req.profile = { "submit": new Date() };
+ req.data = toJSON(obj);
+
+ return req;
+};
+
+JSONRpcClient.prototype._sendRequest =
+function JSONRpcClient_sendRequest(req)
+{
+ if(req.profile) req.profile.start = new Date();
+
+ /* Get free http object from the pool */
+ var http = JSONRpcClient.poolGetHTTPRequest();
+ JSONRpcClient.num_req_active++;
+
+ /* Send the request */
+ if (typeof(this.user) == "undefined") {
+ http.open("POST", this.serverURL, (req.cb != null));
+ } else {
+ http.open("POST", this.serverURL, (req.cb != null), this.user,
this.pass);
+ }
+
+ /* setRequestHeader is missing in Opera 8 Beta */
+ try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
+
+ /* Construct call back if we have one */
+ if(req.cb) {
+ var self = this;
+ http.onreadystatechange = function() {
+ if(http.readyState == 4) {
+ http.onreadystatechange = function () {};
+ var res = { "cb": req.cb, "result": null, "ex": null};
+ if (req.profile) {
+ res.profile = req.profile;
+ res.profile.end = new Date();
+ }
+ try { res.result = self._handleResponse(http); }
+ catch(e) { res.ex = e; }
+ if(!JSONRpcClient.async_inflight[req.requestId].canceled)
+ JSONRpcClient.async_responses.push(res);
+ delete JSONRpcClient.async_inflight[req.requestId];
+ JSONRpcClient.kick_async();
+ }
+ };
+ } else {
+ http.onreadystatechange = function() {};
+ }
+
+ JSONRpcClient.async_inflight[req.requestId] = req;
+
+ try {
+ http.send(req.data);
+ } catch(e) {
+ JSONRpcClient.poolReturnHTTPRequest(http);
+ JSONRpcClient.num_req_active--;
+ throw new JSONRpcClient.Exception
+ (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
+ }
+
+ if(!req.cb) return this._handleResponse(http);
+};
+
+JSONRpcClient.prototype._handleResponse =
+function JSONRpcClient_handleResponse(http)
+{
+ /* Get the charset */
+ if(!this.charset) {
+ this.charset = JSONRpcClient._getCharsetFromHeaders(http);
+ }
+
+ /* Get request results */
+ var status, statusText, data;
+ try {
+ status = http.status;
+ statusText = http.statusText;
+ data = http.responseText;
+ } catch(e) {
+ JSONRpcClient.poolReturnHTTPRequest(http);
+ JSONRpcClient.num_req_active--;
+ JSONRpcClient.kick_async();
+ throw new JSONRpcClient.Exception
+ (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
+ }
+
+ /* Return http object to the pool; */
+ JSONRpcClient.poolReturnHTTPRequest(http);
+ JSONRpcClient.num_req_active--;
+
+ /* Unmarshall the response */
+ if(status != 200) {
+ throw new JSONRpcClient.Exception(status, statusText);
+ }
+ var obj;
+ try {
+ eval("obj = " + data);
+ } catch(e) {
+ throw new JSONRpcClient.Exception(550, "error parsing result");
+ }
+ if(obj.error)
+ throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
+ obj.error.trace);
+ var res = obj.result;
+
+ /* Handle CallableProxy */
+ if(res && res.objectID && res.JSONRPCType == "CallableReference")
+ return new JSONRpcClient(this.serverURL, this.user,
+ this.pass, res.objectID);
+
+ return res;
+};
+
+
+/* XMLHttpRequest wrapper code */
+
+/* XMLHttpRequest pool globals */
+JSONRpcClient.http_spare = [];
+JSONRpcClient.http_max_spare = 8;
+
+JSONRpcClient.poolGetHTTPRequest =
+function JSONRpcClient_pool_getHTTPRequest()
+{
+ if(JSONRpcClient.http_spare.length > 0) {
+ return JSONRpcClient.http_spare.pop();
+ }
+ return JSONRpcClient.getHTTPRequest();
+};
+
+JSONRpcClient.poolReturnHTTPRequest =
+function JSONRpcClient_poolReturnHTTPRequest(http)
+{
+ if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
+ delete http;
+ else
+ JSONRpcClient.http_spare.push(http);
+};
+
+JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
+ "MSXML2.XMLHTTP.4.0",
+ "MSXML2.XMLHTTP.3.0",
+ "MSXML2.XMLHTTP",
+ "Microsoft.XMLHTTP" ];
+
+JSONRpcClient.getHTTPRequest =
+function JSONRpcClient_getHTTPRequest()
+{
+ /* Mozilla XMLHttpRequest */
+ try {
+ JSONRpcClient.httpObjectName = "XMLHttpRequest";
+ return new XMLHttpRequest();
+ } catch(e) {}
+
+ /* Microsoft MSXML ActiveX */
+ for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
+ try {
+ JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
+ return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
+ } catch (e) {}
+ }
+
+ /* None found */
+ JSONRpcClient.httpObjectName = null;
+ throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
+};
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function AtomClient(uri) {
+
+ this.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
+ "MSXML2.XMLHTTP.4.0",
+ "MSXML2.XMLHTTP.3.0",
+ "MSXML2.XMLHTTP",
+ "Microsoft.XMLHTTP" ];
+
+ this.uri=uri;
+
+ this.get = function(id, responseFunction) {
+ var xhr = this.createXMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ if (xhr.status == 200) {
+ var strDocument = xhr.responseText;
+ var xmlDocument = xhr.responseXML;
+ if(!xmlDocument ||
xmlDocument.childNodes.length==0){
+ xmlDocument = (new
DOMParser()).parseFromString(strDocument, "text/xml");
+ }
+ if (responseFunction != null)
responseFunction(xmlDocument);
+ } else {
+ alert("get - Error getting data from the server");
+ }
+ }
+ }
+ xhr.open("GET", uri + '/' + id, true);
+ xhr.send(null);
+ }
+
+ this.post = function (entry, responseFunction) {
+ var xhr = this.createXMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ if (xhr.status == 201) {
+ var strDocument = xhr.responseText;
+ var xmlDocument = xhr.responseXML;
+ if(!xmlDocument ||
xmlDocument.childNodes.length==0){
+ xmlDocument = (new
DOMParser()).parseFromString(strDocument, "text/xml");
+ }
+ if (responseFunction != null)
responseFunction(xmlDocument);
+ } else {
+ alert("post - Error getting data from
the server");
+ }
+ }
+ }
+ xhr.open("POST", uri, true);
+ xhr.setRequestHeader("Content-Type", "application/atom+xml");
+ xhr.send(entry);
+ }
+
+ this.put = function (id, entry, responseFunction) {
+ var xhr = this.createXMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ if (xhr.status == 200) {
+ var strDocument = xhr.responseText;
+ var xmlDocument = xhr.responseXML;
+ if(!xmlDocument ||
xmlDocument.childNodes.length==0){
+ xmlDocument = (new
DOMParser()).parseFromString(strDocument, "text/xml");
+ }
+ if (responseFunction != null)
responseFunction(xmlDocument);
+ } else {
+ alert("put - Error getting data from
the server");
+ }
+ }
+ }
+ xhr.open("PUT", uri + '/' + id, true);
+ xhr.setRequestHeader("Content-Type", "application/atom+xml");
+ xhr.send(entry);
+ }
+
+ this.del = function (id, responseFunction) {
+ var xhr = this.createXMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ if (xhr.status == 200) {
+ if (responseFunction != null)
responseFunction();
+ } else {
+ alert("delete - Error getting data from
the server");
+ }
+ }
+ }
+ xhr.open("DELETE", uri + '/' + id, true);
+ xhr.send(null);
+ }
+ this.createXMLHttpRequest = function () {
+ /* Mozilla XMLHttpRequest */
+ try {return new XMLHttpRequest();} catch(e) {}
+
+ /* Microsoft MSXML ActiveX */
+ for (var i=0;i < this.msxmlNames.length; i++) {
+ try {return new ActiveXObject(this.msxmlNames[i]);} catch (e) {}
+ }
+ alert("XML http request not supported");
+ return null;
+ }
+ if (typeof DOMParser == "undefined") {
+ DOMParser = function () {}
+
+ DOMParser.prototype.parseFromString = function (str, contentType) {
+ if (typeof ActiveXObject != "undefined") {
+ var d = new ActiveXObject("MSXML.DomDocument");
+ d.loadXML(str);
+ return d;
+ } else if (typeof XMLHttpRequest != "undefined") {
+ var req = new XMLHttpRequest;
+ req.open("GET", "data:" + (contentType || "application/xml") +
+ ";charset=utf-8," + encodeURIComponent(str),
false);
+ if (req.overrideMimeType) {
+ req.overrideMimeType(contentType);
+ }
+ req.send(null);
+ return req.responseXML;
+ }
+ }
+ }
+}
+
+
+
+/* Tuscany Reference/Property injection code */
+
+if (!tuscany) {
+var tuscany = {};
+}
+if (!tuscany.sca) {
+tuscany.sca = {};
+}
+
+tuscany.sca.propertyMap = new String();
+tuscany.sca.Property = function (name) {
+ return tuscany.sca.propertyMap[name];
+}
+
+tuscany.sca.referenceMap = new Object();
+tuscany.sca.referenceMap.catalog = new JSONRpcClient("/Catalog").Service;
+//tuscany.sca.referenceMap.shoppingCart = new AtomClient("/ShoppingCart/Cart");
+//tuscany.sca.referenceMap.shoppingTotal = new
JSONRpcClient("/ShoppingCart/Total").Service;
+tuscany.sca.Reference = function (name) {
+ return tuscany.sca.referenceMap[name];
+}
+
+/** End of Apache Tuscany SCA Widget */
+
Modified: tuscany/cpp/sca/test/store-script/store-script-test.cpp
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/test/store-script/store-script-test.cpp?rev=823982&r1=823981&r2=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/test/store-script/store-script-test.cpp (original)
+++ tuscany/cpp/sca/test/store-script/store-script-test.cpp Sun Oct 11 00:01:09
2009
@@ -29,18 +29,42 @@
#include <string>
#include "driver.hpp"
-namespace store
-{
+namespace store {
bool contains(const std::string& str, const std::string& pattern) {
return str.find(pattern) != str.npos;
}
bool testScript() {
- std::ifstream is("store-script.scm", std::ios_base::in);
+ std::ifstream is("store.scm", std::ios_base::in);
std::ostringstream os;
tuscany::evalDriverRun(is, os);
- assert(contains(os.str(), "List::(List::(String::'apple', (String::'USD',
(String::'$', (Number::2.99, ())))), ())"));
+ assert(contains(os.str(), "List::(List::(List::(Symbol::name,
(String::\"apple\", ())), (List::(Symbol::currency, (String::\"USD\", ())),
(List::(Symbol::symbol, (String::\"$\", ())), (List::(Symbol::price,
(Number::2.99, ())), ())))), ())"));
+ return true;
+}
+
+const tuscany::value evalLoop(std::istream& is, const tuscany::value& req,
tuscany::Env& globalEnv) {
+ tuscany::value in = tuscany::read(is);
+ if(tuscany::isNil(in))
+ return tuscany::eval(req, globalEnv);
+ tuscany::eval(in, globalEnv);
+ return evalLoop(is, req, globalEnv);
+}
+
+bool testEval() {
+ std::ifstream is("store.scm", std::ios_base::in);
+ std::ostringstream os;
+
+ tuscany::setupEvalOut(os);
+ tuscany::Env globalEnv = tuscany::setupEnvironment();
+
+ const tuscany::value
req(tuscany::makeList<tuscany::value>("storeui_service",
std::string("getcatalog")));
+ const tuscany::value res = evalLoop(is, req, globalEnv);
+
+ std::ostringstream rs;
+ rs << res;
+ assert(contains(rs.str(), "List::(List::(List::(Symbol::name,
(String::\"apple\", ())), (List::(Symbol::currency, (String::\"USD\", ())),
(List::(Symbol::symbol, (String::\"$\", ())), (List::(Symbol::price,
(Number::2.99, ())), ())))), (List::(List::(Symbol::name, (String::\"orange\",
())), (List::(Symbol::currency, (String::\"USD\", ())), (List::(Symbol::symbol,
(String::\"$\", ())), (List::(Symbol::price, (Number::3.55, ())), ())))),
(List::(List::(Symbol::name, (String::\"pear\", ())), (List::(Symbol::currency,
(String::\"USD\", ())), (List::(Symbol::symbol, (String::\"$\", ())),
(List::(Symbol::price, (Number::1.55, ())), ())))), ())))"));
+
return true;
}
@@ -51,6 +75,7 @@
std::cout << "Testing..." << std::endl;
store::testScript();
+ store::testEval();
std::cout << "OK" << std::endl;
Copied: tuscany/cpp/sca/test/store-script/store.scm (from r823981,
tuscany/cpp/sca/test/store-script/store-script.scm)
URL:
http://svn.apache.org/viewvc/tuscany/cpp/sca/test/store-script/store.scm?p2=tuscany/cpp/sca/test/store-script/store.scm&p1=tuscany/cpp/sca/test/store-script/store-script.scm&r1=823981&r2=823982&rev=823982&view=diff
==============================================================================
--- tuscany/cpp/sca/test/store-script/store-script.scm (original)
+++ tuscany/cpp/sca/test/store-script/store.scm Sun Oct 11 00:01:09 2009
@@ -28,9 +28,9 @@
(define code "USD")
(define symbol (converter "symbol" code))
- (list (list "apple" code symbol (convert 2.99))
- (list "orange" code symbol (convert 3.55))
- (list "pear" code symbol (convert 1.55))
+ (list (list (list 'name "apple") (list 'currency code) (list 'symbol symbol)
(list 'price (convert 2.99)))
+ (list (list 'name "orange") (list 'currency code) (list 'symbol symbol)
(list 'price (convert 3.55)))
+ (list (list 'name "pear") (list 'currency code) (list 'symbol symbol)
(list 'price (convert 1.55)))
)
)
@@ -97,3 +97,8 @@
(define full (storeui_service "post" empty apple))
(display (storeui_service "getall" full))
+(; "Store UI JSON-RPC interop test case")
+
+(define (system.listMethods) (list "Service.get"))
+(define (Service.get) (storeui_service "getcatalog"))
+
