summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-01-16 03:49:01 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-01-16 03:49:01 +0000
commitc3cc3ea6b1ea3472899bd467230fffd82d1889aa (patch)
tree8e4044bbed67b1dd9f33c1afe1bf47ef83664e9a /sca-cpp/trunk/modules
parenta38d708407bab7f1520f7c9e21d36246681f061f (diff)
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
Diffstat (limited to 'sca-cpp/trunk/modules')
-rwxr-xr-xsca-cpp/trunk/modules/edit/ssl-start4
-rwxr-xr-xsca-cpp/trunk/modules/edit/start4
-rwxr-xr-xsca-cpp/trunk/modules/edit/stop4
-rwxr-xr-xsca-cpp/trunk/modules/oauth/start-mixed-test4
-rwxr-xr-xsca-cpp/trunk/modules/oauth/start-test4
-rwxr-xr-xsca-cpp/trunk/modules/oauth/stop-test4
-rwxr-xr-xsca-cpp/trunk/modules/openid/start-test4
-rwxr-xr-xsca-cpp/trunk/modules/openid/stop-test4
8 files changed, 16 insertions, 16 deletions
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