Author: jsdelfino
Date: Mon Jan 16 03:49:01 2012
New Revision: 1231821
URL: http://svn.apache.org/viewvc?rev=1231821&view=rev
Log:
Fix error with logging command in memcached and sqldb start / stop scripts.
Adjust test scripts, add new parameter required by memcached start / stop
scripts.
Modified:
tuscany/sca-cpp/trunk/components/cache/memcached-ssl-test
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/components/sqldb/pgsql-backup
tuscany/sca-cpp/trunk/components/sqldb/pgsql-conf
tuscany/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
tuscany/sca-cpp/trunk/components/sqldb/pgsql-start
tuscany/sca-cpp/trunk/components/sqldb/pgsql-stop
tuscany/sca-cpp/trunk/modules/edit/ssl-start
tuscany/sca-cpp/trunk/modules/edit/start
tuscany/sca-cpp/trunk/modules/edit/stop
tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test
tuscany/sca-cpp/trunk/modules/oauth/start-test
tuscany/sca-cpp/trunk/modules/oauth/stop-test
tuscany/sca-cpp/trunk/modules/openid/start-test
tuscany/sca-cpp/trunk/modules/openid/stop-test
tuscany/sca-cpp/trunk/samples/loan-python/start
tuscany/sca-cpp/trunk/samples/loan-python/stop
tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start
tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop
tuscany/sca-cpp/trunk/samples/store-cluster/start
tuscany/sca-cpp/trunk/samples/store-cluster/stop
tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
tuscany/sca-cpp/trunk/samples/store-cpp/start
tuscany/sca-cpp/trunk/samples/store-cpp/stop
tuscany/sca-cpp/trunk/samples/store-java/ssl-start
tuscany/sca-cpp/trunk/samples/store-java/start
tuscany/sca-cpp/trunk/samples/store-java/stop
tuscany/sca-cpp/trunk/samples/store-python/ssl-start
tuscany/sca-cpp/trunk/samples/store-python/start
tuscany/sca-cpp/trunk/samples/store-python/stop
tuscany/sca-cpp/trunk/samples/store-python/uec2-start
tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start
tuscany/sca-cpp/trunk/samples/store-scheme/start
tuscany/sca-cpp/trunk/samples/store-scheme/stop
tuscany/sca-cpp/trunk/samples/store-sql/ssl-start
tuscany/sca-cpp/trunk/samples/store-sql/start
tuscany/sca-cpp/trunk/samples/store-sql/stop
tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
tuscany/sca-cpp/trunk/samples/store-vhost/start
tuscany/sca-cpp/trunk/samples/store-vhost/stop
tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-ssl-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-ssl-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-ssl-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-ssl-test Mon Jan 16
03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-start Mon Jan 16 03:49:01
2012
@@ -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
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-stop (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-stop Mon Jan 16 03:49:01
2012
@@ -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"
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-test Mon Jan 16 03:49:01
2012
@@ -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
Modified: tuscany/sca-cpp/trunk/components/cache/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/server-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/server-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/server-test Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/components/sqldb/pgsql-backup
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/pgsql-backup?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/pgsql-backup (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/pgsql-backup Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/components/sqldb/pgsql-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/pgsql-conf?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/pgsql-conf (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/pgsql-conf Mon Jan 16 03:49:01 2012
@@ -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
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
Modified: tuscany/sca-cpp/trunk/components/sqldb/pgsql-standby-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/pgsql-standby-conf?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/pgsql-standby-conf (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/pgsql-standby-conf Mon Jan 16
03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/components/sqldb/pgsql-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/pgsql-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/pgsql-start (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/pgsql-start Mon Jan 16 03:49:01 2012
@@ -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'`
Modified: tuscany/sca-cpp/trunk/components/sqldb/pgsql-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/pgsql-stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/pgsql-stop (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/pgsql-stop Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/edit/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/ssl-start (original)
+++ tuscany/sca-cpp/trunk/modules/edit/ssl-start Mon Jan 16 03:49:01 2012
@@ -36,8 +36,8 @@ if [ -x ../../components/log/scribe-cat
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
Modified: tuscany/sca-cpp/trunk/modules/edit/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/start (original)
+++ tuscany/sca-cpp/trunk/modules/edit/start Mon Jan 16 03:49:01 2012
@@ -32,8 +32,8 @@ if [ -x ../../components/log/scribe-cat
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
Modified: tuscany/sca-cpp/trunk/modules/edit/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/stop (original)
+++ tuscany/sca-cpp/trunk/modules/edit/stop Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test Mon Jan 16 03:49:01
2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/oauth/start-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/start-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/start-test (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/start-test Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/oauth/stop-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/stop-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/stop-test (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/stop-test Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/openid/start-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/start-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/start-test (original)
+++ tuscany/sca-cpp/trunk/modules/openid/start-test Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/openid/stop-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/stop-test?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/stop-test (original)
+++ tuscany/sca-cpp/trunk/modules/openid/stop-test Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/loan-python/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/loan-python/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/loan-python/start (original)
+++ tuscany/sca-cpp/trunk/samples/loan-python/start Mon Jan 16 03:49:01 2012
@@ -28,5 +28,5 @@ SCAComposite loan.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/loan-python/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/loan-python/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/loan-python/stop (original)
+++ tuscany/sca-cpp/trunk/samples/loan-python/stop Mon Jan 16 03:49:01 2012
@@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
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=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start Mon Jan 16 03:49:01
2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop Mon Jan 16 03:49:01
2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/start Mon Jan 16 03:49:01 2012
@@ -33,9 +33,9 @@ sudo ../../ubuntu/ip-redirect-all 80 809
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
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/stop Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start Mon Jan 16 03:49:01 2012
@@ -32,5 +32,5 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/start Mon Jan 16 03:49:01 2012
@@ -28,5 +28,5 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/stop Mon Jan 16 03:49:01 2012
@@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
Modified: tuscany/sca-cpp/trunk/samples/store-java/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/ssl-start Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-java/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/start Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-java/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/stop Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-python/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/ssl-start Mon Jan 16 03:49:01
2012
@@ -33,5 +33,5 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-python/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/start Mon Jan 16 03:49:01 2012
@@ -28,5 +28,5 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-python/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/stop Mon Jan 16 03:49:01 2012
@@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
Modified: tuscany/sca-cpp/trunk/samples/store-python/uec2-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/uec2-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/uec2-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/uec2-start Mon Jan 16 03:49:01
2012
@@ -42,6 +42,6 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start Mon Jan 16 03:49:01
2012
@@ -32,5 +32,5 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/start Mon Jan 16 03:49:01 2012
@@ -28,5 +28,5 @@ SCAComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/stop Mon Jan 16 03:49:01 2012
@@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
Modified: tuscany/sca-cpp/trunk/samples/store-sql/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/ssl-start Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-sql/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/start Mon Jan 16 03:49:01 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-sql/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/stop Mon Jan 16 03:49:01 2012
@@ -19,4 +19,4 @@
../../modules/http/httpd-stop tmp
../../components/sqldb/pgsql-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Mon Jan 16 03:49:01 2012
@@ -44,5 +44,5 @@ SCAVirtualComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/start Mon Jan 16 03:49:01 2012
@@ -34,5 +34,5 @@ SCAVirtualComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/stop
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/stop?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/stop (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/stop Mon Jan 16 03:49:01 2012
@@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
-../../components/cache/memcached-stop
+../../components/cache/memcached-stop tmp
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start?rev=1231821&r1=1231820&r2=1231821&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start Mon Jan 16 03:49:01
2012
@@ -47,6 +47,6 @@ SCAVirtualComposite store.composite
EOF
-../../components/cache/memcached-start
+../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp
