From c3cc3ea6b1ea3472899bd467230fffd82d1889aa Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 16 Jan 2012 03:49:01 +0000
Subject: Fix error with logging command in memcached and sqldb start / stop
 scripts. Adjust test scripts, add new parameter required by memcached start /
 stop scripts.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1231821 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/components/cache/memcached-ssl-test | 12 ++++++------
 sca-cpp/trunk/components/cache/memcached-start    |  6 ++++--
 sca-cpp/trunk/components/cache/memcached-stop     |  3 ++-
 sca-cpp/trunk/components/cache/memcached-test     | 12 ++++++------
 sca-cpp/trunk/components/cache/server-test        | 24 +++++++++++------------
 sca-cpp/trunk/components/sqldb/pgsql-backup       |  6 ++++--
 sca-cpp/trunk/components/sqldb/pgsql-conf         | 10 ++++++----
 sca-cpp/trunk/components/sqldb/pgsql-standby-conf |  4 +++-
 sca-cpp/trunk/components/sqldb/pgsql-start        |  4 +++-
 sca-cpp/trunk/components/sqldb/pgsql-stop         |  4 +++-
 sca-cpp/trunk/modules/edit/ssl-start              |  4 ++--
 sca-cpp/trunk/modules/edit/start                  |  4 ++--
 sca-cpp/trunk/modules/edit/stop                   |  4 ++--
 sca-cpp/trunk/modules/oauth/start-mixed-test      |  4 ++--
 sca-cpp/trunk/modules/oauth/start-test            |  4 ++--
 sca-cpp/trunk/modules/oauth/stop-test             |  4 ++--
 sca-cpp/trunk/modules/openid/start-test           |  4 ++--
 sca-cpp/trunk/modules/openid/stop-test            |  4 ++--
 sca-cpp/trunk/samples/loan-python/start           |  2 +-
 sca-cpp/trunk/samples/loan-python/stop            |  2 +-
 sca-cpp/trunk/samples/store-cluster/ssl-start     |  6 +++---
 sca-cpp/trunk/samples/store-cluster/ssl-stop      |  6 +++---
 sca-cpp/trunk/samples/store-cluster/start         |  6 +++---
 sca-cpp/trunk/samples/store-cluster/stop          |  6 +++---
 sca-cpp/trunk/samples/store-cpp/ssl-start         |  2 +-
 sca-cpp/trunk/samples/store-cpp/start             |  2 +-
 sca-cpp/trunk/samples/store-cpp/stop              |  2 +-
 sca-cpp/trunk/samples/store-java/ssl-start        |  2 +-
 sca-cpp/trunk/samples/store-java/start            |  2 +-
 sca-cpp/trunk/samples/store-java/stop             |  2 +-
 sca-cpp/trunk/samples/store-python/ssl-start      |  2 +-
 sca-cpp/trunk/samples/store-python/start          |  2 +-
 sca-cpp/trunk/samples/store-python/stop           |  2 +-
 sca-cpp/trunk/samples/store-python/uec2-start     |  2 +-
 sca-cpp/trunk/samples/store-scheme/ssl-start      |  2 +-
 sca-cpp/trunk/samples/store-scheme/start          |  2 +-
 sca-cpp/trunk/samples/store-scheme/stop           |  2 +-
 sca-cpp/trunk/samples/store-sql/ssl-start         |  2 +-
 sca-cpp/trunk/samples/store-sql/start             |  2 +-
 sca-cpp/trunk/samples/store-sql/stop              |  2 +-
 sca-cpp/trunk/samples/store-vhost/ssl-start       |  2 +-
 sca-cpp/trunk/samples/store-vhost/start           |  2 +-
 sca-cpp/trunk/samples/store-vhost/stop            |  2 +-
 sca-cpp/trunk/samples/store-vhost/uec2-start      |  2 +-
 44 files changed, 99 insertions(+), 86 deletions(-)

(limited to 'sca-cpp')

