Rename nosqldb component to constdb.
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk@1167575 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/components/Makefile.am b/components/Makefile.am
index f3116a9..078e04e 100644
--- a/components/Makefile.am
+++ b/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/components/nosqldb/Makefile.am b/components/constdb/Makefile.am
similarity index 73%
rename from components/nosqldb/Makefile.am
rename to components/constdb/Makefile.am
index 03357cc..e4504a5 100644
--- a/components/nosqldb/Makefile.am
+++ b/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 @@
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/components/nosqldb/client-test.cpp b/components/constdb/client-test.cpp
similarity index 94%
rename from components/nosqldb/client-test.cpp
rename to components/constdb/client-test.cpp
index 970f817..766e1d2 100644
--- a/components/nosqldb/client-test.cpp
+++ b/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 @@
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 @@
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/components/nosqldb/nosqldb-test b/components/constdb/constdb-test
similarity index 100%
rename from components/nosqldb/nosqldb-test
rename to components/constdb/constdb-test
diff --git a/components/nosqldb/nosqldb.componentType b/components/constdb/constdb.componentType
similarity index 97%
rename from components/nosqldb/nosqldb.componentType
rename to components/constdb/constdb.componentType
index bb79882..c96d2c8 100644
--- a/components/nosqldb/nosqldb.componentType
+++ b/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/components/nosqldb/nosqldb.composite b/components/constdb/constdb.composite
similarity index 85%
rename from components/nosqldb/nosqldb.composite
rename to components/constdb/constdb.composite
index 15c030a..ea6b490 100644
--- a/components/nosqldb/nosqldb.composite
+++ b/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/components/nosqldb/nosqldb.cpp b/components/constdb/constdb.cpp
similarity index 93%
rename from components/nosqldb/nosqldb.cpp
rename to components/constdb/constdb.cpp
index cda3ca4..c76206b 100644
--- a/components/nosqldb/nosqldb.cpp
+++ b/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 @@
/**
* 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 @@
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 @@
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/components/nosqldb/server-test b/components/constdb/server-test
similarity index 97%
rename from components/nosqldb/server-test
rename to components/constdb/server-test
index d156f98..6d53e64 100755
--- a/components/nosqldb/server-test
+++ b/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/components/nosqldb/tinycdb b/components/constdb/tinycdb
similarity index 100%
rename from components/nosqldb/tinycdb
rename to components/constdb/tinycdb
diff --git a/components/nosqldb/tinycdb-test.cpp b/components/constdb/tinycdb-test.cpp
similarity index 100%
rename from components/nosqldb/tinycdb-test.cpp
rename to components/constdb/tinycdb-test.cpp
diff --git a/components/nosqldb/tinycdb.hpp b/components/constdb/tinycdb.hpp
similarity index 100%
rename from components/nosqldb/tinycdb.hpp
rename to components/constdb/tinycdb.hpp
diff --git a/configure.ac b/configure.ac
index d0f5a29..92805a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -995,7 +995,7 @@
components/cache/Makefile
components/log/Makefile
components/chat/Makefile
- components/nosqldb/Makefile
+ components/constdb/Makefile
components/filedb/Makefile
components/http/Makefile
components/queue/Makefile
@@ -1008,7 +1008,7 @@
samples/store-java/Makefile
samples/store-gae/Makefile
samples/store-sql/Makefile
- samples/store-nosql/Makefile
+ samples/store-constdb/Makefile
samples/store-vhost/Makefile
samples/store-cluster/Makefile
samples/relay-python/Makefile
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 135674a..604a963 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql store-nosql store-vhost store-cluster relay-python relay-gae
+SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql store-constdb store-vhost store-cluster relay-python relay-gae
sample_DATA = README
sampledir=$(prefix)/samples
diff --git a/samples/store-nosql/Makefile.am b/samples/store-constdb/Makefile.am
similarity index 95%
rename from samples/store-nosql/Makefile.am
rename to samples/store-constdb/Makefile.am
index e69d8a1..d2783f3 100644
--- a/samples/store-nosql/Makefile.am
+++ b/samples/store-constdb/Makefile.am
@@ -16,7 +16,7 @@
# under the License.
dist_sample_SCRIPTS = start stop ssl-start
-sampledir = $(prefix)/samples/store-nosql
+sampledir = $(prefix)/samples/store-constdb
nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*.html
diff --git a/samples/store-nosql/currency-converter.scm b/samples/store-constdb/currency-converter.scm
similarity index 100%
rename from samples/store-nosql/currency-converter.scm
rename to samples/store-constdb/currency-converter.scm
diff --git a/samples/store-nosql/fruits-catalog.scm b/samples/store-constdb/fruits-catalog.scm
similarity index 100%
rename from samples/store-nosql/fruits-catalog.scm
rename to samples/store-constdb/fruits-catalog.scm
diff --git a/samples/store-nosql/htdocs/index.html b/samples/store-constdb/htdocs/index.html
similarity index 100%
rename from samples/store-nosql/htdocs/index.html
rename to samples/store-constdb/htdocs/index.html
diff --git a/samples/store-nosql/server-test b/samples/store-constdb/server-test
similarity index 100%
rename from samples/store-nosql/server-test
rename to samples/store-constdb/server-test
diff --git a/samples/store-nosql/shopping-cart.scm b/samples/store-constdb/shopping-cart.scm
similarity index 100%
rename from samples/store-nosql/shopping-cart.scm
rename to samples/store-constdb/shopping-cart.scm
diff --git a/samples/store-nosql/ssl-start b/samples/store-constdb/ssl-start
similarity index 95%
rename from samples/store-nosql/ssl-start
rename to samples/store-constdb/ssl-start
index c536e9b..047ec97 100755
--- a/samples/store-nosql/ssl-start
+++ b/samples/store-constdb/ssl-start
@@ -32,5 +32,5 @@
EOF
-../../components/nosqldb/tinycdb -c -m tmp/store.cdb </dev/null
+../../components/constdb/tinycdb -c -m tmp/store.cdb </dev/null
../../modules/http/httpd-start tmp
diff --git a/samples/store-nosql/start b/samples/store-constdb/start
similarity index 94%
rename from samples/store-nosql/start
rename to samples/store-constdb/start
index 0bed2c5..972d7f9 100755
--- a/samples/store-nosql/start
+++ b/samples/store-constdb/start
@@ -28,5 +28,5 @@
EOF
-../../components/nosqldb/tinycdb -c -m tmp/store.cdb </dev/null
+../../components/constdb/tinycdb -c -m tmp/store.cdb </dev/null
../../modules/http/httpd-start tmp
diff --git a/samples/store-nosql/stop b/samples/store-constdb/stop
similarity index 100%
rename from samples/store-nosql/stop
rename to samples/store-constdb/stop
diff --git a/samples/store-nosql/store.composite b/samples/store-constdb/store.composite
similarity index 90%
rename from samples/store-nosql/store.composite
rename to samples/store-constdb/store.composite
index 5989b69..168be26 100644
--- a/samples/store-nosql/store.composite
+++ b/samples/store-constdb/store.composite
@@ -48,7 +48,7 @@
<service name="Total">
<binding.jsonrpc uri="total"/>
</service>
- <reference name="cache" target="NoSqldb"/>
+ <reference name="cache" target="ConstDb"/>
</component>
<component name="CurrencyConverter">
@@ -58,11 +58,11 @@
</service>
</component>
- <component name="NoSqldb">
- <implementation.cpp path="../../components/nosqldb" library="libnosqldb"/>
+ <component name="ConstDb">
+ <implementation.cpp path="../../components/constdb" library="libconstdb"/>
<property name="dbname">tmp/store.cdb</property>
- <service name="NoSqldb">
- <binding.atom uri="nosqldb"/>
+ <service name="ConstDb">
+ <binding.atom uri="constdb"/>
</service>
</component>
diff --git a/samples/store-nosql/store.scm b/samples/store-constdb/store.scm
similarity index 100%
rename from samples/store-nosql/store.scm
rename to samples/store-constdb/store.scm
