29 files changed, 32 insertions, 41 deletions
diff --git a/cpp/sca/samples/Makefile.am b/cpp/sca/samples/Makefile.am
index 9ccf905d72..0fdf524cc1 100644
--- a/cpp/sca/samples/Makefile.am
+++ b/cpp/sca/samples/Makefile.am
@@ -16,13 +16,13 @@
 #  under the License.
 
 if WANT_ALL_SAMPLES
-  CPP_SAMPLES = CppCalculator CppBigBank store store2
+  CPP_SAMPLES = CppCalculator CppBigBank
   PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast RestCustomer AlertAggregator
   RUBY_SAMPLES = RubyCalculator RubyBigBank HttpdBigBank RestCalculator
   PYTHON_RUBY_SAMPLES = RestYahoo
 else
 if WANT_CPP_SAMPLES
-    CPP_SAMPLES = CppCalculator CppBigBank store
+    CPP_SAMPLES = CppCalculator CppBigBank
 endif
 if WANT_PYTHON_SAMPLES
     PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast RestCustomer AlertAggregator
diff --git a/cpp/sca/samples/configure.ac b/cpp/sca/samples/configure.ac
index c4021401fe..41cd6f4dbe 100644
--- a/cpp/sca/samples/configure.ac
+++ b/cpp/sca/samples/configure.ac
@@ -162,8 +162,6 @@ AC_ARG_ENABLE(ruby, [AS_HELP_STRING([--enable-ruby],[build Ruby samples [default
 AM_CONDITIONAL([WANT_RUBY_SAMPLES], [test x$want_ruby_samples = xtrue])
 
 AC_CONFIG_FILES([Makefile  
-                 store/Makefile
-                 store2/Makefile
                  AlertAggregator/Makefile
                  AlertAggregator/sample.alerter/Makefile
                  AlertAggregator/sample.display/Makefile
diff --git a/cpp/sca/samples/store/Makefile.am b/cpp/sca/test/Makefile.am
index 05a0e4482a..4a20e27139 100644
--- a/cpp/sca/samples/store/Makefile.am
+++ b/cpp/sca/test/Makefile.am
@@ -15,13 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-store_PROGRAMS = store-test
-storedir=$(prefix)/store/deploy
+SUBDIRS = store-object store-function store-script
 
-store_test_SOURCES = store-test.cpp
-
-INCLUDES = -I. -I${TUSCANY_SCACPP}/include
-store_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca -L${LIBXML2_LIB} -lxml2
-	
-EXTRA_DIST = *.composite
-store_DATA = *.composite
diff --git a/cpp/sca/samples/store2/cart.hpp b/cpp/sca/test/store-function/cart.hpp
index f3b0f6195e..c21e509487 100644
--- a/cpp/sca/samples/store2/cart.hpp
+++ b/cpp/sca/test/store-function/cart.hpp
@@ -55,14 +55,14 @@ const double shoppingCart_getTotal() {
 }
 
 const tuscany::value shoppingCart_service(const tuscany::list<tuscany::value>& args) {
-    if (car(args) == "getAll")
-        return shoppingCart_getAll();
-    if (car(args) == "post")
-        return shoppingCart_post(cadr(args));
-    if (car(args) == "deleteAll")
-        return shoppingCart_deleteAll();
-    if (car(args) == "getTotal")
-        return shoppingCart_getTotal();
+    if (car(args) == tuscany::value("getAll"))
+        return tuscany::value(shoppingCart_getAll());
+    if (car(args) == tuscany::value("post"))
+        return tuscany::value(shoppingCart_post(cadr(args)));
+    if (car(args) == tuscany::value("deleteAll"))
+        return tuscany::value(shoppingCart_deleteAll());
+    if (car(args) == tuscany::value("getTotal"))
+        return tuscany::value(shoppingCart_getTotal());
     return tuscany::value();
 }
 
diff --git a/cpp/sca/samples/store2/catalog.hpp b/cpp/sca/test/store-function/catalog.hpp
index 82a2a458a9..82a69e2bbd 100644
--- a/cpp/sca/samples/store2/catalog.hpp
+++ b/cpp/sca/test/store-function/catalog.hpp
@@ -45,8 +45,8 @@ const tuscany::list<ItemType> catalog_get(const service& currencyConverter) {
 }
 
 const tuscany::value catalog_service(const service& currencyConverter, const tuscany::list<tuscany::value>& args) {
-    if (car(args) == "get")
-        return catalog_get(currencyConverter);
+    if (car(args) == tuscany::value("get"))
+        return tuscany::value(catalog_get(currencyConverter));
     return tuscany::value();
 }
 
diff --git a/cpp/sca/samples/store/catalogs.composite b/cpp/sca/test/store-function/catalogs.composite
index 1638ed0a05..1638ed0a05 100644
--- a/cpp/sca/samples/store/catalogs.composite
+++ b/cpp/sca/test/store-function/catalogs.composite
diff --git a/cpp/sca/samples/store2/currency-composite.hpp b/cpp/sca/test/store-function/currency-composite.hpp
index ae28471538..ae28471538 100644
--- a/cpp/sca/samples/store2/currency-composite.hpp
+++ b/cpp/sca/test/store-function/currency-composite.hpp
diff --git a/cpp/sca/samples/store/currency.composite b/cpp/sca/test/store-function/currency.composite
index aefd474f1f..aefd474f1f 100644
--- a/cpp/sca/samples/store/currency.composite
+++ b/cpp/sca/test/store-function/currency.composite
diff --git a/cpp/sca/samples/store2/currency.hpp b/cpp/sca/test/store-function/currency.hpp
index 453a5e1e81..ce7e4f464b 100644
--- a/cpp/sca/samples/store2/currency.hpp
+++ b/cpp/sca/test/store-function/currency.hpp
@@ -47,10 +47,10 @@ const std::string currencyConverter_getSymbol(const std::string& currencyCode) {
 }
 
 const tuscany::value currencyConverter_service(const tuscany::list<tuscany::value>& args) {
-    if (car(args) == "convert")
-        return currencyConverter_convert(cadr(args), car(cdr(cdr(args))), car(cdr(cdr(cdr(args)))));
-    if (car(args) == "getSymbol")
-        return currencyConverter_getSymbol(cadr(args));
+    if (car(args) == tuscany::value("convert"))
+        return tuscany::value(currencyConverter_convert(cadr(args), car(cdr(cdr(args))), car(cdr(cdr(cdr(args))))));
+    if (car(args) == tuscany::value("getSymbol"))
+        return tuscany::value(currencyConverter_getSymbol(cadr(args)));
     return tuscany::value();
 }
 
diff --git a/cpp/sca/samples/store2/item.hpp b/cpp/sca/test/store-function/item.hpp
index 8a121124a3..8a121124a3 100644
--- a/cpp/sca/samples/store2/item.hpp
+++ b/cpp/sca/test/store-function/item.hpp
diff --git a/cpp/sca/samples/store2/service.hpp b/cpp/sca/test/store-function/service.hpp
index b764e87d1a..b764e87d1a 100644
--- a/cpp/sca/samples/store2/service.hpp
+++ b/cpp/sca/test/store-function/service.hpp
diff --git a/cpp/sca/samples/store2/store-composite.hpp b/cpp/sca/test/store-function/store-composite.hpp
index 351c905eae..351c905eae 100644
--- a/cpp/sca/samples/store2/store-composite.hpp
+++ b/cpp/sca/test/store-function/store-composite.hpp
diff --git a/cpp/sca/samples/store2/store2-test.cpp b/cpp/sca/test/store-function/store-function-test.cpp
index e71ecfd633..e71ecfd633 100644
--- a/cpp/sca/samples/store2/store2-test.cpp
+++ b/cpp/sca/test/store-function/store-function-test.cpp
diff --git a/cpp/sca/samples/store2/store-solution.hpp b/cpp/sca/test/store-function/store-solution.hpp
index e0addcba12..e0addcba12 100644
--- a/cpp/sca/samples/store2/store-solution.hpp
+++ b/cpp/sca/test/store-function/store-solution.hpp
diff --git a/cpp/sca/samples/store2/store-ui.hpp b/cpp/sca/test/store-function/store-ui.hpp
index 3be7480339..9b100a6793 100644
--- a/cpp/sca/samples/store2/store-ui.hpp
+++ b/cpp/sca/test/store-function/store-ui.hpp
@@ -49,14 +49,14 @@ const bool storeUI_post(const service& cart, const ItemType& item) {
 }
 
 const tuscany::value storeUI_service(const service& catalog, const service& cart, const tuscany::list<tuscany::value>& args) {
-    if (car(args) == "getCatalog")
-        return storeUI_getCatalog(catalog);
-    if (car(args) == "getCart")
-        return storeUI_getCart(cart);
-    if (car(args) == "getTotal")
-        return storeUI_getTotal(cart);
-    if (car(args) == "post")
-        return storeUI_post(cart, cadr(args));
+    if (car(args) == tuscany::value("getCatalog"))
+        return tuscany::value(storeUI_getCatalog(catalog));
+    if (car(args) == tuscany::value("getCart"))
+        return tuscany::value(storeUI_getCart(cart));
+    if (car(args) == tuscany::value("getTotal"))
+        return tuscany::value(storeUI_getTotal(cart));
+    if (car(args) == tuscany::value("post"))
+        return tuscany::value(storeUI_post(cart, cadr(args)));
     return tuscany::value();
 }
 
diff --git a/cpp/sca/samples/store/store.composite b/cpp/sca/test/store-function/store.composite
index 124adff853..124adff853 100644
--- a/cpp/sca/samples/store/store.composite
+++ b/cpp/sca/test/store-function/store.composite
diff --git a/cpp/sca/samples/store2/Makefile.am b/cpp/sca/test/store-object/Makefile.am
index f7af244044..c79bf6ebde 100644
--- a/cpp/sca/samples/store2/Makefile.am
+++ b/cpp/sca/test/store-object/Makefile.am
@@ -15,13 +15,14 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-store2_PROGRAMS = store2-test
-store2dir=$(prefix)/store2/deploy
+store_object_PROGRAMS = store-object-test
+store_objectdir=$(prefix)/test/store-object/deploy
 
-store2_test_SOURCES = store2-test.cpp
+INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE}
 
-INCLUDES = -I. -I${TUSCANY_SCACPP}/include
-store2_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca -L${LIBXML2_LIB} -lxml2
+store_object_test_SOURCES = store-object-test.cpp
+store_object_test_LDADD = -L${LIBXML2_LIB} -lxml2 -lpthread
 	
 EXTRA_DIST = *.composite
-store2_DATA = *.composite
+store_object_DATA = *.composite
+
diff --git a/cpp/sca/samples/store/cart.hpp b/cpp/sca/test/store-object/cart.hpp
index fc6155aa25..fc6155aa25 100644
--- a/cpp/sca/samples/store/cart.hpp
+++ b/cpp/sca/test/store-object/cart.hpp
diff --git a/cpp/sca/samples/store/catalog.hpp b/cpp/sca/test/store-object/catalog.hpp
index 6909911c07..6909911c07 100644
--- a/cpp/sca/samples/store/catalog.hpp
+++ b/cpp/sca/test/store-object/catalog.hpp
diff --git a/cpp/sca/samples/store2/catalogs.composite b/cpp/sca/test/store-object/catalogs.composite
index 1638ed0a05..1638ed0a05 100644
--- a/cpp/sca/samples/store2/catalogs.composite
+++ b/cpp/sca/test/store-object/catalogs.composite
diff --git a/cpp/sca/samples/store/currency-composite.hpp b/cpp/sca/test/store-object/currency-composite.hpp
index 94b52b461e..94b52b461e 100644
--- a/cpp/sca/samples/store/currency-composite.hpp
+++ b/cpp/sca/test/store-object/currency-composite.hpp
diff --git a/cpp/sca/samples/store2/currency.composite b/cpp/sca/test/store-object/currency.composite
index aefd474f1f..aefd474f1f 100644
--- a/cpp/sca/samples/store2/currency.composite
+++ b/cpp/sca/test/store-object/currency.composite
diff --git a/cpp/sca/samples/store/currency.hpp b/cpp/sca/test/store-object/currency.hpp
index a8228ea51c..a8228ea51c 100644
--- a/cpp/sca/samples/store/currency.hpp
+++ b/cpp/sca/test/store-object/currency.hpp
diff --git a/cpp/sca/samples/store/item.hpp b/cpp/sca/test/store-object/item.hpp
index ab8e52769b..ab8e52769b 100644
--- a/cpp/sca/samples/store/item.hpp
+++ b/cpp/sca/test/store-object/item.hpp
diff --git a/cpp/sca/samples/store/store-composite.hpp b/cpp/sca/test/store-object/store-composite.hpp
index 8cee5a943f..8cee5a943f 100644
--- a/cpp/sca/samples/store/store-composite.hpp
+++ b/cpp/sca/test/store-object/store-composite.hpp
diff --git a/cpp/sca/samples/store/store-test.cpp b/cpp/sca/test/store-object/store-object-test.cpp
index bfbf5459ac..bfbf5459ac 100644
--- a/cpp/sca/samples/store/store-test.cpp
+++ b/cpp/sca/test/store-object/store-object-test.cpp
diff --git a/cpp/sca/samples/store/store-solution.hpp b/cpp/sca/test/store-object/store-solution.hpp
index ecabb18f1c..ecabb18f1c 100644
--- a/cpp/sca/samples/store/store-solution.hpp
+++ b/cpp/sca/test/store-object/store-solution.hpp
diff --git a/cpp/sca/samples/store/store-ui.hpp b/cpp/sca/test/store-object/store-ui.hpp
index c9d0f4330b..c9d0f4330b 100644
--- a/cpp/sca/samples/store/store-ui.hpp
+++ b/cpp/sca/test/store-object/store-ui.hpp
diff --git a/cpp/sca/samples/store2/store.composite b/cpp/sca/test/store-object/store.composite
index 124adff853..124adff853 100644
--- a/cpp/sca/samples/store2/store.composite
+++ b/cpp/sca/test/store-object/store.composite