diff --git a/sca-cpp/trunk/components/cache/memcached-ssl-test b/sca-cpp/trunk/components/cache/memcached-ssl-test
index ffd1cd0e8e..6a9dc2cd27 100755
--- a/sca-cpp/trunk/components/cache/memcached-ssl-test
+++ b/sca-cpp/trunk/components/cache/memcached-ssl-test
@@ -22,9 +22,9 @@
 ../../modules/http/ssl-cert-conf tmp/ssl localhost server
 ../../modules/http/ssl-cert-conf tmp/ssl localhost tunnel
 
-./memcached-start 11411
-./memcached-start 11412
-./memcached-start 11413
+./memcached-start tmp 11411
+./memcached-start tmp 11412
+./memcached-start tmp 11413
 
 ../../modules/http/httpd-conf tmp/tunnel localhost 8089 htdocs
 ../../modules/http/httpd-event-conf tmp/tunnel
@@ -49,7 +49,7 @@ rc=$?
 # Cleanup
 ../../modules/http/httpd-stop tmp/tunnel
 ../../modules/http/httpd-stop tmp/server
-./memcached-stop 11411
-./memcached-stop 11412
-./memcached-stop 11413
+./memcached-stop tmp 11411
+./memcached-stop tmp 11412
+./memcached-stop tmp 11413
 exit $rc
diff --git a/sca-cpp/trunk/components/cache/memcached-start b/sca-cpp/trunk/components/cache/memcached-start
index a49ad2919a..947b583ec0 100755
--- a/sca-cpp/trunk/components/cache/memcached-start
+++ b/sca-cpp/trunk/components/cache/memcached-start
@@ -40,10 +40,12 @@ else
     log="cat >>$root/logs/memcached"
     v=""
 fi
+mkdir -p $root/memcached
+echo $log > $root/memcached/logger
 
 if [ "$ip" = "" ]; then
-    ($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | $log)&
+    ($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)&
 else
-    ($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | $log)&
+    ($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)&
 fi
 
diff --git a/sca-cpp/trunk/components/cache/memcached-stop b/sca-cpp/trunk/components/cache/memcached-stop
index b76fc28466..2b3b66c74d 100755
--- a/sca-cpp/trunk/components/cache/memcached-stop
+++ b/sca-cpp/trunk/components/cache/memcached-stop
@@ -19,8 +19,9 @@
 
 # Stop memcached
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
+root=`echo "import os; print os.path.realpath('$1')" | python`
 
-addr=$1
+addr=$2
 if [ "$addr" = "" ]; then
     ip=""
     port="11211"
diff --git a/sca-cpp/trunk/components/cache/memcached-test b/sca-cpp/trunk/components/cache/memcached-test
index 8e034bb936..e647c5525e 100755
--- a/sca-cpp/trunk/components/cache/memcached-test
+++ b/sca-cpp/trunk/components/cache/memcached-test
@@ -18,9 +18,9 @@
 #  under the License.
 
 # Setup
-./memcached-start 11211
-./memcached-start 11212
-./memcached-start 11213
+./memcached-start tmp 11211
+./memcached-start tmp 11212
+./memcached-start tmp 11213
 sleep 1
 
 # Test
@@ -28,7 +28,7 @@ sleep 1
 rc=$?
 
 # Cleanup
-./memcached-stop 11211
-./memcached-stop 11212
-./memcached-stop 11213
+./memcached-stop tmp 11211
+./memcached-stop tmp 11212
+./memcached-stop tmp 11213
 exit $rc
diff --git a/sca-cpp/trunk/components/cache/server-test b/sca-cpp/trunk/components/cache/server-test
index d9176f37ac..bc56b1fe19 100755
--- a/sca-cpp/trunk/components/cache/server-test
+++ b/sca-cpp/trunk/components/cache/server-test
@@ -27,12 +27,12 @@ SCAContribution `pwd`/
 SCAComposite cache.composite
 EOF
 
