diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-09-10 18:11:07 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-09-10 18:11:07 +0000 |
commit | b37688077276bd362764b42af655a667502d7410 (patch) | |
tree | 8dbc7e9e47fe1863f852300a3cd98b622ab58dd1 /sca-cpp/trunk/components | |
parent | 4be6e6a0226c629fe14315e6269262bb102dfd3a (diff) |
Rename nosqldb component to constdb.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1167575 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-cpp/trunk/components/Makefile.am | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/Makefile.am (renamed from sca-cpp/trunk/components/nosqldb/Makefile.am) | 22 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/client-test.cpp (renamed from sca-cpp/trunk/components/nosqldb/client-test.cpp) | 12 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/constdb/constdb-test (renamed from sca-cpp/trunk/components/nosqldb/nosqldb-test) | 0 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/constdb.componentType (renamed from sca-cpp/trunk/components/nosqldb/nosqldb.componentType) | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/constdb.composite (renamed from sca-cpp/trunk/components/nosqldb/nosqldb.composite) | 10 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/constdb.cpp (renamed from sca-cpp/trunk/components/nosqldb/nosqldb.cpp) | 10 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/constdb/server-test (renamed from sca-cpp/trunk/components/nosqldb/server-test) | 2 | ||||
-rwxr-xr-x | sca-cpp/trunk/components/constdb/tinycdb (renamed from sca-cpp/trunk/components/nosqldb/tinycdb) | 0 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/tinycdb-test.cpp (renamed from sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp) | 0 | ||||
-rw-r--r-- | sca-cpp/trunk/components/constdb/tinycdb.hpp (renamed from sca-cpp/trunk/components/nosqldb/tinycdb.hpp) | 0 |
11 files changed, 30 insertions, 30 deletions
diff --git a/sca-cpp/trunk/components/Makefile.am b/sca-cpp/trunk/components/Makefile.am index f3116a9c45..078e04ee74 100644 --- a/sca-cpp/trunk/components/Makefile.am +++ b/sca-cpp/trunk/components/Makefile.am @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -SUBDIRS = cache chat http log nosqldb filedb queue sqldb webservice +SUBDIRS = cache chat http log constdb filedb queue sqldb webservice diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/constdb/Makefile.am index 03357ccb32..e4504a53e7 100644 --- a/sca-cpp/trunk/components/nosqldb/Makefile.am +++ b/sca-cpp/trunk/components/constdb/Makefile.am @@ -18,24 +18,24 @@ INCLUDES = -I${TINYCDB_INCLUDE} incl_HEADERS = *.hpp -incldir = $(prefix)/include/components/nosqldb +incldir = $(prefix)/include/components/constdb dist_comp_SCRIPTS = tinycdb -compdir=$(prefix)/components/nosqldb +compdir=$(prefix)/components/constdb comp_DATA = tinycdb.prefix tinycdb.prefix: $(top_builddir)/config.status echo ${TINYCDB_PREFIX} >tinycdb.prefix -EXTRA_DIST = nosqldb.composite nosqldb.componentType +EXTRA_DIST = constdb.composite constdb.componentType -comp_LTLIBRARIES = libnosqldb.la -noinst_DATA = libnosqldb${libsuffix} +comp_LTLIBRARIES = libconstdb.la +noinst_DATA = libconstdb${libsuffix} -libnosqldb_la_SOURCES = nosqldb.cpp -libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb -libnosqldb${libsuffix}: - ln -s .libs/libnosqldb${libsuffix} +libconstdb_la_SOURCES = constdb.cpp +libconstdb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb +libconstdb${libsuffix}: + ln -s .libs/libconstdb${libsuffix} tinycdb_test_SOURCES = tinycdb-test.cpp tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb @@ -43,7 +43,7 @@ tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -dist_noinst_SCRIPTS = nosqldb-test server-test +dist_noinst_SCRIPTS = constdb-test server-test noinst_PROGRAMS = tinycdb-test client-test -TESTS = nosqldb-test server-test +TESTS = constdb-test server-test diff --git a/sca-cpp/trunk/components/nosqldb/client-test.cpp b/sca-cpp/trunk/components/constdb/client-test.cpp index 970f817d5a..766e1d2583 100644 --- a/sca-cpp/trunk/components/nosqldb/client-test.cpp +++ b/sca-cpp/trunk/components/constdb/client-test.cpp @@ -34,11 +34,11 @@ #include "../../modules/http/http.hpp" namespace tuscany { -namespace nosqldb { +namespace constdb { -const string uri("http://localhost:8090/nosqldb"); +const string uri("http://localhost:8090/constdb"); -bool testNoSqlDb() { +bool testConstDb() { http::CURLSession cs("", "", "", ""); const list<value> i = list<value>() + "content" + (list<value>() + "item" @@ -119,7 +119,7 @@ bool testGetPerf() { const string p = path(content(id)); const lambda<bool()> gl = getLoop(p, a, cs); - cout << "NoSqldb get test " << time(gl, 5, 200) << " ms" << endl; + cout << "ConstDb get test " << time(gl, 5, 200) << " ms" << endl; return true; } @@ -130,8 +130,8 @@ bool testGetPerf() { int main() { tuscany::cout << "Testing..." << tuscany::endl; - tuscany::nosqldb::testNoSqlDb(); - tuscany::nosqldb::testGetPerf(); + tuscany::constdb::testConstDb(); + tuscany::constdb::testGetPerf(); tuscany::cout << "OK" << tuscany::endl; diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb-test b/sca-cpp/trunk/components/constdb/constdb-test index 3730ed67a4..3730ed67a4 100755 --- a/sca-cpp/trunk/components/nosqldb/nosqldb-test +++ b/sca-cpp/trunk/components/constdb/constdb-test diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.componentType b/sca-cpp/trunk/components/constdb/constdb.componentType index bb79882b5d..c96d2c8f1f 100644 --- a/sca-cpp/trunk/components/nosqldb/nosqldb.componentType +++ b/sca-cpp/trunk/components/constdb/constdb.componentType @@ -22,7 +22,7 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://tuscany.apache.org/xmlns/sca/components"> - <service name="nosqldb"/> + <service name="constdb"/> <property name="dbname" type="xsd:string"/> </composite> diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.composite b/sca-cpp/trunk/components/constdb/constdb.composite index 15c030a72c..ea6b4907c8 100644 --- a/sca-cpp/trunk/components/nosqldb/nosqldb.composite +++ b/sca-cpp/trunk/components/constdb/constdb.composite @@ -19,13 +19,13 @@ --> <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://tuscany.apache.org/xmlns/sca/components" - name="nosqldb"> + name="constdb"> - <component name="nosqldb"> - <implementation.cpp path="." library="libnosqldb"/> + <component name="constdb"> + <implementation.cpp path="." library="libconstdb"/> <property name="dbname">tmp/test.cdb</property> - <service name="nosqldb"> - <binding.http uri="nosqldb"/> + <service name="constdb"> + <binding.http uri="constdb"/> </service> </component> diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.cpp b/sca-cpp/trunk/components/constdb/constdb.cpp index cda3ca44a9..c76206b550 100644 --- a/sca-cpp/trunk/components/nosqldb/nosqldb.cpp +++ b/sca-cpp/trunk/components/constdb/constdb.cpp @@ -31,7 +31,7 @@ #include "tinycdb.hpp" namespace tuscany { -namespace nosqldb { +namespace constdb { /** * Get an item from the database. @@ -74,9 +74,9 @@ const failable<value> del(const list<value>& params, tinycdb::TinyCDB& cdb) { /** * Component implementation lambda function. */ -class applyNoSqldb { +class applyConstDb { public: - applyNoSqldb(tinycdb::TinyCDB& cdb) : cdb(cdb) { + applyConstDb(tinycdb::TinyCDB& cdb) : cdb(cdb) { } const value operator()(const list<value>& params) const { @@ -105,7 +105,7 @@ const failable<value> start(unused const list<value>& params) { 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))); + return value(lambda<value(const list<value>&)>(applyConstDb(cdb))); } } @@ -116,7 +116,7 @@ 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::constdb::start(cdr(params)); return tuscany::mkfailure<tuscany::value>(); } diff --git a/sca-cpp/trunk/components/nosqldb/server-test b/sca-cpp/trunk/components/constdb/server-test index d156f982c1..6d53e641ae 100755 --- a/sca-cpp/trunk/components/nosqldb/server-test +++ b/sca-cpp/trunk/components/constdb/server-test @@ -24,7 +24,7 @@ ../../modules/server/scheme-conf tmp cat >>tmp/conf/httpd.conf <<EOF SCAContribution `pwd`/ -SCAComposite nosqldb.composite +SCAComposite constdb.composite EOF ./tinycdb -c -m tmp/test.cdb </dev/null diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb b/sca-cpp/trunk/components/constdb/tinycdb index 3e5c23957f..3e5c23957f 100755 --- a/sca-cpp/trunk/components/nosqldb/tinycdb +++ b/sca-cpp/trunk/components/constdb/tinycdb diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp b/sca-cpp/trunk/components/constdb/tinycdb-test.cpp index b3b4ea7fd7..b3b4ea7fd7 100644 --- a/sca-cpp/trunk/components/nosqldb/tinycdb-test.cpp +++ b/sca-cpp/trunk/components/constdb/tinycdb-test.cpp diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb.hpp b/sca-cpp/trunk/components/constdb/tinycdb.hpp index e26001dc59..e26001dc59 100644 --- a/sca-cpp/trunk/components/nosqldb/tinycdb.hpp +++ b/sca-cpp/trunk/components/constdb/tinycdb.hpp |