Author: jsdelfino
Date: Wed Jul 28 09:50:21 2010
New Revision: 980010
URL: http://svn.apache.org/viewvc?rev=980010&view=rev
Log:
Change sample to use a pool of three memcached servers. Add a property to the
memcached component to list multiple memcached servers. Replace spaces by tabs
in memcached keys as spaces are not allowed in keys.
Modified:
tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp
tuscany/sca-cpp/trunk/components/cache/memcache.composite
tuscany/sca-cpp/trunk/components/cache/memcache.cpp
tuscany/sca-cpp/trunk/components/cache/memcache.hpp
tuscany/sca-cpp/trunk/components/cache/memcached-start
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/samples/store-cluster/domains/jane/shopping-cart.py
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/shopping-cart.py
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite
tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start
tuscany/sca-cpp/trunk/samples/store-cluster/start
tuscany/sca-cpp/trunk/samples/store-cluster/stop
tuscany/sca-cpp/trunk/samples/store-cpp/store.composite
tuscany/sca-cpp/trunk/samples/store-java/store.composite
tuscany/sca-cpp/trunk/samples/store-python/store.composite
tuscany/sca-cpp/trunk/samples/store-scheme/store.composite
tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
Modified: tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache-test.cpp Wed Jul 28
09:50:21 2010
@@ -33,7 +33,7 @@ namespace tuscany {
namespace memcache {
bool testMemCached() {
- MemCached ch("localhost", 11211);
+ MemCached ch(mklist<string>("localhost:11211", "localhost:11212",
"localhost:11213"));
const value k = mklist<value>("a");
assert(hasContent(post(k, string("AAA"), ch)));
@@ -59,7 +59,7 @@ struct getLoop {
bool testGetPerf() {
const value k = mklist<value>("c");
- MemCached ch("localhost", 11211);
+ MemCached ch(mklist<string>("localhost:11211", "localhost:11212",
"localhost:11213"));
assert(hasContent(post(k, string("CCC"), ch)));
const lambda<bool()> gl = getLoop(k, ch);
Modified: tuscany/sca-cpp/trunk/components/cache/memcache.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcache.composite (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.composite Wed Jul 28
09:50:21 2010
@@ -27,6 +27,7 @@
<service name="memcache">
<t:binding.http uri="memcache"/>
</service>
+ <property
name="servers">localhost,localhost:11212,localhost:11213</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/components/cache/memcache.cpp
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.cpp?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcache.cpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.cpp Wed Jul 28 09:50:21 2010
@@ -112,7 +112,8 @@ private:
*/
const failable<value> start(unused const list<value>& params) {
// Connect to memcached
- memcache::MemCached& ch = *(new (gc_new<memcache::MemCached>())
memcache::MemCached("localhost", 11211));
+ const value servers =
((lambda<value(list<value>)>)car(params))(list<value>());
+ memcache::MemCached& ch = *(new (gc_new<memcache::MemCached>())
memcache::MemCached(tokenize(",", servers)));
// Return the component implementation lambda function
return value(lambda<value(const list<value>&)>(applyCache(ch)));
Modified: tuscany/sca-cpp/trunk/components/cache/memcache.hpp
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.hpp?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcache.hpp (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.hpp Wed Jul 28 09:50:21 2010
@@ -54,7 +54,13 @@ public:
MemCached(const string host, const int port) : owner(true) {
apr_pool_create(&pool, NULL);
apr_memcache_create(pool, 1, 0, &mc);
- init(host, port);
+ addServer(host, port);
+ }
+
+ MemCached(const list<string>& servers) : owner(true) {
+ apr_pool_create(&pool, NULL);
+ apr_memcache_create(pool, 1, 0, &mc);
+ addServers(servers);
}
MemCached(const MemCached& c) : owner(false) {
@@ -79,9 +85,9 @@ private:
friend const failable<bool> del(const value& key, const MemCached& cache);
/**
- * Initialize the memcached context.
+ * Add servers to the memcached context.
*/
- const failable<bool> init(const string& host, const int port) {
+ const failable<bool> addServer(const string& host, const int port) {
apr_memcache_server_t *server;
const apr_status_t sc = apr_memcache_server_create(pool, c_str(host),
(apr_port_t)port, 0, 1, 1, 60, &server);
if (sc != APR_SUCCESS)
@@ -91,9 +97,30 @@ private:
return mkfailure<bool>("Could not add server");
return true;
}
+
+ const failable<bool> addServers(const list<string>& servers) {
+ if (isNil(servers))
+ return true;
+ const list<string> toks = tokenize(":", car(servers));
+ const failable<bool> r = addServer(car(toks), isNil(cdr(toks))? 11211
: atoi(c_str(cadr(toks))));
+ if (!hasContent(r))
+ return r;
+ return addServers(cdr(servers));
+ }
};
/**
+ * Replace spaces by tabs (as spaces are not allowed in memcached keys).
+ */
+const char* nospaces(const char* s) {
+ char* c = const_cast<char*>(s);
+ for (; *c; c++)
+ if (*c == ' ')
+ *c = '\t';
+ return s;
+}
+
+/**
* Post a new item to the cache.
*/
const failable<bool> post(const value& key, const value& val, const MemCached&
cache) {
@@ -102,7 +129,7 @@ const failable<bool> post(const value& k
const string ks(scheme::writeValue(key));
const string vs(scheme::writeValue(val));
- const apr_status_t rc = apr_memcache_add(cache.mc, c_str(ks),
const_cast<char*>(c_str(vs)), length(vs), 0, 27);
+ const apr_status_t rc = apr_memcache_add(cache.mc, nospaces(c_str(ks)),
const_cast<char*>(c_str(vs)), length(vs), 0, 27);
if (rc != APR_SUCCESS)
return mkfailure<bool>("Could not add entry");
@@ -119,7 +146,7 @@ const failable<bool> put(const value& ke
const string ks(scheme::writeValue(key));
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);
+ const apr_status_t rc = apr_memcache_set(cache.mc, nospaces(c_str(ks)),
const_cast<char*>(c_str(vs)), length(vs), 0, 27);
if (rc != APR_SUCCESS)
return mkfailure<bool>("Could not set entry");
@@ -141,7 +168,7 @@ const failable<value> get(const value& k
char *data;
apr_size_t size;
- const apr_status_t rc = apr_memcache_getp(cache.mc, cache.pool, c_str(ks),
&data, &size, NULL);
+ const apr_status_t rc = apr_memcache_getp(cache.mc, cache.pool,
nospaces(c_str(ks)), &data, &size, NULL);
if (rc != APR_SUCCESS) {
apr_pool_destroy(vpool);
return mkfailure<value>("Could not get entry");
@@ -161,7 +188,7 @@ const failable<bool> del(const value& ke
debug(key, "memcache::delete::key");
const string ks(scheme::writeValue(key));
- const apr_status_t rc = apr_memcache_delete(cache.mc, c_str(ks), 0);
+ const apr_status_t rc = apr_memcache_delete(cache.mc, nospaces(c_str(ks)),
0);
if (rc != APR_SUCCESS)
return mkfailure<bool>("Could not delete entry");
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-start?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-start Wed Jul 28 09:50:21
2010
@@ -19,7 +19,11 @@
# Start memcached
here=`readlink -f $0`; here=`dirname $here`
+port=$1
+if [ "$port" = "" ]; then
+ port="11211"
+fi
memcached_prefix=`cat $here/memcached.prefix`
-$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p 11211
+$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p $port
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-stop?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-stop (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-stop Wed Jul 28 09:50:21
2010
@@ -19,8 +19,12 @@
# Stop memcached
here=`readlink -f $0`; here=`dirname $here`
+port=$1
+if [ "$port" = "" ]; then
+ port="11211"
+fi
memcached_prefix=`cat $here/memcached.prefix`
-mc="$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p 11211"
+mc="$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p $port"
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=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-test Wed Jul 28 09:50:21
2010
@@ -18,7 +18,9 @@
# under the License.
# Setup
-./memcached-start
+./memcached-start 11211
+./memcached-start 11212
+./memcached-start 11213
sleep 1
# Test
@@ -26,5 +28,7 @@ sleep 1
rc=$?
# Cleanup
-./memcached-stop
+./memcached-stop 11211
+./memcached-stop 11212
+./memcached-stop 11213
return $rc
Modified: tuscany/sca-cpp/trunk/components/cache/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/server-test?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/server-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/server-test Wed Jul 28 09:50:21 2010
@@ -26,7 +26,9 @@ SCAContribution `pwd`/
SCAComposite memcache.composite
EOF
-./memcached-start
+./memcached-start 11211
+./memcached-start 11212
+./memcached-start 11213
../../modules/http/httpd-start tmp
sleep 2
@@ -36,6 +38,8 @@ rc=$?
# Cleanup
../../modules/http/httpd-stop tmp
-./memcached-stop
+./memcached-stop 11211
+./memcached-stop 11212
+./memcached-stop 11213
sleep 2
return $rc
Modified:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/shopping-cart.py
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/shopping-cart.py?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/shopping-cart.py
(original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/shopping-cart.py
Wed Jul 28 09:50:21 2010
@@ -19,21 +19,23 @@
import uuid
import sys
-cartId = "1234"
+# Convert a particular host and user email to a cart id
+def cartid(host, email):
+ return ("cart", host(), email())
# Get the shopping cart from the cache
# Return an empty cart if not found
def getcart(id, cache):
- cart = cache("get", (id,))
+ cart = cache("get", id)
if cart is None:
return ()
return cart
# Post a new item to the cart, create a new cart if necessary
-def post(collection, item, cache):
+def post(collection, item, cache, host, email):
id = str(uuid.uuid1())
- cart = ((item[0], id, item[2]),) + getcart(cartId, cache)
- cache("put", (cartId,), cart)
+ cart = ((item[0], id, item[2]),) + getcart(cartid(host, email), cache)
+ cache("put", cartid(host, email), cart)
return (id,)
@@ -47,15 +49,15 @@ def find(id, cart):
return find(id, cart[1:])
# Get items from the cart
-def get(id, cache):
+def get(id, cache, host, email):
if id == ():
- return ("Your Cart", cartId) + getcart(cartId, cache)
- return find(id[0], getcart(cartId, cache))
+ return ("Your Cart", email()) + getcart(cartid(host, email), cache)
+ return find(id[0], getcart(cartid(host, email), cache))
# Delete items from the cart
-def delete(id, cache):
+def delete(id, cache, host, email):
if id == ():
- return cache("delete", (cartId,))
+ return cache("delete", cartid(host, email))
return True
# Return the price of an item
@@ -69,7 +71,6 @@ def sum(items):
return price(items[0]) + sum(items[1:])
# Return the total price of the items in the cart
-def gettotal(cache):
- cart = getcart(cartId, cache)
- return sum(cart)
+def gettotal(cache, host, email):
+ return sum(getcart(cartid(host, email), cache))
Modified:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
(original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
Wed Jul 28 09:50:21 2010
@@ -43,6 +43,8 @@
<component name="ShoppingCart">
<t:implementation.python script="shopping-cart.py"/>
+ <property name="host">localhost</property>
+ <property name="email">anonym...@localhost</property>
<service name="ShoppingCart">
<t:binding.atom uri="shoppingCart"/>
</service>
@@ -64,6 +66,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property
name="servers">localhost:11211,localhost:11212,localhost:11213</property>
</component>
</composite>
Modified:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/shopping-cart.py
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/shopping-cart.py?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/shopping-cart.py
(original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/shopping-cart.py
Wed Jul 28 09:50:21 2010
@@ -19,21 +19,23 @@
import uuid
import sys
-cartId = "1234"
+# Convert a particular host and user email to a cart id
+def cartid(host, email):
+ return ("cart", host(), email())
# Get the shopping cart from the cache
# Return an empty cart if not found
def getcart(id, cache):
- cart = cache("get", (id,))
+ cart = cache("get", id)
if cart is None:
return ()
return cart
# Post a new item to the cart, create a new cart if necessary
-def post(collection, item, cache):
+def post(collection, item, cache, host, email):
id = str(uuid.uuid1())
- cart = ((item[0], id, item[2]),) + getcart(cartId, cache)
- cache("put", (cartId,), cart)
+ cart = ((item[0], id, item[2]),) + getcart(cartid(host, email), cache)
+ cache("put", cartid(host, email), cart)
return (id,)
@@ -47,15 +49,15 @@ def find(id, cart):
return find(id, cart[1:])
# Get items from the cart
-def get(id, cache):
+def get(id, cache, host, email):
if id == ():
- return ("Your Cart", cartId) + getcart(cartId, cache)
- return find(id[0], getcart(cartId, cache))
+ return ("Your Cart", email()) + getcart(cartid(host, email), cache)
+ return find(id[0], getcart(cartid(host, email), cache))
# Delete items from the cart
-def delete(id, cache):
+def delete(id, cache, host, email):
if id == ():
- return cache("delete", (cartId,))
+ return cache("delete", cartid(host, email))
return True
# Return the price of an item
@@ -69,7 +71,6 @@ def sum(items):
return price(items[0]) + sum(items[1:])
# Return the total price of the items in the cart
-def gettotal(cache):
- cart = getcart(cartId, cache)
- return sum(cart)
+def gettotal(cache, host, email):
+ return sum(getcart(cartid(host, email), cache))
Modified:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite
(original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite Wed
Jul 28 09:50:21 2010
@@ -43,6 +43,8 @@
<component name="ShoppingCart">
<t:implementation.python script="shopping-cart.py"/>
+ <property name="host">localhost</property>
+ <property name="email">anonym...@localhost</property>
<service name="ShoppingCart">
<t:binding.atom uri="shoppingCart"/>
</service>
@@ -64,6 +66,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property
name="servers">localhost:11211,localhost:11212,localhost:11213</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start Wed Jul 28 09:50:21
2010
@@ -99,9 +99,10 @@ cp `../../modules/http/ssl-ls tmp/ssl` t
../../modules/http/proxy-ssl-member-conf tmp/proxy2 localhost 8443
../../modules/http/httpd-start tmp/proxy2
-# Start a shared memcached
-# Todo change to one per server
-../../components/cache/memcached-start
+# Start three memcached servers
+../../components/cache/memcached-start 11211
+../../components/cache/memcached-start 11212
+../../components/cache/memcached-start 11213
# Redirect traffic from port 80 to 8091 and use proxy1
#../../ubuntu/ip-redirect-all 80 8091
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/start?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/start Wed Jul 28 09:50:21 2010
@@ -71,9 +71,10 @@ EOF
../../modules/http/proxy-member-conf tmp/proxy2 localhost 8103
../../modules/http/httpd-start tmp/proxy2
-# Start a shared memcached
-# Todo change to one per server
-../../components/cache/memcached-start
+# Start three memcached servers
+../../components/cache/memcached-start 11211
+../../components/cache/memcached-start 11212
+../../components/cache/memcached-start 11213
# Redirect traffic from port 80 to 8091 and use proxy1
#../../ubuntu/ip-redirect-all 80 8091
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/stop?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/stop Wed Jul 28 09:50:21 2010
@@ -22,4 +22,6 @@
../../modules/http/httpd-stop tmp/server3
../../modules/http/httpd-stop tmp/proxy1
../../modules/http/httpd-stop tmp/proxy2
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop 11211
+../../components/cache/memcached-stop 11212
+../../components/cache/memcached-stop 11213
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/store.composite (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/store.composite Wed Jul 28 09:50:21
2010
@@ -64,6 +64,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property name="servers">localhost:11211</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/samples/store-java/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/store.composite (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/store.composite Wed Jul 28
09:50:21 2010
@@ -64,6 +64,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property name="servers">localhost:11211</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/samples/store-python/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/store.composite (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/store.composite Wed Jul 28
09:50:21 2010
@@ -64,6 +64,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property name="servers">localhost:11211</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/store.composite (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/store.composite Wed Jul 28
09:50:21 2010
@@ -64,6 +64,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property name="servers">localhost:11211</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
(original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite Wed
Jul 28 09:50:21 2010
@@ -64,6 +64,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property name="servers">localhost:11211</property>
</component>
</composite>
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite?rev=980010&r1=980009&r2=980010&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
(original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite Wed
Jul 28 09:50:21 2010
@@ -64,6 +64,7 @@
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
+ <property name="servers">localhost:11211</property>
</component>
</composite>