From 9494282e751d485d79e93ad0a37bd5d4f26011a7 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 19 Apr 2010 06:26:26 +0000 Subject: Add a tinycdb-based nosql SCA component and integrate with server. Add a version of the store test that works with the nosql component. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@935459 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/components/nosqldb/Makefile.am | 9 +- sca-cpp/trunk/components/nosqldb/nosqldb-test | 7 +- sca-cpp/trunk/components/nosqldb/nosqldb.composite | 33 + sca-cpp/trunk/components/nosqldb/nosqldb.cpp | 134 +++++ sca-cpp/trunk/components/nosqldb/server-test | 7 +- sca-cpp/trunk/components/nosqldb/store.composite | 32 - sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp | 4 +- sca-cpp/trunk/components/nosqldb/tinycdb.hpp | 133 +++-- sca-cpp/trunk/components/sqldb/pgsql.hpp | 4 + sca-cpp/trunk/configure.ac | 1 + sca-cpp/trunk/test/Makefile.am | 2 +- sca-cpp/trunk/test/store-nosql/Makefile.am | 19 + .../trunk/test/store-nosql/currency-converter.scm | 27 + sca-cpp/trunk/test/store-nosql/fruits-catalog.scm | 33 + sca-cpp/trunk/test/store-nosql/htdocs/.htaccess | 19 + sca-cpp/trunk/test/store-nosql/htdocs/store.html | 169 ++++++ sca-cpp/trunk/test/store-nosql/htdocs/store.js | 661 +++++++++++++++++++++ sca-cpp/trunk/test/store-nosql/server-test | 40 ++ sca-cpp/trunk/test/store-nosql/shopping-cart.scm | 84 +++ sca-cpp/trunk/test/store-nosql/ssl-start | 34 ++ sca-cpp/trunk/test/store-nosql/start | 31 + sca-cpp/trunk/test/store-nosql/stop | 20 + sca-cpp/trunk/test/store-nosql/store.composite | 70 +++ sca-cpp/trunk/test/store-nosql/store.scm | 50 ++ 24 files changed, 1535 insertions(+), 88 deletions(-) create mode 100644 sca-cpp/trunk/components/nosqldb/nosqldb.composite create mode 100644 sca-cpp/trunk/components/nosqldb/nosqldb.cpp delete mode 100644 sca-cpp/trunk/components/nosqldb/store.composite create mode 100644 sca-cpp/trunk/test/store-nosql/Makefile.am create mode 100644 sca-cpp/trunk/test/store-nosql/currency-converter.scm create mode 100644 sca-cpp/trunk/test/store-nosql/fruits-catalog.scm create mode 100644 sca-cpp/trunk/test/store-nosql/htdocs/.htaccess create mode 100644 sca-cpp/trunk/test/store-nosql/htdocs/store.html create mode 100644 sca-cpp/trunk/test/store-nosql/htdocs/store.js create mode 100755 sca-cpp/trunk/test/store-nosql/server-test create mode 100644 sca-cpp/trunk/test/store-nosql/shopping-cart.scm create mode 100755 sca-cpp/trunk/test/store-nosql/ssl-start create mode 100755 sca-cpp/trunk/test/store-nosql/start create mode 100755 sca-cpp/trunk/test/store-nosql/stop create mode 100644 sca-cpp/trunk/test/store-nosql/store.composite create mode 100644 sca-cpp/trunk/test/store-nosql/store.scm (limited to 'sca-cpp') diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/nosqldb/Makefile.am index 6a9b0bdfdd..608de23527 100644 --- a/sca-cpp/trunk/components/nosqldb/Makefile.am +++ b/sca-cpp/trunk/components/nosqldb/Makefile.am @@ -19,16 +19,17 @@ if WANT_NOSQLDB INCLUDES = -I${TINYCDB_INCLUDE} +comp_SCRIPTS = tinycdb compdir=$(prefix)/components/nosqldb comp_DATA = tinycdb.prefix tinycdb.prefix: $(top_builddir)/config.status echo ${TINYCDB_PREFIX} >tinycdb.prefix -#comp_LTLIBRARIES = libnosqldb.la +comp_LTLIBRARIES = libnosqldb.la -#libnosqldb_la_SOURCES = nosqldb.cpp -#libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb +libnosqldb_la_SOURCES = nosqldb.cpp +libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb tinycdb_test_SOURCES = tinycdb-test.cpp tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb @@ -37,6 +38,6 @@ client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs noinst_PROGRAMS = tinycdb-test client-test -TESTS = nosqldb-test +TESTS = nosqldb-test server-test endif diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb-test b/sca-cpp/trunk/components/nosqldb/nosqldb-test index d1f9746860..30c9f89bc9 100755 --- a/sca-cpp/trunk/components/nosqldb/nosqldb-test +++ b/sca-cpp/trunk/components/nosqldb/nosqldb-test @@ -19,13 +19,10 @@ # Setup mkdir -p tmp -rm -f tmp/db.cdb -cat >tmp/db.txt </dev/null +./tinycdb-test 2>/dev/null rc=$? # Cleanup diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.composite b/sca-cpp/trunk/components/nosqldb/nosqldb.composite new file mode 100644 index 0000000000..812f0739fe --- /dev/null +++ b/sca-cpp/trunk/components/nosqldb/nosqldb.composite @@ -0,0 +1,33 @@ + + + + + + + tmp/test.cdb + + + + + + diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.cpp b/sca-cpp/trunk/components/nosqldb/nosqldb.cpp new file mode 100644 index 0000000000..638434c26f --- /dev/null +++ b/sca-cpp/trunk/components/nosqldb/nosqldb.cpp @@ -0,0 +1,134 @@ +/* + * 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. + */ + +/* $Rev$ $Date$ */ + +/** + * TinyCDB-based database component implementation. + */ + +#include + +#include "string.hpp" + +#include "function.hpp" +#include "list.hpp" +#include "value.hpp" +#include "monad.hpp" +#include "tinycdb.hpp" + +namespace tuscany { +namespace nosqldb { + +/** + * Get an item from the database. + */ +const failable get(const list& params, tinycdb::TinyCDB& cdb) { + return tinycdb::get(car(params), cdb); +} + +/** + * Post an item to the database. + */ +const value uuidValue() { + apr_uuid_t uuid; + apr_uuid_get(&uuid); + char buf[APR_UUID_FORMATTED_LENGTH]; + apr_uuid_format(buf, &uuid); + return value(string(buf, APR_UUID_FORMATTED_LENGTH)); +} + +const failable post(const list& params, tinycdb::TinyCDB& cdb) { + const value id = append(car(params), mklist(uuidValue())); + const failable val = tinycdb::post(id, cadr(params), cdb); + if (!hasContent(val)) + return mkfailure(reason(val)); + return id; +} + +/** + * Put an item into the database. + */ +const failable put(const list& params, tinycdb::TinyCDB& cdb) { + const failable val = tinycdb::put(car(params), cadr(params), cdb); + if (!hasContent(val)) + return mkfailure(reason(val)); + return value(content(val)); +} + +/** + * Delete an item from the database. + */ +const failable del(const list& params, tinycdb::TinyCDB& cdb) { + const failable val = tinycdb::del(car(params), cdb); + if (!hasContent(val)) + return mkfailure(reason(val)); + return value(content(val)); +} + +/** + * Component implementation lambda function. + */ +class applyNoSqldb { +public: + applyNoSqldb(tinycdb::TinyCDB& cdb) : cdb(cdb) { + } + + const value operator()(const list& params) const { + const value func(car(params)); + if (func == "get") + return get(cdr(params), cdb); + if (func == "post") + return post(cdr(params), cdb); + if (func == "put") + return put(cdr(params), cdb); + if (func == "delete") + return del(cdr(params), cdb); + return tuscany::mkfailure(); + } + +private: + tinycdb::TinyCDB& cdb; +}; + +/** + * Start the component. + */ +const failable start(unused const list& params) { + // Connect to the configured database and table + const value dbname = ((lambda)>)car(params))(list()); + tinycdb::TinyCDB& cdb = *(new (gc_new()) tinycdb::TinyCDB(dbname)); + + // Return the component implementation lambda function + return value(lambda&)>(applyNoSqldb(cdb))); +} + +} +} + +extern "C" { + +const tuscany::value apply(const tuscany::list& params) { + const tuscany::value func(car(params)); + if (func == "start") + return tuscany::nosqldb::start(cdr(params)); + return tuscany::mkfailure(); +} + +} diff --git a/sca-cpp/trunk/components/nosqldb/server-test b/sca-cpp/trunk/components/nosqldb/server-test index 784c7156c5..5a5d792a32 100755 --- a/sca-cpp/trunk/components/nosqldb/server-test +++ b/sca-cpp/trunk/components/nosqldb/server-test @@ -23,12 +23,10 @@ ../../modules/server/scheme-conf tmp cat >>tmp/conf/httpd.conf </dev/null 2>&1 -./pgsql "create table test(key text, value text);" 1>/dev/null 2>&1 +./tinycdb -c -m tmp/test.cdb - - - - - - - - - - - diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp b/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp index 4eeb92d3fc..b3b4ea7fd7 100644 --- a/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp +++ b/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp @@ -33,7 +33,7 @@ namespace tuscany { namespace tinycdb { bool testTinyCDB() { - TinyCDB cdb("tmp/db.cdb"); + TinyCDB cdb("tmp/test.cdb"); const value k = mklist("a"); assert(hasContent(post(k, string("AAA"), cdb))); @@ -59,7 +59,7 @@ struct getLoop { bool testGetPerf() { const value k = mklist("c"); - TinyCDB cdb("tmp/db.cdb"); + TinyCDB cdb("tmp/test.cdb"); assert(hasContent(post(k, string("CCC"), cdb))); const lambda gl = getLoop(k, cdb); diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb.hpp b/sca-cpp/trunk/components/nosqldb/tinycdb.hpp index c2d1f2c50f..b98d622e25 100644 --- a/sca-cpp/trunk/components/nosqldb/tinycdb.hpp +++ b/sca-cpp/trunk/components/nosqldb/tinycdb.hpp @@ -23,6 +23,8 @@ #define tuscany_tinycdb_hpp #include +#include +#include #include #include "string.hpp" @@ -92,16 +94,16 @@ const bool free(const buffer&b) { */ class TinyCDB { public: - TinyCDB() : owner(false) { + TinyCDB() : owner(false), fd(-1) { + st.st_ino = 0; } - TinyCDB(const string& file) : owner(true), file(file) { - fd = open(c_str(file), O_RDONLY); + TinyCDB(const string& name) : owner(true), name(name), fd(-1) { + st.st_ino = 0; } - TinyCDB(const TinyCDB& c) : owner(false) { - file = c.file; - fd = c.fd; + TinyCDB(const TinyCDB& c) : owner(false), name(c.name), fd(c.fd) { + st.st_ino = c.st.st_ino; } ~TinyCDB() { @@ -114,43 +116,90 @@ public: private: bool owner; - string file; + string name; int fd; - - friend const failable post(const value& key, const value& val, TinyCDB& cdb); - friend const failable put(const value& key, const value& val, const TinyCDB& cdb); - friend const failable get(const value& key, const TinyCDB& cdb); - friend const failable del(const value& key, const TinyCDB& cdb); - friend const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, TinyCDB& cdb); - friend const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb); + struct stat st; + + //friend const failable post(const value& key, const value& val, TinyCDB& cdb); + //friend const failable put(const value& key, const value& val, TinyCDB& cdb); + //friend const failable get(const value& key, const TinyCDB& cdb); + //friend const failable del(const value& key, TinyCDB& cdb); + //friend const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, TinyCDB& cdb); + //friend const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb); + + friend const string dbname(const TinyCDB& cdb); + friend const failable cdbopen(TinyCDB& cdb); + friend const failable cdbclose(TinyCDB& cdb); }; +/** + * Return the name of the database. + */ +const string dbname(const TinyCDB& cdb) { + return cdb.name; +} + +/** + * Open a database. + */ +const failable cdbopen(TinyCDB& cdb) { + struct stat st; + int s = stat(c_str(cdb.name), &st); + if (s == -1) + return mkfailure(string("Couldn't read database stat ") + cdb.name); + if (st.st_ino != cdb.st.st_ino || cdb.fd == -1) { + if (cdb.fd != -1) + close(cdb.fd); + cdb.fd = open(c_str(cdb.name), O_RDONLY); + if (cdb.fd == -1) + return mkfailure(string("Couldn't open database file ") + cdb.name); + debug(cdb.fd, "tinycdb::open::fd"); + cdb.st = st; + } + return cdb.fd; +} + +/** + * Close a database. + */ +const failable cdbclose(TinyCDB& cdb) { + close(cdb.fd); + cdb.fd = -1; + return true; +} + /** * Rewrite a database. The given update function is passed each entry, and * can return true to let the entry added to the new db, false to skip the * entry, or a failure. */ -const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb) { +const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, buffer& buf, const int tmpfd, TinyCDB& cdb) { // Initialize new db structure struct cdb_make cdbm; - cdb_make_start(&cdbm, fd); + cdb_make_start(&cdbm, tmpfd); + + // Open existing db + failable ffd = cdbopen(cdb); + if (!hasContent(ffd)) + return mkfailure(reason(ffd)); + const int fd = content(ffd); // Read the db header unsigned int pos = 0; - if (lseek(cdb.fd, 0, SEEK_SET) != 0) + if (lseek(fd, 0, SEEK_SET) != 0) return mkfailure("Could not seek to database start"); - if (::read(cdb.fd, buf, 2048) != 2048) + if (::read(fd, buf, 2048) != 2048) return mkfailure("Could not read database header"); pos += 2048; unsigned int eod = cdb_unpack(buf); - debug(pos, "tinycdb::post::eod"); + debug(pos, "tinycdb::rewrite::eod"); // Read and add the existing entries while(pos < eod) { if (eod - pos < 8) return mkfailure("Invalid database format, couldn't read entry header"); - if (::read(cdb.fd, buf, 8) != 8) + if (::read(fd, buf, 8) != 8) return mkfailure("Couldn't read entry header"); pos += 8; unsigned int klen = cdb_unpack(buf); @@ -161,13 +210,13 @@ const failable rewrite(const lambda(buffer& buf, const unsi buf = mkbuffer(buf, elen); if (eod - pos < elen) return mkfailure("Invalid database format, couldn't read entry"); - if ((unsigned int)::read(cdb.fd, buf, elen) != elen) + if ((unsigned int)::read(fd, buf, elen) != elen) return mkfailure("Couldn't read entry"); pos += elen; // Apply the update function to the entry - debug(string((char*)buf, klen), "tinycdb::post::existing key"); - debug(string(((char*)buf) + klen, vlen), "tinycdb::post::existing value"); + debug(string((char*)buf, klen), "tinycdb::rewrite::existing key"); + debug(string(((char*)buf) + klen, vlen), "tinycdb::rewrite::existing value"); const failable u = update(buf, klen, vlen); if (!hasContent(u)) return u; @@ -196,30 +245,29 @@ const failable rewrite(const lambda(buffer& buf, const unsi } const failable rewrite(const lambda(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda(struct cdb_make&)>& finish, TinyCDB& cdb) { - if (cdb.fd == -1) - return mkfailure("Could not open database"); // Create a new temporary db file - const char* tmpfile = c_str(cdb.file + ".tmp"); - unlink(tmpfile); - int fd = open(tmpfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0666); - if (fd == -1) + string tmpname = dbname(cdb) + ".XXXXXX"; + int tmpfd = mkstemp(const_cast(c_str(tmpname))); + if (tmpfd == -1) return mkfailure("Could not create temporary database"); // Rewrite the db, apply the update function to each entry buffer buf = mkbuffer(2048); - const failable r = rewrite(update, finish, buf, fd, cdb); + const failable r = rewrite(update, finish, buf, tmpfd, cdb); if (!hasContent(r)) { - close(fd); + close(tmpfd); free(buf); return r; } // Atomically replace the db and reopen it in read mode - if (rename(tmpfile, c_str(cdb.file)) == -1) + if (rename(c_str(tmpname), c_str(dbname(cdb))) == -1) return mkfailure("Could not rename temporary database"); - close(cdb.fd); - cdb.fd = open(c_str(cdb.file), O_RDONLY); + cdbclose(cdb); + failable ffd = cdbopen(cdb); + if (!hasContent(ffd)) + return mkfailure(reason(ffd)); return true; } @@ -230,6 +278,7 @@ const failable rewrite(const lambda(buffer& buf, const unsi const failable post(const value& key, const value& val, TinyCDB& cdb) { debug(key, "tinycdb::post::key"); debug(val, "tinycdb::post::value"); + debug(dbname(cdb), "tinycdb::post::dbname"); const string ks(scheme::writeValue(key)); const string vs(scheme::writeValue(val)); @@ -260,6 +309,7 @@ const failable post(const value& key, const value& val, TinyCDB& cdb) { const failable put(const value& key, const value& val, TinyCDB& cdb) { debug(key, "tinycdb::put::key"); debug(val, "tinycdb::put::value"); + debug(dbname(cdb), "tinycdb::put::dbname"); const string ks(scheme::writeValue(key)); const string vs(scheme::writeValue(val)); @@ -287,18 +337,22 @@ const failable put(const value& key, const value& val, TinyCDB& cdb) { /** * Get an item from the database. */ -const failable get(const value& key, const TinyCDB& cdb) { +const failable get(const value& key, TinyCDB& cdb) { debug(key, "tinycdb::get::key"); - if (cdb.fd == -1) - return mkfailure("Could not open database"); + debug(dbname(cdb), "tinycdb::get::dbname"); + + const failable ffd = cdbopen(cdb); + if (!hasContent(ffd)) + return mkfailure(reason(ffd)); + const int fd = content(ffd); const string ks(scheme::writeValue(key)); cdbi_t vlen; - if (cdb_seek(cdb.fd, c_str(ks), length(ks), &vlen) <= 0) + if (cdb_seek(fd, c_str(ks), length(ks), &vlen) <= 0) return mkfailure("Could not get entry"); char* data = gc_cnew(vlen + 1); - cdb_bread(cdb.fd, data, vlen); + cdb_bread(fd, data, vlen); data[vlen] = '\0'; const value val(scheme::readValue(string(data))); @@ -311,6 +365,7 @@ const failable get(const value& key, const TinyCDB& cdb) { */ const failable del(const value& key, TinyCDB& cdb) { debug(key, "tinycdb::delete::key"); + debug(dbname(cdb), "tinycdb::delete::dbname"); const string ks(scheme::writeValue(key)); diff --git a/sca-cpp/trunk/components/sqldb/pgsql.hpp b/sca-cpp/trunk/components/sqldb/pgsql.hpp index 25b55cc522..bb37d125b8 100644 --- a/sca-cpp/trunk/components/sqldb/pgsql.hpp +++ b/sca-cpp/trunk/components/sqldb/pgsql.hpp @@ -138,6 +138,7 @@ private: const failable post(const value& key, const value& val, const PGSql& pgsql) { debug(key, "pgsql::post::key"); debug(val, "pgsql::post::value"); + debug(pgsql.conninfo, "pgsql::post::conninfo"); debug(pgsql.table, "pgsql::post::table"); const string ks(scheme::writeValue(key)); @@ -158,6 +159,7 @@ const failable post(const value& key, const value& val, const PGSql& pgsql const failable put(const value& key, const value& val, const PGSql& pgsql) { debug(key, "pgsql::put::key"); debug(val, "pgsql::put::value"); + debug(pgsql.conninfo, "pgsql::put::conninfo"); debug(pgsql.table, "pgsql::put::table"); const string ks(scheme::writeValue(key)); @@ -188,6 +190,7 @@ const failable put(const value& key, const value& val, const PGSql& pgsql) */ const failable get(const value& key, const PGSql& pgsql) { debug(key, "pgsql::get::key"); + debug(pgsql.conninfo, "pgsql::get::conninfo"); debug(pgsql.table, "pgsql::get::table"); const string ks(scheme::writeValue(key)); @@ -212,6 +215,7 @@ const failable get(const value& key, const PGSql& pgsql) { */ const failable del(const value& key, const PGSql& pgsql) { debug(key, "pgsql::delete::key"); + debug(pgsql.conninfo, "pgsql::delete::conninfo"); debug(pgsql.table, "pgsql::delete::table"); const string ks(scheme::writeValue(key)); diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac index 9a522bd532..abcc948dd3 100644 --- a/sca-cpp/trunk/configure.ac +++ b/sca-cpp/trunk/configure.ac @@ -709,6 +709,7 @@ AC_CONFIG_FILES([Makefile test/store-java/Makefile test/store-gae/Makefile test/store-sql/Makefile + test/store-nosql/Makefile doc/Makefile doc/Doxyfile ]) diff --git a/sca-cpp/trunk/test/Makefile.am b/sca-cpp/trunk/test/Makefile.am index 76b761c4c8..a3e0cfa6b8 100644 --- a/sca-cpp/trunk/test/Makefile.am +++ b/sca-cpp/trunk/test/Makefile.am @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql +SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql store-nosql diff --git a/sca-cpp/trunk/test/store-nosql/Makefile.am b/sca-cpp/trunk/test/store-nosql/Makefile.am new file mode 100644 index 0000000000..345e58d544 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/Makefile.am @@ -0,0 +1,19 @@ +# 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. + +TESTS = server-test + diff --git a/sca-cpp/trunk/test/store-nosql/currency-converter.scm b/sca-cpp/trunk/test/store-nosql/currency-converter.scm new file mode 100644 index 0000000000..fc506c3d73 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/currency-converter.scm @@ -0,0 +1,27 @@ +; 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. + +; Currency converter implementation + +(define (convert from to amount) + (if (equal? to "EUR") (* amount 0.70) amount) +) + +(define (symbol currency) + (if (equal? currency "EUR") "E" "$") +) + diff --git a/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm b/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm new file mode 100644 index 0000000000..d79ff1b677 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm @@ -0,0 +1,33 @@ +; 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. + +; Catalog implementation + +(define (get converter currencyCode) + (define code (currencyCode)) + (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))) + ) +) + +; TODO remove these JSON-RPC specific functions +(define (listMethods converter currencyCode) (list "Service.get")) + diff --git a/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess b/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess new file mode 100644 index 0000000000..e2e343b6b2 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess @@ -0,0 +1,19 @@ +# +# 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. + +DirectoryIndex store.html diff --git a/sca-cpp/trunk/test/store-nosql/htdocs/store.html b/sca-cpp/trunk/test/store-nosql/htdocs/store.html new file mode 100644 index 0000000000..21eabca7a7 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/htdocs/store.html @@ -0,0 +1,169 @@ + + + +Store + + + + + + + + +

