You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/04/19 08:26:26 UTC
svn commit: r935459 - in /tuscany/sca-cpp/trunk: ./ components/nosqldb/
components/sqldb/ test/ test/store-nosql/ test/store-nosql/htdocs/
Author: jsdelfino
Date: Mon Apr 19 06:26:26 2010
New Revision: 935459
URL: http://svn.apache.org/viewvc?rev=935459&view=rev
Log:
Add a tinycdb-based nosql SCA component and integrate with server. Add a version of the store test that works with the nosql component.
Added:
tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.composite
- copied, changed from r935458, tuscany/sca-cpp/trunk/components/nosqldb/store.composite
tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.cpp
tuscany/sca-cpp/trunk/test/store-nosql/
tuscany/sca-cpp/trunk/test/store-nosql/Makefile.am
- copied, changed from r935458, tuscany/sca-cpp/trunk/test/Makefile.am
tuscany/sca-cpp/trunk/test/store-nosql/currency-converter.scm
tuscany/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm
tuscany/sca-cpp/trunk/test/store-nosql/htdocs/
tuscany/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess
- copied, changed from r935458, tuscany/sca-cpp/trunk/test/Makefile.am
tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.html
tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.js
tuscany/sca-cpp/trunk/test/store-nosql/server-test
- copied, changed from r935458, tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test
tuscany/sca-cpp/trunk/test/store-nosql/shopping-cart.scm
tuscany/sca-cpp/trunk/test/store-nosql/ssl-start
- copied, changed from r935458, tuscany/sca-cpp/trunk/components/nosqldb/server-test
tuscany/sca-cpp/trunk/test/store-nosql/start
- copied, changed from r935458, tuscany/sca-cpp/trunk/components/nosqldb/server-test
tuscany/sca-cpp/trunk/test/store-nosql/stop (contents, props changed)
- copied, changed from r935458, tuscany/sca-cpp/trunk/test/Makefile.am
tuscany/sca-cpp/trunk/test/store-nosql/store.composite
tuscany/sca-cpp/trunk/test/store-nosql/store.scm
Removed:
tuscany/sca-cpp/trunk/components/nosqldb/store.composite
Modified:
tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am
tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test
tuscany/sca-cpp/trunk/components/nosqldb/server-test
tuscany/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp
tuscany/sca-cpp/trunk/components/nosqldb/tinycdb.hpp
tuscany/sca-cpp/trunk/components/sqldb/pgsql.hpp
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/test/Makefile.am
Modified: tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am Mon Apr 19 06:26:26 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test Mon Apr 19 06:26:26 2010
@@ -19,13 +19,10 @@
# Setup
mkdir -p tmp
-rm -f tmp/db.cdb
-cat >tmp/db.txt <<EOF
-EOF
-./tinycdb -c -m tmp/db.cdb <tmp/db.txt
+./tinycdb -c -m tmp/test.cdb </dev/null
# Test
-./tinycdb-test # 2>/dev/null
+./tinycdb-test 2>/dev/null
rc=$?
# Cleanup
Copied: tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.composite (from r935458, tuscany/sca-cpp/trunk/components/nosqldb/store.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.composite?p2=tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.composite&p1=tuscany/sca-cpp/trunk/components/nosqldb/store.composite&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/store.composite (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.composite Mon Apr 19 06:26:26 2010
@@ -20,12 +20,13 @@
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://tuscany.apache.org/xmlns/sca/components"
- name="store">
+ name="nosqldb">
- <component name="store">
- <implementation.cpp path=".libs" library="libstore"/>
- <service name="store">
- <t:binding.http uri="store"/>
+ <component name="nosqldb">
+ <implementation.cpp path=".libs" library="libnosqldb"/>
+ <property name="dbname">tmp/test.cdb</property>
+ <service name="nosqldb">
+ <t:binding.http uri="nosqldb"/>
</service>
</component>
Added: tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.cpp?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.cpp (added)
+++ tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.cpp Mon Apr 19 06:26:26 2010
@@ -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 <apr_uuid.h>
+
+#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<value> get(const list<value>& 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<value> post(const list<value>& params, tinycdb::TinyCDB& cdb) {
+ const value id = append<value>(car(params), mklist(uuidValue()));
+ const failable<bool> val = tinycdb::post(id, cadr(params), cdb);
+ if (!hasContent(val))
+ return mkfailure<value>(reason(val));
+ return id;
+}
+
+/**
+ * Put an item into the database.
+ */
+const failable<value> put(const list<value>& params, tinycdb::TinyCDB& cdb) {
+ const failable<bool> val = tinycdb::put(car(params), cadr(params), cdb);
+ if (!hasContent(val))
+ return mkfailure<value>(reason(val));
+ return value(content(val));
+}
+
+/**
+ * Delete an item from the database.
+ */
+const failable<value> del(const list<value>& params, tinycdb::TinyCDB& cdb) {
+ const failable<bool> val = tinycdb::del(car(params), cdb);
+ if (!hasContent(val))
+ return mkfailure<value>(reason(val));
+ return value(content(val));
+}
+
+/**
+ * Component implementation lambda function.
+ */
+class applyNoSqldb {
+public:
+ applyNoSqldb(tinycdb::TinyCDB& cdb) : cdb(cdb) {
+ }
+
+ const value operator()(const list<value>& 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<tuscany::value>();
+ }
+
+private:
+ tinycdb::TinyCDB& cdb;
+};
+
+/**
+ * Start the component.
+ */
+const failable<value> start(unused const list<value>& params) {
+ // Connect to the configured database and table
+ const value dbname = ((lambda<value(list<value>)>)car(params))(list<value>());
+ tinycdb::TinyCDB& cdb = *(new (gc_new<tinycdb::TinyCDB>()) tinycdb::TinyCDB(dbname));
+
+ // Return the component implementation lambda function
+ return value(lambda<value(const list<value>&)>(applyNoSqldb(cdb)));
+}
+
+}
+}
+
+extern "C" {
+
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
+ const tuscany::value func(car(params));
+ if (func == "start")
+ return tuscany::nosqldb::start(cdr(params));
+ return tuscany::mkfailure<tuscany::value>();
+}
+
+}
Modified: tuscany/sca-cpp/trunk/components/nosqldb/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/server-test?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/server-test (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/server-test Mon Apr 19 06:26:26 2010
@@ -23,12 +23,10 @@
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
SCAContribution `pwd`/
-SCAComposite sqldb.composite
+SCAComposite nosqldb.composite
EOF
-./pgsql-start tmp
-./pgsql "drop table test;" 1>/dev/null 2>&1
-./pgsql "create table test(key text, value text);" 1>/dev/null 2>&1
+./tinycdb -c -m tmp/test.cdb </dev/null
../../modules/http/httpd-start tmp
sleep 2
@@ -38,6 +36,5 @@ rc=$?
# Cleanup
../../modules/http/httpd-stop tmp
-./pgsql-stop tmp
sleep 2
return $rc
Modified: tuscany/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp Mon Apr 19 06:26:26 2010
@@ -33,7 +33,7 @@ namespace tuscany {
namespace tinycdb {
bool testTinyCDB() {
- TinyCDB cdb("tmp/db.cdb");
+ TinyCDB cdb("tmp/test.cdb");
const value k = mklist<value>("a");
assert(hasContent(post(k, string("AAA"), cdb)));
@@ -59,7 +59,7 @@ struct getLoop {
bool testGetPerf() {
const value k = mklist<value>("c");
- TinyCDB cdb("tmp/db.cdb");
+ TinyCDB cdb("tmp/test.cdb");
assert(hasContent(post(k, string("CCC"), cdb)));
const lambda<bool()> gl = getLoop(k, cdb);
Modified: tuscany/sca-cpp/trunk/components/nosqldb/tinycdb.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/tinycdb.hpp?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/tinycdb.hpp (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/tinycdb.hpp Mon Apr 19 06:26:26 2010
@@ -23,6 +23,8 @@
#define tuscany_tinycdb_hpp
#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
#include <cdb.h>
#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;
+ struct stat st;
- friend const failable<bool> post(const value& key, const value& val, TinyCDB& cdb);
- friend const failable<bool> put(const value& key, const value& val, const TinyCDB& cdb);
- friend const failable<value> get(const value& key, const TinyCDB& cdb);
- friend const failable<bool> del(const value& key, const TinyCDB& cdb);
- friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, TinyCDB& cdb);
- friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb);
+ //friend const failable<bool> post(const value& key, const value& val, TinyCDB& cdb);
+ //friend const failable<bool> put(const value& key, const value& val, TinyCDB& cdb);
+ //friend const failable<value> get(const value& key, const TinyCDB& cdb);
+ //friend const failable<bool> del(const value& key, TinyCDB& cdb);
+ //friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, TinyCDB& cdb);
+ //friend const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb);
+
+ friend const string dbname(const TinyCDB& cdb);
+ friend const failable<int> cdbopen(TinyCDB& cdb);
+ friend const failable<bool> cdbclose(TinyCDB& cdb);
};
/**
+ * Return the name of the database.
+ */
+const string dbname(const TinyCDB& cdb) {
+ return cdb.name;
+}
+
+/**
+ * Open a database.
+ */
+const failable<int> cdbopen(TinyCDB& cdb) {
+ struct stat st;
+ int s = stat(c_str(cdb.name), &st);
+ if (s == -1)
+ return mkfailure<int>(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<int>(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<bool> 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<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, buffer& buf, const int fd, TinyCDB& cdb) {
+const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(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<int> ffd = cdbopen(cdb);
+ if (!hasContent(ffd))
+ return mkfailure<bool>(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<bool>("Could not seek to database start");
- if (::read(cdb.fd, buf, 2048) != 2048)
+ if (::read(fd, buf, 2048) != 2048)
return mkfailure<bool>("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<bool>("Invalid database format, couldn't read entry header");
- if (::read(cdb.fd, buf, 8) != 8)
+ if (::read(fd, buf, 8) != 8)
return mkfailure<bool>("Couldn't read entry header");
pos += 8;
unsigned int klen = cdb_unpack(buf);
@@ -161,13 +210,13 @@ const failable<bool> rewrite(const lambd
buf = mkbuffer(buf, elen);
if (eod - pos < elen)
return mkfailure<bool>("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<bool>("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<bool> u = update(buf, klen, vlen);
if (!hasContent(u))
return u;
@@ -196,30 +245,29 @@ const failable<bool> rewrite(const lambd
}
const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsigned int klen, const unsigned int vlen)>& update, const lambda<failable<bool>(struct cdb_make&)>& finish, TinyCDB& cdb) {
- if (cdb.fd == -1)
- return mkfailure<bool>("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<char*>(c_str(tmpname)));
+ if (tmpfd == -1)
return mkfailure<bool>("Could not create temporary database");
// Rewrite the db, apply the update function to each entry
buffer buf = mkbuffer(2048);
- const failable<bool> r = rewrite(update, finish, buf, fd, cdb);
+ const failable<bool> 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<bool>("Could not rename temporary database");
- close(cdb.fd);
- cdb.fd = open(c_str(cdb.file), O_RDONLY);
+ cdbclose(cdb);
+ failable<int> ffd = cdbopen(cdb);
+ if (!hasContent(ffd))
+ return mkfailure<bool>(reason(ffd));
return true;
}
@@ -230,6 +278,7 @@ const failable<bool> rewrite(const lambd
const failable<bool> 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<bool> post(const value& k
const failable<bool> 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<bool> put(const value& ke
/**
* Get an item from the database.
*/
-const failable<value> get(const value& key, const TinyCDB& cdb) {
+const failable<value> get(const value& key, TinyCDB& cdb) {
debug(key, "tinycdb::get::key");
- if (cdb.fd == -1)
- return mkfailure<value>("Could not open database");
+ debug(dbname(cdb), "tinycdb::get::dbname");
+
+ const failable<int> ffd = cdbopen(cdb);
+ if (!hasContent(ffd))
+ return mkfailure<value>(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<value>("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<value> get(const value& k
*/
const failable<bool> del(const value& key, TinyCDB& cdb) {
debug(key, "tinycdb::delete::key");
+ debug(dbname(cdb), "tinycdb::delete::dbname");
const string ks(scheme::writeValue(key));
Modified: tuscany/sca-cpp/trunk/components/sqldb/pgsql.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/pgsql.hpp?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/pgsql.hpp (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/pgsql.hpp Mon Apr 19 06:26:26 2010
@@ -138,6 +138,7 @@ private:
const failable<bool> 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<bool> post(const value& k
const failable<bool> 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<bool> put(const value& ke
*/
const failable<value> 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<value> get(const value& k
*/
const failable<bool> 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));
Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Mon Apr 19 06:26:26 2010
@@ -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
])
Modified: tuscany/sca-cpp/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/Makefile.am?rev=935459&r1=935458&r2=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/Makefile.am Mon Apr 19 06:26:26 2010
@@ -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
Copied: tuscany/sca-cpp/trunk/test/store-nosql/Makefile.am (from r935458, tuscany/sca-cpp/trunk/test/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/Makefile.am?p2=tuscany/sca-cpp/trunk/test/store-nosql/Makefile.am&p1=tuscany/sca-cpp/trunk/test/Makefile.am&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-nosql/Makefile.am Mon Apr 19 06:26:26 2010
@@ -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
+TESTS = server-test
Added: tuscany/sca-cpp/trunk/test/store-nosql/currency-converter.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/currency-converter.scm?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/currency-converter.scm (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/currency-converter.scm Mon Apr 19 06:26:26 2010
@@ -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" "$")
+)
+
Added: tuscany/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm Mon Apr 19 06:26:26 2010
@@ -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"))
+
Copied: tuscany/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess (from r935458, tuscany/sca-cpp/trunk/test/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess?p2=tuscany/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess&p1=tuscany/sca-cpp/trunk/test/Makefile.am&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess Mon Apr 19 06:26:26 2010
@@ -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,5 +16,4 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql
-
+DirectoryIndex store.html
Added: tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.html?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.html (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.html Mon Apr 19 06:26:26 2010
@@ -0,0 +1,169 @@
+<!--
+ * 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;
+
+ // TEMP
+ shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
+ }
+
+ 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 type="text">Item</title><content type="application/xml">' +
+ '<item>' +
+ '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +
+ '<name>' + catalogItems[i].name + '</name>' +
+ '<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +
+ '<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +
+ '<price>' + 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/">(feed)</a>
+ </form>
+ </div>
+</body>
+</html>
Added: tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.js
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.js?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.js (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/htdocs/store.js Mon Apr 19 06:26:26 2010
@@ -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");
+tuscany.sca.referenceMap.shoppingTotal = new JSONRpcClient("/total").Service;
+tuscany.sca.Reference = function (name) {
+ return tuscany.sca.referenceMap[name];
+}
+
+/** End of Apache Tuscany SCA Widget */
+
Copied: tuscany/sca-cpp/trunk/test/store-nosql/server-test (from r935458, tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/server-test?p2=tuscany/sca-cpp/trunk/test/store-nosql/server-test&p1=tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/nosqldb-test (original)
+++ tuscany/sca-cpp/trunk/test/store-nosql/server-test Mon Apr 19 06:26:26 2010
@@ -17,16 +17,24 @@
# 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
-mkdir -p tmp
-rm -f tmp/db.cdb
-cat >tmp/db.txt <<EOF
-EOF
-./tinycdb -c -m tmp/db.cdb <tmp/db.txt
+./start
+sleep 2
-# Test
-./tinycdb-test # 2>/dev/null
+# 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
Added: tuscany/sca-cpp/trunk/test/store-nosql/shopping-cart.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/shopping-cart.scm?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/shopping-cart.scm (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/shopping-cart.scm Mon Apr 19 06:26:26 2010
@@ -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"))
Copied: tuscany/sca-cpp/trunk/test/store-nosql/ssl-start (from r935458, tuscany/sca-cpp/trunk/components/nosqldb/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/ssl-start?p2=tuscany/sca-cpp/trunk/test/store-nosql/ssl-start&p1=tuscany/sca-cpp/trunk/components/nosqldb/server-test&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-nosql/ssl-start Mon Apr 19 06:26:26 2010
@@ -17,27 +17,18 @@
# specific language governing permissions and limitations
# under the License.
-# Setup
-../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
+../../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 <<EOF
+# Configure SCA Composite
SCAContribution `pwd`/
-SCAComposite sqldb.composite
+SCAComposite store.composite
+
EOF
-./pgsql-start tmp
-./pgsql "drop table test;" 1>/dev/null 2>&1
-./pgsql "create table test(key text, value text);" 1>/dev/null 2>&1
+../../components/nosqldb/tinycdb -c -m tmp/store.cdb </dev/null
../../modules/http/httpd-start tmp
-sleep 2
-
-# Test
-./client-test 2>/dev/null
-rc=$?
-
-# Cleanup
-../../modules/http/httpd-stop tmp
-./pgsql-stop tmp
-sleep 2
-return $rc
Copied: tuscany/sca-cpp/trunk/test/store-nosql/start (from r935458, tuscany/sca-cpp/trunk/components/nosqldb/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/start?p2=tuscany/sca-cpp/trunk/test/store-nosql/start&p1=tuscany/sca-cpp/trunk/components/nosqldb/server-test&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-nosql/start Mon Apr 19 06:26:26 2010
@@ -17,27 +17,15 @@
# specific language governing permissions and limitations
# under the License.
-# Setup
-../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
+# Configure SCA Composite
SCAContribution `pwd`/
-SCAComposite sqldb.composite
+SCAComposite store.composite
+
EOF
-./pgsql-start tmp
-./pgsql "drop table test;" 1>/dev/null 2>&1
-./pgsql "create table test(key text, value text);" 1>/dev/null 2>&1
+../../components/nosqldb/tinycdb -c -m tmp/store.cdb </dev/null
../../modules/http/httpd-start tmp
-sleep 2
-
-# Test
-./client-test 2>/dev/null
-rc=$?
-
-# Cleanup
-../../modules/http/httpd-stop tmp
-./pgsql-stop tmp
-sleep 2
-return $rc
Copied: tuscany/sca-cpp/trunk/test/store-nosql/stop (from r935458, tuscany/sca-cpp/trunk/test/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/stop?p2=tuscany/sca-cpp/trunk/test/store-nosql/stop&p1=tuscany/sca-cpp/trunk/test/Makefile.am&r1=935458&r2=935459&rev=935459&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-nosql/stop Mon Apr 19 06:26:26 2010
@@ -1,3 +1,5 @@
+#!/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
@@ -15,5 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql
-
+../../modules/http/httpd-stop tmp
Propchange: tuscany/sca-cpp/trunk/test/store-nosql/stop
------------------------------------------------------------------------------
svn:executable = *
Added: tuscany/sca-cpp/trunk/test/store-nosql/store.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/store.composite?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/store.composite (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/store.composite Mon Apr 19 06:26:26 2010
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+ targetNamespace="http://store"
+ name="store">
+
+ <component name="Store">
+ <t:implementation.scheme script="store.scm"/>
+ <service name="Widget">
+ <t:binding.http uri="store"/>
+ </service>
+ <reference name="catalog" target="Catalog"/>
+ <reference name="shoppingCart" target="ShoppingCart/Cart"/>
+ <reference name="shoppingTotal" target="ShoppingCart/Total"/>
+ </component>
+
+ <component name="Catalog">
+ <t:implementation.scheme script="fruits-catalog.scm"/>
+ <property name="currencyCode">USD</property>
+ <service name="Catalog">
+ <t:binding.jsonrpc uri="catalog"/>
+ </service>
+ <reference name="currencyConverter" target="CurrencyConverter"/>
+ </component>
+
+ <component name="ShoppingCart">
+ <t:implementation.scheme script="shopping-cart.scm"/>
+ <service name="ShoppingCart">
+ <t:binding.atom uri="shoppingCart"/>
+ </service>
+ <service name="Total">
+ <t:binding.jsonrpc uri="total"/>
+ </service>
+ <reference name="cache" target="NoSqldb"/>
+ </component>
+
+ <component name="CurrencyConverter">
+ <t:implementation.scheme script="currency-converter.scm"/>
+ <service name="CurrencyConverter">
+ <t:binding.jsonrpc uri="currencyConverter"/>
+ </service>
+ </component>
+
+ <component name="NoSqldb">
+ <implementation.cpp path="../../components/nosqldb/.libs" library="libnosqldb"/>
+ <property name="dbname">tmp/store.cdb</property>
+ <service name="NoSqldb">
+ <t:binding.atom uri="nosqldb"/>
+ </service>
+ </component>
+
+</composite>
Added: tuscany/sca-cpp/trunk/test/store-nosql/store.scm
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-nosql/store.scm?rev=935459&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-nosql/store.scm (added)
+++ tuscany/sca-cpp/trunk/test/store-nosql/store.scm Mon Apr 19 06:26:26 2010
@@ -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"))
+