diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-17 09:02:29 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-17 09:02:29 +0000 |
| commit | b00fe2747627bc95ac8d1d548e0621930a1775a2 (patch) | |
| tree | 64561e332127d72763850196be5f0538cac9b8bb /sca-cpp/trunk/modules/server/mod-eval.hpp | |
| parent | 9cb610814d58da1ba2617f78e36e9635f2e7d508 (diff) | |
Cleaned up test composite files. Adjusted C++ implementation elements to match the spec. Minor refactoring/terminology cleanup in HTTPD modules, renamed readImplementation to evalImplementation and evalImplementation to applyImplementation.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900071 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-cpp/trunk/modules/server/mod-eval.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/modules/server/mod-eval.hpp b/sca-cpp/trunk/modules/server/mod-eval.hpp index 4f95977fea..f5c4266cc1 100644 --- a/sca-cpp/trunk/modules/server/mod-eval.hpp +++ b/sca-cpp/trunk/modules/server/mod-eval.hpp @@ -279,11 +279,10 @@ const list<value> proxies(const list<value>& refs, const string& base) { return cons(mkproxy(car(refs), base), proxies(cdr(refs), base)); } -extern const failable<lambda<value(const list<value>&)> > readImplementation(const string& itype, const string& path, const list<value>& px); +extern const failable<lambda<value(const list<value>&)> > evalImplementation(const string& cpath, const value& impl, const list<value>& px); const value confImplementation(DirConf& dc, ServerConf& sc, server_rec& server, const value& comp) { const value impl = scdl::implementation(comp); - const string path = dc.contributionPath + string(scdl::uri(impl)); // Convert component references to configured proxy lambdas ostringstream base; @@ -296,8 +295,9 @@ const value confImplementation(DirConf& dc, ServerConf& sc, server_rec& server, base << sc.wiringServerName << "/references/" << string(scdl::name(comp)) << "/"; const list<value> px(proxies(scdl::references(comp), str(base))); - // Read and configure the implementation - const failable<lambda<value(const list<value>&)> > cimpl(readImplementation(elementName(impl), path, px)); + // Evaluate the component implementation and convert it to an + // applicable lambda function + const failable<lambda<value(const list<value>&)> > cimpl(evalImplementation(dc.contributionPath, impl, px)); if (!hasContent(cimpl)) return reason(cimpl); return content(cimpl); |