-./memcached-start 11211
-./memcached-start 11212
-./memcached-start 11213
-./memcached-start 11411
-./memcached-start 11412
-./memcached-start 11413
+./memcached-start tmp 11211
+./memcached-start tmp 11212
+./memcached-start tmp 11213
+./memcached-start tmp 11411
+./memcached-start tmp 11412
+./memcached-start tmp 11413
 ../../modules/http/httpd-start tmp
 sleep 2
 
@@ -42,11 +42,11 @@ rc=$?
 
 # Cleanup
 ../../modules/http/httpd-stop tmp
-./memcached-stop 11211
-./memcached-stop 11212
-./memcached-stop 11213
-./memcached-stop 11411
-./memcached-stop 11412
-./memcached-stop 11413
+./memcached-stop tmp 11211
+./memcached-stop tmp 11212
+./memcached-stop tmp 11213
+./memcached-stop tmp 11411
+./memcached-stop tmp 11412
+./memcached-stop tmp 11413
 sleep 2
 exit $rc
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-backup b/sca-cpp/trunk/components/sqldb/pgsql-backup
index 3c0be60e77..c0b1c4b2aa 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-backup
+++ b/sca-cpp/trunk/components/sqldb/pgsql-backup
@@ -37,13 +37,15 @@ else
     mkdir -p $root/logs
     pgsql_log="cat >>$root/logs/postgresql"
 fi
+mkdir -p $root/sqldb
+echo $pgsql_log >$root/sqldb/logger
 
-$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_start_backup('backup', true)" db 2>&1 | $pgsql_log
+$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_start_backup('backup', true)" db 2>&1 | sh $root/sqldb/logger
 
 echo "Content-type: application/x-compressed"
 echo
 
 tar -C $root/sqldb -cz data
 
-$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_stop_backup()" db 2>&1 | $pgsql_log
+$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_stop_backup()" db 2>&1 | sh $root/sqldb/logger
 
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-conf b/sca-cpp/trunk/components/sqldb/pgsql-conf
index e3eb1c8dc3..6aa705f139 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-conf
+++ b/sca-cpp/trunk/components/sqldb/pgsql-conf
@@ -45,9 +45,11 @@ else
     mkdir -p $root/logs
     pgsql_log="cat >>$root/logs/postgresql"
 fi
+mkdir -p $root/sqldb
+echo $pgsql_log >$root/sqldb/logger
 
 if [ ! -f $root/sqldb/data/postgresql.conf ]; then
-    $pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | $pgsql_log
+    $pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
     cp $root/sqldb/data/postgresql.conf $root/sqldb/data/postgresql-init.conf
     cp $root/sqldb/data/pg_hba.conf $root/sqldb/data/pg_hba-init.conf
 fi
@@ -96,7 +98,7 @@ host    replication     all             samenet                 trust
 EOF
 
 # Create the db
