10 files changed, 23 insertions, 23 deletions
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am
index d9ab3f805b..b7397c64da 100644
--- a/sca-cpp/trunk/components/cache/Makefile.am
+++ b/sca-cpp/trunk/components/cache/Makefile.am
@@ -18,14 +18,14 @@
 comp_SCRIPTS = memcached-start memcached-stop
 compdir=$(prefix)/components/cache
 
-comp_LTLIBRARIES = libmcache.la
-libmcache_la_SOURCES = mcache.cpp
+comp_LTLIBRARIES = libmemcache.la
+libmemcache_la_SOURCES = memcache.cpp
 
-mcache_test_SOURCES = mcache-test.cpp
-mcache_test_LDFLAGS = -lxml2
+memcache_test_SOURCES = memcache-test.cpp
+memcache_test_LDFLAGS = -lxml2
 
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-noinst_PROGRAMS = mcache-test client-test
+noinst_PROGRAMS = memcache-test client-test
 TESTS = memcached-test server-test
diff --git a/sca-cpp/trunk/components/cache/client-test.cpp b/sca-cpp/trunk/components/cache/client-test.cpp
index ddf093a6dc..e3ec449e69 100644
--- a/sca-cpp/trunk/components/cache/client-test.cpp
+++ b/sca-cpp/trunk/components/cache/client-test.cpp
@@ -36,7 +36,7 @@
 namespace tuscany {
 namespace cache {
 
-const string uri("http://localhost:8090/mcache");
+const string uri("http://localhost:8090/memcache");
 
 bool testCache() {
     http::CURLSession cs;
diff --git a/sca-cpp/trunk/components/cache/mcache-test.cpp b/sca-cpp/trunk/components/cache/memcache-test.cpp
index 316372c5be..bc590fa047 100644
--- a/sca-cpp/trunk/components/cache/mcache-test.cpp
+++ b/sca-cpp/trunk/components/cache/memcache-test.cpp
@@ -27,7 +27,7 @@
 #include "stream.hpp"
 #include "string.hpp"
 #include "perf.hpp"
-#include "mcache.hpp"
+#include "memcache.hpp"
 
 namespace tuscany {
 namespace cache {
diff --git a/sca-cpp/trunk/components/cache/mcache.composite b/sca-cpp/trunk/components/cache/memcache.composite
index 15411dd702..c9a147960e 100644
--- a/sca-cpp/trunk/components/cache/mcache.composite
+++ b/sca-cpp/trunk/components/cache/memcache.composite
@@ -20,12 +20,12 @@
 <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="mcache">
+  name="memcache">
         
-    <component name="mcache">
-        <implementation.cpp path=".libs" library="libmcache"/>
-        <service name="mcache">
-            <t:binding.http uri="mcache"/>
+    <component name="memcache">
+        <implementation.cpp path=".libs" library="libmemcache"/>
+        <service name="memcache">
+            <t:binding.http uri="memcache"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/cache/mcache.cpp b/sca-cpp/trunk/components/cache/memcache.cpp
index 782de605c6..304975614e 100644
--- a/sca-cpp/trunk/components/cache/mcache.cpp
+++ b/sca-cpp/trunk/components/cache/memcache.cpp
@@ -31,10 +31,10 @@
 #include "list.hpp"
 #include "value.hpp"
 #include "monad.hpp"
-#include "mcache.hpp"
+#include "memcache.hpp"
 
 namespace tuscany {
-namespace mcache {
+namespace memcache {
 
 /**
  * Get an item from the cache.
@@ -126,7 +126,7 @@ extern "C" {
 const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
     const tuscany::value func(car(params));
     if (func == "start")
-        return tuscany::mcache::start(cdr(params));
+        return tuscany::memcache::start(cdr(params));
     return tuscany::mkfailure<tuscany::value>();
 }
 
diff --git a/sca-cpp/trunk/components/cache/mcache.hpp b/sca-cpp/trunk/components/cache/memcache.hpp
index 4751975099..c630f6fd55 100644
--- a/sca-cpp/trunk/components/cache/mcache.hpp
+++ b/sca-cpp/trunk/components/cache/memcache.hpp
@@ -19,8 +19,8 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef tuscany_mcache_hpp
-#define tuscany_mcache_hpp
+#ifndef tuscany_memcache_hpp
+#define tuscany_memcache_hpp
 
 /**
  * Memcached access functions.
@@ -121,7 +121,7 @@ const failable<bool> put(const value& key, const value& val, const MemCached& ca
     const string vs(scheme::writeValue(val));
     const apr_status_t rc = apr_memcache_set(cache.mc, c_str(ks), const_cast<char*>(c_str(vs)), length(vs), 0, 27);
     if (rc != APR_SUCCESS)
-        return mkfailure<bool>("Could not add entry");
+        return mkfailure<bool>("Could not set entry");
 
     debug(true, "cache::put::result");
     return true;
@@ -172,4 +172,4 @@ const failable<bool> del(const value& key, const MemCached& cache) {
 }
 }
 
-#endif /* tuscany_mcache_hpp */
+#endif /* tuscany_memcache_hpp */
diff --git a/sca-cpp/trunk/components/cache/memcached-stop b/sca-cpp/trunk/components/cache/memcached-stop
index b999228b46..bd2c208f46 100755
--- a/sca-cpp/trunk/components/cache/memcached-stop
+++ b/sca-cpp/trunk/components/cache/memcached-stop
@@ -20,4 +20,4 @@
 # Stop memcached
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 
-kill `ps -f | grep -v grep | grep "${mc}" | awk '{ print $2 }'`
+kill `ps -ef | grep -v grep | grep "${mc}" | awk '{ print $2 }'`
diff --git a/sca-cpp/trunk/components/cache/memcached-test b/sca-cpp/trunk/components/cache/memcached-test
index d4b9c04eda..842e8d2030 100755
--- a/sca-cpp/trunk/components/cache/memcached-test
+++ b/sca-cpp/trunk/components/cache/memcached-test
@@ -22,7 +22,7 @@
 sleep 1
 
 # Test
-./mcache-test 2>/dev/null
+./memcache-test 2>/dev/null
 rc=$?
 
 # Cleanup
diff --git a/sca-cpp/trunk/components/cache/server-test b/sca-cpp/trunk/components/cache/server-test
index 4942f547bc..a77736f33c 100755
--- a/sca-cpp/trunk/components/cache/server-test
+++ b/sca-cpp/trunk/components/cache/server-test
@@ -23,7 +23,7 @@
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
 SCAContribution `pwd`/
-SCAComposite mcache.composite
+SCAComposite memcache.composite
 EOF
 
 ./memcached-start
diff --git a/sca-cpp/trunk/components/queue/qpidd-stop b/sca-cpp/trunk/components/queue/qpidd-stop
index 6fb0467cff..3baf2fee27 100755
--- a/sca-cpp/trunk/components/queue/qpidd-stop
+++ b/sca-cpp/trunk/components/queue/qpidd-stop
@@ -23,4 +23,4 @@ here=`readlink -f $0`; here=`dirname $here`
 qpid_prefix=`cat $here/qpidc.prefix`
 qpidd="$qpid_prefix/sbin/qpidd"
 
-kill `ps -f | grep -v grep | grep "${qpidd}" | awk '{ print $2 }'`
+kill `ps -ef | grep -v grep | grep "${qpidd}" | awk '{ print $2 }'`