diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-20 05:00:08 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-20 05:00:08 +0000 |
| commit | 4503cce85999e9c76cf7eeee9ba07b7c2a714f4d (patch) | |
| tree | e8728b7eafc3806f176a583d0ac3d7ab81e4a606 /sca-cpp/trunk/modules | |
| parent | ac736cca82bc8ed1a482baa5a2635acc18bc88ec (diff) | |
Minor fixes to get all samples working in a target install dir.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1024522 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules')
| -rw-r--r-- | sca-cpp/trunk/modules/http/Makefile.am | 2 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/server/mod-eval.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am index b17f774da2..209c7358b7 100644 --- a/sca-cpp/trunk/modules/http/Makefile.am +++ b/sca-cpp/trunk/modules/http/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE} incl_HEADERS = *.hpp incldir = $(prefix)/include/modules/http -dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf httpd-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf +dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf httpd-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf moddir=$(prefix)/modules/http curl_test_SOURCES = curl-test.cpp diff --git a/sca-cpp/trunk/modules/server/mod-eval.hpp b/sca-cpp/trunk/modules/server/mod-eval.hpp index c01178cab3..2fe4bd76e0 100644 --- a/sca-cpp/trunk/modules/server/mod-eval.hpp +++ b/sca-cpp/trunk/modules/server/mod-eval.hpp @@ -576,7 +576,7 @@ const failable<bool> virtualHostConfig(ServerConf& vsc, const ServerConf& sc, re // Chdir to the virtual host's contribution if (chdir(c_str(sc.contributionPath)) != 0) - return mkfailure<bool>("Couldn't chdir to the deployed contribution"); + return mkfailure<bool>(string("Couldn't chdir to the deployed contribution: ") + sc.contributionPath); // Configure the deployed components const failable<bool> cr = confComponents(vsc); @@ -607,7 +607,7 @@ const failable<bool> virtualHostCleanup(const ServerConf& vsc, const ServerConf& // Chdir back to the main server's contribution if (chdir(c_str(sc.contributionPath)) != 0) - return mkfailure<bool>("Couldn't chdir to the deployed contribution"); + return mkfailure<bool>(string("Couldn't chdir to the deployed contribution: ") + sc.contributionPath); return true; } @@ -725,7 +725,7 @@ int postConfig(apr_pool_t *p, unused apr_pool_t *plog, unused apr_pool_t *ptemp, if (count == 1) { // Chdir to the deployed contribution if (chdir(c_str(sc.contributionPath)) != 0) { - mkfailure<bool>("Couldn't chdir to the deployed contribution"); + mkfailure<bool>(string("Couldn't chdir to the deployed contribution: ") + sc.contributionPath); return -1; } |