-($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)&
+($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
 sti=0
 while [ $sti -ne 30 ]; do
     st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'`
@@ -107,8 +109,8 @@ while [ $sti -ne 30 ]; do
     sti=$((sti+1))
 done
 
-$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | $pgsql_log
-$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | $pgsql_log
+$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | sh $root/sqldb/logger
+$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
 
 # Generate database backup script
 mkdir -p $root/sqldb/scripts
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
index 291d950e94..59979f3ef2 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
+++ b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
@@ -54,6 +54,8 @@ else
     mkdir -p $root/logs
     pgsql_log="cat >>$root/logs/postgresql"
 fi
+mkdir -p $root/sqldb
+echo $pgsql_log >$root/sqldb/logger
 
 mkdir -p $root/sqldb/data
 chmod 700 $root/sqldb/data
@@ -61,7 +63,7 @@ mkdir -p $root/sqldb/archive
 
 # Initialize from a backup of the master
 if [ ! -f $root/sqldb/data/postgresql.conf ]; then
-    (wget http://$mhost:$mhttpport/pgsql-backup -O - | tar -C $root/sqldb -xz) 2>&1 | $pgsql_log
+    (wget http://$mhost:$mhttpport/pgsql-backup -O - | tar -C $root/sqldb -xz) 2>&1 | sh $root/sqldb/logger
     rm -rf $root/sqldb/data/postmaster.pid $root/sqldb/data/pg_xlog
     mkdir -p $root/sqldb/data/pg_xlog/archive_status
     chmod 700 $root/sqldb/data/pg_xlog/archive_status
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-start b/sca-cpp/trunk/components/sqldb/pgsql-start
index 9960c5d258..4a7e1ebe23 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-start
+++ b/sca-cpp/trunk/components/sqldb/pgsql-start
@@ -29,8 +29,10 @@ else
     mkdir -p $root/logs
     pgsql_log="cat >>$root/logs/postgresql"
 fi
+mkdir -p $root/sqldb
+echo $pgsql_log >$root/sqldb/logger
 
-($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)&
+($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger)&
 sti=0
 while [ $sti -ne 30 ]; do
     st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'`
diff --git a/sca-cpp/trunk/components/sqldb/pgsql-stop b/sca-cpp/trunk/components/sqldb/pgsql-stop
index 9c5c9aae57..fbb9997961 100755
--- a/sca-cpp/trunk/components/sqldb/pgsql-stop
+++ b/sca-cpp/trunk/components/sqldb/pgsql-stop
@@ -29,6 +29,8 @@ else
     mkdir -p $root/logs
     pgsql_log="cat >>$root/logs/postgresql"
 fi
+mkdir -p $root/sqldb
+echo $pgsql_log >$root/sqldb/logger
 
-$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | $pgsql_log
+$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
 
diff --git a/sca-cpp/trunk/modules/edit/ssl-start b/sca-cpp/trunk/modules/edit/ssl-start
index 4a7e779bd6..fdc5a8b8dc 100755
--- a/sca-cpp/trunk/modules/edit/ssl-start
+++ b/sca-cpp/trunk/modules/edit/ssl-start
@@ -36,8 +36,8 @@ if [ -x ../../components/log/scribe-cat ]; then
 fi
 
 # Start memcached
-../../components/cache/memcached-start 11211
-../../components/cache/memcached-start 11212
+../../components/cache/memcached-start tmp 11211
+../../components/cache/memcached-start tmp 11212
 
 # Configure server
 ../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
diff --git a/sca-cpp/trunk/modules/edit/start b/sca-cpp/trunk/modules/edit/start
index 9a56cf755c..a6c417bbb1 100755
--- a/sca-cpp/trunk/modules/edit/start
+++ b/sca-cpp/trunk/modules/edit/start
@@ -32,8 +32,8 @@ if [ -x ../../components/log/scribe-cat ]; then
 fi
 
 # Start memcached
-../../components/cache/memcached-start 11211
-../../components/cache/memcached-start 11212
+../../components/cache/memcached-start tmp 11211
+../../components/cache/memcached-start tmp 11212
 
 # Configure server
 ../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
diff --git a/sca-cpp/trunk/modules/edit/stop b/sca-cpp/trunk/modules/edit/stop
index 8e250de88b..e1fd92705c 100755
--- a/sca-cpp/trunk/modules/edit/stop
+++ b/sca-cpp/trunk/modules/edit/stop
@@ -19,8 +19,8 @@
 
 ../../modules/http/httpd-stop tmp
 
-../../components/cache/memcached-stop 11211
-../../components/cache/memcached-stop 11212
+../../components/cache/memcached-stop tmp 11211
+../../components/cache/memcached-stop tmp 11212
 
 if [ -x ../../components/log/scribe-cat ]; then
     ../../components/log/scribed-client-stop tmp
diff --git a/sca-cpp/trunk/modules/oauth/start-mixed-test b/sca-cpp/trunk/modules/oauth/start-mixed-test
index 29ddb6d647..d0c184144b 100755
--- a/sca-cpp/trunk/modules/oauth/start-mixed-test
+++ b/sca-cpp/trunk/modules/oauth/start-mixed-test
@@ -21,8 +21,8 @@
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 # Setup
-../../components/cache/memcached-start 11212
-../../components/cache/memcached-start 11213
+../../components/cache/memcached-start tmp 11212
+../../components/cache/memcached-start tmp 11213
 
 ../../modules/http/ssl-ca-conf tmp localhost
 ../../modules/http/ssl-cert-conf tmp localhost
diff --git a/sca-cpp/trunk/modules/oauth/start-test b/sca-cpp/trunk/modules/oauth/start-test
index 0e859ce6e6..d38f8d3d1a 100755
--- a/sca-cpp/trunk/modules/oauth/start-test
+++ b/sca-cpp/trunk/modules/oauth/start-test
@@ -21,8 +21,8 @@
 ../../ubuntu/ip-redirect-all 80 8090
 ../../ubuntu/ip-redirect-all 443 8453
 
-../../components/cache/memcached-start 11212
-../../components/cache/memcached-start 11213
+../../components/cache/memcached-start tmp 11212
+../../components/cache/memcached-start tmp 11213
 
 ../../modules/http/ssl-ca-conf tmp localhost
 ../../modules/http/ssl-cert-conf tmp localhost
diff --git a/sca-cpp/trunk/modules/oauth/stop-test b/sca-cpp/trunk/modules/oauth/stop-test
index a0587f8cb7..4b8a73effb 100755
--- a/sca-cpp/trunk/modules/oauth/stop-test
+++ b/sca-cpp/trunk/modules/oauth/stop-test
@@ -20,5 +20,5 @@
 # Cleanup
 ../../modules/http/httpd-stop tmp
 
-../../components/cache/memcached-stop 11212
-../../components/cache/memcached-stop 11213
+../../components/cache/memcached-stop tmp 11212
+../../components/cache/memcached-stop tmp 11213
diff --git a/sca-cpp/trunk/modules/openid/start-test b/sca-cpp/trunk/modules/openid/start-test
index 7ae27c57cd..195e1c3c98 100755
--- a/sca-cpp/trunk/modules/openid/start-test
+++ b/sca-cpp/trunk/modules/openid/start-test
@@ -18,8 +18,8 @@
 #  under the License.
 
 # Setup
-../../components/cache/memcached-start 11212
-../../components/cache/memcached-start 11213
+../../components/cache/memcached-start tmp 11212
+../../components/cache/memcached-start tmp 11213
 
 ../../modules/http/ssl-ca-conf tmp localhost
 ../../modules/http/ssl-cert-conf tmp localhost
diff --git a/sca-cpp/trunk/modules/openid/stop-test b/sca-cpp/trunk/modules/openid/stop-test
index a0587f8cb7..4b8a73effb 100755
--- a/sca-cpp/trunk/modules/openid/stop-test
+++ b/sca-cpp/trunk/modules/openid/stop-test
@@ -20,5 +20,5 @@
 # Cleanup
 ../../modules/http/httpd-stop tmp
 
-../../components/cache/memcached-stop 11212
-../../components/cache/memcached-stop 11213
+../../components/cache/memcached-stop tmp 11212
+../../components/cache/memcached-stop tmp 11213
diff --git a/sca-cpp/trunk/samples/loan-python/start b/sca-cpp/trunk/samples/loan-python/start
index 499a48cc4a..d334ebc58f 100755
--- a/sca-cpp/trunk/samples/loan-python/start
+++ b/sca-cpp/trunk/samples/loan-python/start
@@ -28,5 +28,5 @@ SCAComposite loan.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/loan-python/stop b/sca-cpp/trunk/samples/loan-python/stop
index a59273b8ed..3b4c74a587 100755
--- a/sca-cpp/trunk/samples/loan-python/stop
+++ b/sca-cpp/trunk/samples/loan-python/stop
@@ -18,4 +18,4 @@
 #  under the License.
 
 ../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-cluster/ssl-start b/sca-cpp/trunk/samples/store-cluster/ssl-start
index f80bb075d6..621a3e7b10 100755
--- a/sca-cpp/trunk/samples/store-cluster/ssl-start
+++ b/sca-cpp/trunk/samples/store-cluster/ssl-start
@@ -56,11 +56,11 @@ sleep 1
 
 # Start three memcached servers
 ../../modules/http/tunnel-ssl-conf tmp/tunnel 11211 localhost 563 11411
-../../components/cache/memcached-start 127.0.0.1:11411
+../../components/cache/memcached-start tmp 127.0.0.1:11411
 ../../modules/http/tunnel-ssl-conf tmp/tunnel 11212 localhost 563 11412
-../../components/cache/memcached-start 127.0.0.1:11412
+../../components/cache/memcached-start tmp 127.0.0.1:11412
 ../../modules/http/tunnel-ssl-conf tmp/tunnel 11213 localhost 563 11413
-../../components/cache/memcached-start 127.0.0.1:11413
+../../components/cache/memcached-start tmp 127.0.0.1:11413
 ../../modules/http/httpd-restart tmp/tunnel
 sleep 1
 
diff --git a/sca-cpp/trunk/samples/store-cluster/ssl-stop b/sca-cpp/trunk/samples/store-cluster/ssl-stop
index ff36721315..37addf8094 100755
--- a/sca-cpp/trunk/samples/store-cluster/ssl-stop
+++ b/sca-cpp/trunk/samples/store-cluster/ssl-stop
@@ -26,9 +26,9 @@ set -x
 ../../modules/http/httpd-stop tmp/proxy1
 ../../modules/http/httpd-stop tmp/proxy2
 
-../../components/cache/memcached-stop 127.0.0.1:11411
-../../components/cache/memcached-stop 127.0.0.1:11412
-../../components/cache/memcached-stop 127.0.0.1:11413
+../../components/cache/memcached-stop tmp 127.0.0.1:11411
+../../components/cache/memcached-stop tmp 127.0.0.1:11412
+../../components/cache/memcached-stop tmp 127.0.0.1:11413
 
 ../../components/sqldb/pgsql-stop tmp/sqldb3
 ../../modules/http/httpd-stop tmp/sqldb3
diff --git a/sca-cpp/trunk/samples/store-cluster/start b/sca-cpp/trunk/samples/store-cluster/start
index 67434d6a0e..0aa6e42b03 100755
--- a/sca-cpp/trunk/samples/store-cluster/start
+++ b/sca-cpp/trunk/samples/store-cluster/start
@@ -33,9 +33,9 @@ sudo ../../ubuntu/ip-redirect-all 80 8090
 sleep 1
 
 # Start three memcached servers
-../../components/cache/memcached-start 11211
-../../components/cache/memcached-start 11212
-../../components/cache/memcached-start 11213
+../../components/cache/memcached-start tmp 11211
+../../components/cache/memcached-start tmp 11212
+../../components/cache/memcached-start tmp 11213
 
 # Start a master and two hot standby databases
 ./sqldb-master-conf tmp/sqldb1 5432 8502
diff --git a/sca-cpp/trunk/samples/store-cluster/stop b/sca-cpp/trunk/samples/store-cluster/stop
index b2fa11b7c4..fb6c6489fc 100755
--- a/sca-cpp/trunk/samples/store-cluster/stop
+++ b/sca-cpp/trunk/samples/store-cluster/stop
@@ -26,9 +26,9 @@ set -x
 ../../modules/http/httpd-stop tmp/proxy1
 ../../modules/http/httpd-stop tmp/proxy2
 
-../../components/cache/memcached-stop 11211
-../../components/cache/memcached-stop 11212
-../../components/cache/memcached-stop 11213
+../../components/cache/memcached-stop tmp 11211
+../../components/cache/memcached-stop tmp 11212
+../../components/cache/memcached-stop tmp 11213
 
 ../../components/sqldb/pgsql-stop tmp/sqldb3
 ../../modules/http/httpd-stop tmp/sqldb3
diff --git a/sca-cpp/trunk/samples/store-cpp/ssl-start b/sca-cpp/trunk/samples/store-cpp/ssl-start
index 01ee0eb76c..3a96fe950c 100755
--- a/sca-cpp/trunk/samples/store-cpp/ssl-start
+++ b/sca-cpp/trunk/samples/store-cpp/ssl-start
@@ -32,5 +32,5 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-cpp/start b/sca-cpp/trunk/samples/store-cpp/start
index c0f2813d07..444a87c4eb 100755
--- a/sca-cpp/trunk/samples/store-cpp/start
+++ b/sca-cpp/trunk/samples/store-cpp/start
@@ -28,5 +28,5 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-cpp/stop b/sca-cpp/trunk/samples/store-cpp/stop
index a59273b8ed..3b4c74a587 100755
--- a/sca-cpp/trunk/samples/store-cpp/stop
+++ b/sca-cpp/trunk/samples/store-cpp/stop
@@ -18,4 +18,4 @@
 #  under the License.
 
 ../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-java/ssl-start b/sca-cpp/trunk/samples/store-java/ssl-start
index 3d4642dea6..a585f717aa 100755
--- a/sca-cpp/trunk/samples/store-java/ssl-start
+++ b/sca-cpp/trunk/samples/store-java/ssl-start
@@ -34,5 +34,5 @@ EOF
 
 export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-java/start b/sca-cpp/trunk/samples/store-java/start
index c8146e9e46..6952771e3d 100755
--- a/sca-cpp/trunk/samples/store-java/start
+++ b/sca-cpp/trunk/samples/store-java/start
@@ -29,5 +29,5 @@ EOF
 
 export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-java/stop b/sca-cpp/trunk/samples/store-java/stop
index 79d914e937..c7a0bff857 100755
--- a/sca-cpp/trunk/samples/store-java/stop
+++ b/sca-cpp/trunk/samples/store-java/stop
@@ -20,4 +20,4 @@
 export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
 
 ../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-python/ssl-start b/sca-cpp/trunk/samples/store-python/ssl-start
index e639b538d8..2a9df09c2e 100755
--- a/sca-cpp/trunk/samples/store-python/ssl-start
+++ b/sca-cpp/trunk/samples/store-python/ssl-start
@@ -33,5 +33,5 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-python/start b/sca-cpp/trunk/samples/store-python/start
index b4ca1461fd..2e509a1f2c 100755
--- a/sca-cpp/trunk/samples/store-python/start
+++ b/sca-cpp/trunk/samples/store-python/start
@@ -28,5 +28,5 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-python/stop b/sca-cpp/trunk/samples/store-python/stop
index a59273b8ed..3b4c74a587 100755
--- a/sca-cpp/trunk/samples/store-python/stop
+++ b/sca-cpp/trunk/samples/store-python/stop
@@ -18,4 +18,4 @@
 #  under the License.
 
 ../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-python/uec2-start b/sca-cpp/trunk/samples/store-python/uec2-start
index 53428be0bf..feb4ae383e 100755
--- a/sca-cpp/trunk/samples/store-python/uec2-start
+++ b/sca-cpp/trunk/samples/store-python/uec2-start
@@ -42,6 +42,6 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
 
diff --git a/sca-cpp/trunk/samples/store-scheme/ssl-start b/sca-cpp/trunk/samples/store-scheme/ssl-start
index 70e62f1f04..cc0272c28f 100755
--- a/sca-cpp/trunk/samples/store-scheme/ssl-start
+++ b/sca-cpp/trunk/samples/store-scheme/ssl-start
@@ -32,5 +32,5 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-scheme/start b/sca-cpp/trunk/samples/store-scheme/start
index 335e5bb384..f3575db076 100755
--- a/sca-cpp/trunk/samples/store-scheme/start
+++ b/sca-cpp/trunk/samples/store-scheme/start
@@ -28,5 +28,5 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-scheme/stop b/sca-cpp/trunk/samples/store-scheme/stop
index a59273b8ed..3b4c74a587 100755
--- a/sca-cpp/trunk/samples/store-scheme/stop
+++ b/sca-cpp/trunk/samples/store-scheme/stop
@@ -18,4 +18,4 @@
 #  under the License.
 
 ../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-sql/ssl-start b/sca-cpp/trunk/samples/store-sql/ssl-start
index 58ce2070ee..adfba0d761 100755
--- a/sca-cpp/trunk/samples/store-sql/ssl-start
+++ b/sca-cpp/trunk/samples/store-sql/ssl-start
@@ -32,7 +32,7 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../components/sqldb/pgsql-conf tmp
 ../../components/sqldb/pgsql-start tmp
 ../../components/sqldb/pgsql "create table store(key text, value text);" 1>/dev/null 2>&1
diff --git a/sca-cpp/trunk/samples/store-sql/start b/sca-cpp/trunk/samples/store-sql/start
index 2628f99f65..d4cf3c265b 100755
--- a/sca-cpp/trunk/samples/store-sql/start
+++ b/sca-cpp/trunk/samples/store-sql/start
@@ -28,7 +28,7 @@ SCAComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../components/sqldb/pgsql-conf tmp
 ../../components/sqldb/pgsql-start tmp
 ../../components/sqldb/pgsql "create table store(key text, value text);" 1>/dev/null 2>&1
diff --git a/sca-cpp/trunk/samples/store-sql/stop b/sca-cpp/trunk/samples/store-sql/stop
index 2226018a3f..daf271cbfa 100755
--- a/sca-cpp/trunk/samples/store-sql/stop
+++ b/sca-cpp/trunk/samples/store-sql/stop
@@ -19,4 +19,4 @@
 
 ../../modules/http/httpd-stop tmp
 ../../components/sqldb/pgsql-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-vhost/ssl-start b/sca-cpp/trunk/samples/store-vhost/ssl-start
index a556d48dfc..17f4e7f5af 100755
--- a/sca-cpp/trunk/samples/store-vhost/ssl-start
+++ b/sca-cpp/trunk/samples/store-vhost/ssl-start
@@ -44,5 +44,5 @@ SCAVirtualComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-vhost/start b/sca-cpp/trunk/samples/store-vhost/start
index ee6f613bad..0b5740a46e 100755
--- a/sca-cpp/trunk/samples/store-vhost/start
+++ b/sca-cpp/trunk/samples/store-vhost/start
@@ -34,5 +34,5 @@ SCAVirtualComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
diff --git a/sca-cpp/trunk/samples/store-vhost/stop b/sca-cpp/trunk/samples/store-vhost/stop
index a59273b8ed..3b4c74a587 100755
--- a/sca-cpp/trunk/samples/store-vhost/stop
+++ b/sca-cpp/trunk/samples/store-vhost/stop
@@ -18,4 +18,4 @@
 #  under the License.
 
 ../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
diff --git a/sca-cpp/trunk/samples/store-vhost/uec2-start b/sca-cpp/trunk/samples/store-vhost/uec2-start
index 70de35efa1..385021a0da 100755
--- a/sca-cpp/trunk/samples/store-vhost/uec2-start
+++ b/sca-cpp/trunk/samples/store-vhost/uec2-start
@@ -47,6 +47,6 @@ SCAVirtualComposite store.composite
 
 EOF
 
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
 ../../modules/http/httpd-start tmp
 
-- 
cgit v1.2.3