Author: jsdelfino
Date: Wed Mar 10 09:34:20 2010
New Revision: 921270
URL: http://svn.apache.org/viewvc?rev=921270&view=rev
Log:
Minor cleanup, renamed mcache to memcache, added a uuid util function to get
consistent and unique uuids across languages.
Added:
tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp
- copied, changed from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache-test.cpp
tuscany/sca-cpp/trunk/components/cache/memcache.composite
- copied, changed from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache.composite
tuscany/sca-cpp/trunk/components/cache/memcache.cpp
- copied, changed from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache.cpp
tuscany/sca-cpp/trunk/components/cache/memcache.hpp
- copied, changed from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache.hpp
tuscany/sca-cpp/trunk/modules/java/org/apache/tuscany/UUIDUtil.java
- copied, changed from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache.composite
Removed:
tuscany/sca-cpp/trunk/components/cache/mcache-test.cpp
tuscany/sca-cpp/trunk/components/cache/mcache.composite
tuscany/sca-cpp/trunk/components/cache/mcache.cpp
tuscany/sca-cpp/trunk/components/cache/mcache.hpp
Modified:
tuscany/sca-cpp/trunk/components/cache/Makefile.am
tuscany/sca-cpp/trunk/components/cache/client-test.cpp
tuscany/sca-cpp/trunk/components/cache/memcached-stop
tuscany/sca-cpp/trunk/components/cache/memcached-test
tuscany/sca-cpp/trunk/components/cache/server-test
tuscany/sca-cpp/trunk/components/queue/qpidd-stop
tuscany/sca-cpp/trunk/etc/git-exclude
tuscany/sca-cpp/trunk/modules/java/eval.hpp
tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop
tuscany/sca-cpp/trunk/test/store-cpp/store.composite
tuscany/sca-cpp/trunk/test/store-java/store.composite
tuscany/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java
tuscany/sca-cpp/trunk/test/store-python/store.composite
tuscany/sca-cpp/trunk/test/store-scheme/store.composite
Modified: tuscany/sca-cpp/trunk/components/cache/Makefile.am
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/Makefile.am?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/cache/Makefile.am Wed Mar 10 09:34:20 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/components/cache/client-test.cpp
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/client-test.cpp?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/client-test.cpp Wed Mar 10 09:34:20
2010
@@ -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;
Copied: tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp (from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache-test.cpp)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp?p2=tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp&p1=tuscany/sca-cpp/trunk/components/cache/mcache-test.cpp&r1=921269&r2=921270&rev=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/mcache-test.cpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp Wed Mar 10
09:34:20 2010
@@ -27,7 +27,7 @@
#include "stream.hpp"
#include "string.hpp"
#include "perf.hpp"
-#include "mcache.hpp"
+#include "memcache.hpp"
namespace tuscany {
namespace cache {
Copied: tuscany/sca-cpp/trunk/components/cache/memcache.composite (from
r921269, tuscany/sca-cpp/trunk/components/cache/mcache.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.composite?p2=tuscany/sca-cpp/trunk/components/cache/memcache.composite&p1=tuscany/sca-cpp/trunk/components/cache/mcache.composite&r1=921269&r2=921270&rev=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/mcache.composite (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.composite Wed Mar 10
09:34:20 2010
@@ -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>
Copied: tuscany/sca-cpp/trunk/components/cache/memcache.cpp (from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache.cpp)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.cpp?p2=tuscany/sca-cpp/trunk/components/cache/memcache.cpp&p1=tuscany/sca-cpp/trunk/components/cache/mcache.cpp&r1=921269&r2=921270&rev=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/mcache.cpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.cpp Wed Mar 10 09:34:20 2010
@@ -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>();
}
Copied: tuscany/sca-cpp/trunk/components/cache/memcache.hpp (from r921269,
tuscany/sca-cpp/trunk/components/cache/mcache.hpp)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.hpp?p2=tuscany/sca-cpp/trunk/components/cache/memcache.hpp&p1=tuscany/sca-cpp/trunk/components/cache/mcache.hpp&r1=921269&r2=921270&rev=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/mcache.hpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.hpp Wed Mar 10 09:34:20 2010
@@ -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& ke
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& ke
}
}
-#endif /* tuscany_mcache_hpp */
+#endif /* tuscany_memcache_hpp */
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-stop?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-stop (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-stop Wed Mar 10 09:34:20
2010
@@ -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 }'`
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-test?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-test Wed Mar 10 09:34:20
2010
@@ -22,7 +22,7 @@
sleep 1
# Test
-./mcache-test 2>/dev/null
+./memcache-test 2>/dev/null
rc=$?
# Cleanup
Modified: tuscany/sca-cpp/trunk/components/cache/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/server-test?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/server-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/server-test Wed Mar 10 09:34:20 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/components/queue/qpidd-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/qpidd-stop?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/qpidd-stop (original)
+++ tuscany/sca-cpp/trunk/components/queue/qpidd-stop Wed Mar 10 09:34:20 2010
@@ -23,4 +23,4 @@ here=`readlink -f $0`; here=`dirname $he
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 }'`
Modified: tuscany/sca-cpp/trunk/etc/git-exclude
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/etc/git-exclude?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/etc/git-exclude (original)
+++ tuscany/sca-cpp/trunk/etc/git-exclude Wed Mar 10 09:34:20 2010
@@ -80,7 +80,7 @@ eval-shell
json-test
cache-test
client-test
-mcache-test
+memcache-test
curl-test
scdl-test
jni-test
Modified: tuscany/sca-cpp/trunk/modules/java/eval.hpp
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/eval.hpp?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/eval.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/java/eval.hpp Wed Mar 10 09:34:20 2010
@@ -26,6 +26,7 @@
* Java component implementation evaluation logic.
*/
#include <jni.h>
+#include <apr_uuid.h>
#include "list.hpp"
#include "value.hpp"
@@ -46,6 +47,7 @@ namespace java {
* Represent a Java VM runtime.
*/
jobject JNICALL nativeInvoke(JNIEnv *env, jobject self, jobject proxy, jobject
method, jobjectArray args);
+jobject JNICALL nativeUUID(JNIEnv *env);
class JavaRuntime {
public:
@@ -133,13 +135,21 @@ public:
iterableIsNil = env->GetStaticMethodID(iterableUtilClass, "isNil",
"(Ljava/lang/Object;)Z");
iterableCar = env->GetStaticMethodID(iterableUtilClass, "car",
"(Ljava/lang/Object;)Ljava/lang/Object;");
iterableCdr = env->GetStaticMethodID(iterableUtilClass, "cdr",
"(Ljava/lang/Object;)Ljava/lang/Iterable;");
+ uuidClass = env->FindClass("org/apache/tuscany/UUIDUtil");
// Register our native invocation handler function
- JNINativeMethod nm;
- nm.name = const_cast<char*>("invoke");
- nm.signature =
const_cast<char*>("(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;");
- nm.fnPtr = (void*)nativeInvoke;
- env->RegisterNatives(invokerClass, &nm, 1);
+ JNINativeMethod invokenm;
+ invokenm.name = const_cast<char*>("invoke");
+ invokenm.signature =
const_cast<char*>("(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;");
+ invokenm.fnPtr = (void*)nativeInvoke;
+ env->RegisterNatives(invokerClass, &invokenm, 1);
+
+ // Register our native UUID function
+ JNINativeMethod uuidnm;
+ uuidnm.name = const_cast<char*>("uuid");
+ uuidnm.signature = const_cast<char*>("()Ljava/lang/String;");
+ uuidnm.fnPtr = (void*)nativeUUID;
+ env->RegisterNatives(uuidClass, &uuidnm, 1);
}
JavaVM* jvm;
@@ -173,6 +183,7 @@ public:
jmethodID iterableCar;
jmethodID iterableCdr;
jmethodID iterableIsNil;
+ jclass uuidClass;
};
/**
@@ -247,8 +258,8 @@ public:
};
/**
- * Invocation handler invoke method, dispatches to the lambda function wrapped
- * in the invocation handler.
+ * Native implementation of the InvocationHandler.invoke Java method.
+ * Dispatches the call to the lambda function wrapped in the invocation
handler.
*/
jobject JNICALL nativeInvoke(JNIEnv* env, jobject self, unused jobject proxy,
jobject method, jobjectArray args) {
@@ -277,6 +288,19 @@ jobject JNICALL nativeInvoke(JNIEnv* env
}
/**
+ * Native implementation of IterableUtil.uuid. We are providing a native
implementation
+ * of this function as java.util.UUID seems to behave differently with
different JDKs.
+ */
+jobject JNICALL nativeUUID(JNIEnv* env) {
+ apr_uuid_t uuid;
+ apr_uuid_get(&uuid);
+ char buf[APR_UUID_FORMATTED_LENGTH];
+ apr_uuid_format(buf, &uuid);
+ string s(buf, APR_UUID_FORMATTED_LENGTH);
+ return env->NewStringUTF(c_str(s));
+}
+
+/**
* Convert a lambda function to Java proxy.
*/
const jobject mkJavaLambda(const JavaRuntime& jr, unused const value& iface,
const lambda<value(const list<value>&)>& l) {
Copied: tuscany/sca-cpp/trunk/modules/java/org/apache/tuscany/UUIDUtil.java
(from r921269, tuscany/sca-cpp/trunk/components/cache/mcache.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/org/apache/tuscany/UUIDUtil.java?p2=tuscany/sca-cpp/trunk/modules/java/org/apache/tuscany/UUIDUtil.java&p1=tuscany/sca-cpp/trunk/components/cache/mcache.composite&r1=921269&r2=921270&rev=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/mcache.composite (original)
+++ tuscany/sca-cpp/trunk/modules/java/org/apache/tuscany/UUIDUtil.java Wed Mar
10 09:34:20 2010
@@ -1,5 +1,4 @@
-<?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
@@ -15,18 +14,19 @@
* "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://tuscany.apache.org/xmlns/sca/components";
- name="mcache">
-
- <component name="mcache">
- <implementation.cpp path=".libs" library="libmcache"/>
- <service name="mcache">
- <t:binding.http uri="mcache"/>
- </service>
- </component>
+ * under the License.
+ */
-</composite>
+package org.apache.tuscany;
+
+/**
+ * A fast and portable UUID generator function.
+ */
+public class UUIDUtil {
+
+ /**
+ * Return a UUID.
+ */
+ public static native String uuid();
+
+}
Modified: tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop Wed Mar 10 09:34:20 2010
@@ -24,4 +24,4 @@ port=$1
python_prefix=`cat $here/../python/python.prefix`
py="$python_prefix/bin/python composite.py $port"
-kill `ps -f | grep -v grep | grep "${py}" | awk '{ print $2 }'`
+kill `ps -ef | grep -v grep | grep "${py}" | awk '{ print $2 }'`
Modified: tuscany/sca-cpp/trunk/test/store-cpp/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-cpp/store.composite?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-cpp/store.composite (original)
+++ tuscany/sca-cpp/trunk/test/store-cpp/store.composite Wed Mar 10 09:34:20
2010
@@ -50,7 +50,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs"
library="libmcache"/>
+ <implementation.cpp path="../../components/cache/.libs"
library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
Modified: tuscany/sca-cpp/trunk/test/store-java/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-java/store.composite?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-java/store.composite (original)
+++ tuscany/sca-cpp/trunk/test/store-java/store.composite Wed Mar 10 09:34:20
2010
@@ -50,7 +50,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs"
library="libmcache"/>
+ <implementation.cpp path="../../components/cache/.libs"
library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
Modified: tuscany/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java (original)
+++ tuscany/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java Wed Mar
10 09:34:20 2010
@@ -14,14 +14,13 @@
* "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.
+ * under the License.
*/
package store;
import static org.apache.tuscany.IterableUtil.*;
-
-import java.util.UUID;
+import static org.apache.tuscany.UUIDUtil.*;
import org.apache.tuscany.Service;
@@ -44,17 +43,10 @@ public class ShoppingCartImpl {
}
/**
- * Returns a UUID.
- */
- String uuid() {
- return UUID.randomUUID().toString();
- }
-
- /**
* Post a new item to the cart. Create a new cart if necessary.
*/
public Iterable<String> post(final Iterable<String> collection, final
Iterable<?> item, final Service cache) {
- final String id = this.uuid();
+ final String id = uuid();
final Iterable<?> newItem = list(car(item), id, caddr(item));
final Iterable<?> cart = cons(newItem, this.getcart(cartId, cache));
final Iterable<String> iid = list(cartId);
@@ -65,7 +57,7 @@ public class ShoppingCartImpl {
/**
* Find an item in the cart.
*/
- public Iterable<?> find(final String id, final Iterable<?> cart) {
+ Iterable<?> find(final String id, final Iterable<?> cart) {
if(isNil(cart))
return cons("Item", list("0", list()));
if(id.equals(cadr(car(cart))))
Modified: tuscany/sca-cpp/trunk/test/store-python/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/store.composite?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/store.composite (original)
+++ tuscany/sca-cpp/trunk/test/store-python/store.composite Wed Mar 10 09:34:20
2010
@@ -60,7 +60,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs"
library="libmcache"/>
+ <implementation.cpp path="../../components/cache/.libs"
library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
Modified: tuscany/sca-cpp/trunk/test/store-scheme/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/store.composite?rev=921270&r1=921269&r2=921270&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/store.composite (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/store.composite Wed Mar 10 09:34:20
2010
@@ -60,7 +60,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs"
library="libmcache"/>
+ <implementation.cpp path="../../components/cache/.libs"
library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
