Rename nosqldb component to constdb.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1167575 13f79535-47bb-0310-9956-ffa450edef68

24 files changed, 41 insertions, 41 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
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index d0f5a29a9e..92805a6f92 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -995,7 +995,7 @@ AC_CONFIG_FILES([Makefile
                  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 @@ AC_CONFIG_FILES([Makefile
                  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/sca-cpp/trunk/samples/Makefile.am b/sca-cpp/trunk/samples/Makefile.am
index 135674ac94..604a963d5d 100644
--- a/sca-cpp/trunk/samples/Makefile.am
+++ b/sca-cpp/trunk/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/sca-cpp/trunk/samples/store-nosql/Makefile.am b/sca-cpp/trunk/samples/store-constdb/Makefile.am
index e69d8a164f..d2783f3f3b 100644
--- a/sca-cpp/trunk/samples/store-nosql/Makefile.am
+++ b/sca-cpp/trunk/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/sca-cpp/trunk/samples/store-nosql/currency-converter.scm b/sca-cpp/trunk/samples/store-constdb/currency-converter.scm
index fc506c3d73..fc506c3d73 100644
--- a/sca-cpp/trunk/samples/store-nosql/currency-converter.scm
+++ b/sca-cpp/trunk/samples/store-constdb/currency-converter.scm
diff --git a/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm b/sca-cpp/trunk/samples/store-constdb/fruits-catalog.scm
index d55394b96a..d55394b96a 100644
--- a/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
+++ b/sca-cpp/trunk/samples/store-constdb/fruits-catalog.scm
diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html b/sca-cpp/trunk/samples/store-constdb/htdocs/index.html
index 83b1e16df4..83b1e16df4 100644
--- a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-constdb/htdocs/index.html
diff --git a/sca-cpp/trunk/samples/store-nosql/server-test b/sca-cpp/trunk/samples/store-constdb/server-test
index fb629a6814..fb629a6814 100755
--- a/sca-cpp/trunk/samples/store-nosql/server-test
+++ b/sca-cpp/trunk/samples/store-constdb/server-test
diff --git a/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm b/sca-cpp/trunk/samples/store-constdb/shopping-cart.scm
index e653f1e33c..e653f1e33c 100644
--- a/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm
+++ b/sca-cpp/trunk/samples/store-constdb/shopping-cart.scm
diff --git a/sca-cpp/trunk/samples/store-nosql/ssl-start b/sca-cpp/trunk/samples/store-constdb/ssl-start
index c536e9b3f2..047ec974cb 100755
--- a/sca-cpp/trunk/samples/store-nosql/ssl-start
+++ b/sca-cpp/trunk/samples/store-constdb/ssl-start
@@ -32,5 +32,5 @@ SCAComposite store.composite
 
 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/sca-cpp/trunk/samples/store-nosql/start b/sca-cpp/trunk/samples/store-constdb/start
index 0bed2c54af..972d7f9bd2 100755
--- a/sca-cpp/trunk/samples/store-nosql/start
+++ b/sca-cpp/trunk/samples/store-constdb/start
@@ -28,5 +28,5 @@ SCAComposite store.composite
 
 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/sca-cpp/trunk/samples/store-nosql/stop b/sca-cpp/trunk/samples/store-constdb/stop
index 3b4f46694d..3b4f46694d 100755
--- a/sca-cpp/trunk/samples/store-nosql/stop
+++ b/sca-cpp/trunk/samples/store-constdb/stop
diff --git a/sca-cpp/trunk/samples/store-nosql/store.composite b/sca-cpp/trunk/samples/store-constdb/store.composite
index 5989b698b0..168be26ab6 100644
--- a/sca-cpp/trunk/samples/store-nosql/store.composite
+++ b/sca-cpp/trunk/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/sca-cpp/trunk/samples/store-nosql/store.scm b/sca-cpp/trunk/samples/store-constdb/store.scm
index f54257343e..f54257343e 100644
--- a/sca-cpp/trunk/samples/store-nosql/store.scm
+++ b/sca-cpp/trunk/samples/store-constdb/store.scm