Store

+
+

Catalog

+
+
+
+ +
+ +
+ +

Your Shopping Cart

+
+
+
+
+
+ + + (feed) +
+
+ + diff --git a/sca-cpp/trunk/test/store-nosql/htdocs/store.js b/sca-cpp/trunk/test/store-nosql/htdocs/store.js new file mode 100644 index 0000000000..9cd8eb526d --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/htdocs/store.js @@ -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 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"); +tuscany.sca.referenceMap.shoppingTotal = new JSONRpcClient("/total").Service; +tuscany.sca.Reference = function (name) { + return tuscany.sca.referenceMap[name]; +} + +/** End of Apache Tuscany SCA Widget */ + diff --git a/sca-cpp/trunk/test/store-nosql/server-test b/sca-cpp/trunk/test/store-nosql/server-test new file mode 100755 index 0000000000..d2013f6892 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/server-test @@ -0,0 +1,40 @@ +#!/bin/sh + +# 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. + +echo "Testing..." +here=`readlink -f $0`; here=`dirname $here` +curl_prefix=`cat $here/../../modules/http/curl.prefix` + +# Setup +./start +sleep 2 + +# Test HTTP GET +$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html +diff tmp/store.html htdocs/store.html +rc=$? + +# Cleanup +./stop +sleep 2 + +if [ "$rc" = "0" ]; then + echo "OK" +fi +return $rc diff --git a/sca-cpp/trunk/test/store-nosql/shopping-cart.scm b/sca-cpp/trunk/test/store-nosql/shopping-cart.scm new file mode 100644 index 0000000000..484044d420 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/shopping-cart.scm @@ -0,0 +1,84 @@ +; 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. + +; Shopping cart implementation + +(define cartId "1234") + +; Get the shopping cart from the cache +; Return an empty cart if not found +(define (getcart id cache) + (define cart (cache "get" (list id))) + (if (nul cart) + (list) + cart) +) + +; Post a new item to the cart, create a new cart if necessary +(define (post collection item cache) + (define id (uuid)) + (define newItem (list (car item) id (caddr item))) + (define cart (cons newItem (getcart cartId cache))) + (cache "put" (list cartId) cart) + (list id) +) + +; 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)))) +) + +; Get items from the cart +(define (get id cache) + (if (nul id) + (cons "Your Cart" (cons cartId (getcart cartId cache))) + (find (car id) (getcart cartId cache)) + ) +) + +; Delete items from the cart +(define (delete id cache) + (if (nul id) + (cache "delete" (list cartId)) + true + ) +) + +; Return the price of an item +(define (price item) + (cadr (assoc 'price (caddr item))) +) + +; Sum the prices of a list of items +(define (sum items) + (if (nul items) + 0 + (+ (price (car items)) (sum (cdr items)))) +) + +; Return the total price of the items in the cart +(define (gettotal cache) + (define cart (getcart cartId cache)) + (sum cart) +) + +; TODO remove these JSON-RPC specific functions +(define (listMethods cache) (list "Service.gettotal")) diff --git a/sca-cpp/trunk/test/store-nosql/ssl-start b/sca-cpp/trunk/test/store-nosql/ssl-start new file mode 100755 index 0000000000..b18a8e4af1 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/ssl-start @@ -0,0 +1,34 @@ +#!/bin/sh + +# 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. + +../../modules/http/httpd-ca-conf tmp localhost +../../modules/http/httpd-cert-conf tmp localhost +../../modules/http/httpd-conf tmp localhost 8090 htdocs +../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs +../../modules/server/server-conf tmp +../../modules/server/scheme-conf tmp +cat >>tmp/conf/httpd.conf <>tmp/conf/httpd.conf < + + + + + + + + + + + + + + + + USD + + + + + + + + + + + + + + + + + + + + + + + + + + + tmp/store.cdb + + + + + + diff --git a/sca-cpp/trunk/test/store-nosql/store.scm b/sca-cpp/trunk/test/store-nosql/store.scm new file mode 100644 index 0000000000..d851dc7ed6 --- /dev/null +++ b/sca-cpp/trunk/test/store-nosql/store.scm @@ -0,0 +1,50 @@ +; 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. + +; Store implementation + +(define (post item catalog shoppingCart shoppingTotal) + (shoppingCart "post" item) +) + +(define (getall catalog shoppingCart shoppingTotal) + (shoppingCart "getall") +) + +(define (get id catalog shoppingCart shoppingTotal) + (shoppingCart "get" id) +) + +(define (getcatalog catalog shoppingCart shoppingTotal) + (catalog "get") +) + +(define (gettotal catalog shoppingCart shoppingTotal) + (shoppingCart "gettotal") +) + +(define (deleteall catalog shoppingCart shoppingTotal) + (shoppingCart "deleteall") +) + +(define (delete id catalog shoppingCart shoppingTotal) + (shoppingCart "delete" id) +) + +; TODO remove these JSON-RPC specific functions +(define (listMethods catalog shoppingCart shoppingTotal) (list "Service.getcatalog" "Service.gettotal")) + -- cgit v1.2.3