From b00fe2747627bc95ac8d1d548e0621930a1775a2 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 17 Jan 2010 09:02:29 +0000
Subject: 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
---
 sca-cpp/trunk/components/cache/mcache.composite          | 2 +-
 sca-cpp/trunk/components/cache/mcache.cpp                | 2 +-
 sca-cpp/trunk/components/webservice/webservice.composite | 2 +-
 sca-cpp/trunk/components/webservice/webservice.cpp       | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sca-cpp/trunk/components')

diff --git a/sca-cpp/trunk/components/cache/mcache.composite b/sca-cpp/trunk/components/cache/mcache.composite
index 99364104fb..3a838abc79 100644
--- a/sca-cpp/trunk/components/cache/mcache.composite
+++ b/sca-cpp/trunk/components/cache/mcache.composite
@@ -23,7 +23,7 @@
   name="mcache">
         
     <component name="mcache">
-        <t:implementation.cpp uri=".libs/libmcache"/>
+        <implementation.cpp path=".libs" library="libmcache"/>
         <service name="mcache">
             <t:binding.http uri="mcache"/>
         </service>
diff --git a/sca-cpp/trunk/components/cache/mcache.cpp b/sca-cpp/trunk/components/cache/mcache.cpp
index 3e8fdeb294..46f707ee19 100644
--- a/sca-cpp/trunk/components/cache/mcache.cpp
+++ b/sca-cpp/trunk/components/cache/mcache.cpp
@@ -89,7 +89,7 @@ const failable<value> del(const list<value>& params) {
 
 extern "C" {
 
-const tuscany::value eval(const tuscany::list<tuscany::value>& params) {
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
     const tuscany::value func(car(params));
     if (func == "get")
         return tuscany::cache::get(cdr(params));
diff --git a/sca-cpp/trunk/components/webservice/webservice.composite b/sca-cpp/trunk/components/webservice/webservice.composite
index 3e6be1fae6..9498a26b53 100644
--- a/sca-cpp/trunk/components/webservice/webservice.composite
+++ b/sca-cpp/trunk/components/webservice/webservice.composite
@@ -23,7 +23,7 @@
   name="webservice">
         
     <component name="webservice">
-        <t:implementation.cpp uri=".libs/libwebservice"/>
+        <implementation.cpp path=".libs" library="libwebservice"/>
         <service name="webservice">
             <t:binding.http uri="webservice"/>
         </service>
diff --git a/sca-cpp/trunk/components/webservice/webservice.cpp b/sca-cpp/trunk/components/webservice/webservice.cpp
index 769df9e258..f4606afdd8 100644
--- a/sca-cpp/trunk/components/webservice/webservice.cpp
+++ b/sca-cpp/trunk/components/webservice/webservice.cpp
@@ -34,9 +34,9 @@ namespace tuscany {
 namespace webservice {
 
 /**
- * Evaluate a Web service function / operation.
+ * Apply a Web service function / operation.
  */
-const failable<value> eval(const value& func, unused const list<value>& params) {
+const failable<value> apply(const value& func, unused const list<value>& params) {
     return tuscany::mkfailure<tuscany::value>(tuscany::string("Function not supported: ") + func);
 }
 
@@ -45,8 +45,8 @@ const failable<value> eval(const value& func, unused const list<value>& params)
 
 extern "C" {
 
-const tuscany::value eval(const tuscany::list<tuscany::value>& params) {
-    return tuscany::webservice::eval(car(params), cdr(params));
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
+    return tuscany::webservice::apply(car(params), cdr(params));
 }
 
 }
-- 
cgit v1.2.3