From c3cc3ea6b1ea3472899bd467230fffd82d1889aa Mon Sep 17 00:00:00 2001 From: jsdelfino 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/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 +- 26 files changed, 34 insertions(+), 34 deletions(-) (limited to 'sca-cpp/trunk/samples') 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