diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-01-30 15:56:11 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-01-30 15:56:11 +0000 |
| commit | f4c4803ce0c14585e3c2af3641d94b651877e04c (patch) | |
| tree | 9f10df32f2d34a3c697aaee897bad0b180922095 /sca-cpp/trunk/components | |
| parent | 1b10f18fce6baeb721a725661ded630614831304 (diff) | |
Refactor server hosting module, rename it and move it under a hosting dir, and refactor its datastore components into a single component.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1237740 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/components')
| -rwxr-xr-x | sca-cpp/trunk/components/constdb/server-test | 2 | ||||
| -rw-r--r-- | sca-cpp/trunk/components/http/http.composite | 4 | ||||
| -rw-r--r-- | sca-cpp/trunk/components/http/url-test.scm | 2 | ||||
| -rwxr-xr-x | sca-cpp/trunk/components/sqldb/pgsql-conf | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sca-cpp/trunk/components/constdb/server-test b/sca-cpp/trunk/components/constdb/server-test index 6d53e641ae..7e98e42bbb 100755 --- a/sca-cpp/trunk/components/constdb/server-test +++ b/sca-cpp/trunk/components/constdb/server-test @@ -32,7 +32,7 @@ EOF sleep 2 # Test -./client-test #2>/dev/null +./client-test 2>/dev/null rc=$? # Cleanup diff --git a/sca-cpp/trunk/components/http/http.composite b/sca-cpp/trunk/components/http/http.composite index 48fe1c3b55..ea0adedf51 100644 --- a/sca-cpp/trunk/components/http/http.composite +++ b/sca-cpp/trunk/components/http/http.composite @@ -80,8 +80,8 @@ <component name="scheme-test"> <implementation.scheme script="server-test.scm"/> - <service name="test"> - <binding.http uri="test"/> + <service name="scheme"> + <binding.http uri="scheme"/> </service> </component> diff --git a/sca-cpp/trunk/components/http/url-test.scm b/sca-cpp/trunk/components/http/url-test.scm index 37a5b345b2..dd92720c32 100644 --- a/sca-cpp/trunk/components/http/url-test.scm +++ b/sca-cpp/trunk/components/http/url-test.scm @@ -18,6 +18,6 @@ ; URL test case (define (get id) - "http://localhost:8090/test" + "http://localhost:8090/scheme" ) diff --git a/sca-cpp/trunk/components/sqldb/pgsql-conf b/sca-cpp/trunk/components/sqldb/pgsql-conf index 6aa705f139..4083160a02 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-conf @@ -98,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 | sh $root/sqldb/logger +$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'` |