From 215c005bde88752999978adce56b09d2a90a13b7 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 27 Sep 2009 20:04:28 +0000
Subject: Moved some sources up in the directory tree to attempt to simplify
 the directory structure a bit, and some minor refactoring.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@819394 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/sca/samples/store/Makefile.am         | 2 +-
 cpp/sca/samples/store/cart.hpp            | 4 ++--
 cpp/sca/samples/store/catalog.hpp         | 2 +-
 cpp/sca/samples/store/store-composite.hpp | 2 +-
 cpp/sca/samples/store/store-solution.hpp  | 2 +-
 cpp/sca/samples/store/store-ui.hpp        | 2 +-
 cpp/sca/samples/store2/Makefile.am        | 2 +-
 cpp/sca/samples/store2/service.hpp        | 6 +++---
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'cpp/sca/samples')

diff --git a/cpp/sca/samples/store/Makefile.am b/cpp/sca/samples/store/Makefile.am
index 01f90d4a4a..05a0e4482a 100644
--- a/cpp/sca/samples/store/Makefile.am
+++ b/cpp/sca/samples/store/Makefile.am
@@ -21,7 +21,7 @@ storedir=$(prefix)/store/deploy
 store_test_SOURCES = store-test.cpp
 
 INCLUDES = -I. -I${TUSCANY_SCACPP}/include
-store_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca
+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/store/cart.hpp b/cpp/sca/samples/store/cart.hpp
index fe0aa0d81f..fc6155aa25 100644
--- a/cpp/sca/samples/store/cart.hpp
+++ b/cpp/sca/samples/store/cart.hpp
@@ -23,8 +23,8 @@
 #define store_cart_hpp
 
 #include <string>
-#include "tuscany/function.hpp"
-#include "tuscany/list.hpp"
+#include "function.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 #include "catalog.hpp"
diff --git a/cpp/sca/samples/store/catalog.hpp b/cpp/sca/samples/store/catalog.hpp
index da63ab593a..6909911c07 100644
--- a/cpp/sca/samples/store/catalog.hpp
+++ b/cpp/sca/samples/store/catalog.hpp
@@ -23,7 +23,7 @@
 #define store_catalog_hpp
 
 #include <string>
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 
diff --git a/cpp/sca/samples/store/store-composite.hpp b/cpp/sca/samples/store/store-composite.hpp
index 1d5c993c3f..8cee5a943f 100644
--- a/cpp/sca/samples/store/store-composite.hpp
+++ b/cpp/sca/samples/store/store-composite.hpp
@@ -22,7 +22,7 @@
 #ifndef store_storecomposite_hpp
 #define store_storecomposite_hpp
 
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "currency-composite.hpp"
 #include "item.hpp"
diff --git a/cpp/sca/samples/store/store-solution.hpp b/cpp/sca/samples/store/store-solution.hpp
index 73ddccafbe..ecabb18f1c 100644
--- a/cpp/sca/samples/store/store-solution.hpp
+++ b/cpp/sca/samples/store/store-solution.hpp
@@ -22,7 +22,7 @@
 #ifndef store_storesolution_hpp
 #define store_storesolution_hpp
 
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "store-composite.hpp"
 #include "currency-composite.hpp"
 
diff --git a/cpp/sca/samples/store/store-ui.hpp b/cpp/sca/samples/store/store-ui.hpp
index 3dea169cae..c9d0f4330b 100644
--- a/cpp/sca/samples/store/store-ui.hpp
+++ b/cpp/sca/samples/store/store-ui.hpp
@@ -22,7 +22,7 @@
 #ifndef store_storeui_hpp
 #define store_storeui_hpp
 
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 #include "catalog.hpp"
diff --git a/cpp/sca/samples/store2/Makefile.am b/cpp/sca/samples/store2/Makefile.am
index a729335093..f7af244044 100644
--- a/cpp/sca/samples/store2/Makefile.am
+++ b/cpp/sca/samples/store2/Makefile.am
@@ -21,7 +21,7 @@ store2dir=$(prefix)/store2/deploy
 store2_test_SOURCES = store2-test.cpp
 
 INCLUDES = -I. -I${TUSCANY_SCACPP}/include
-store2_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca
+store2_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca -L${LIBXML2_LIB} -lxml2
 	
 EXTRA_DIST = *.composite
 store2_DATA = *.composite
diff --git a/cpp/sca/samples/store2/service.hpp b/cpp/sca/samples/store2/service.hpp
index 9cf8abdb52..b764e87d1a 100644
--- a/cpp/sca/samples/store2/service.hpp
+++ b/cpp/sca/samples/store2/service.hpp
@@ -22,9 +22,9 @@
 #ifndef tuscany_service_hpp
 #define tuscany_service_hpp
 
-#include "tuscany/function.hpp"
-#include "tuscany/list.hpp"
-#include "tuscany/value.hpp"
+#include "function.hpp"
+#include "list.hpp"
+#include "value.hpp"
 
 namespace store
 {
-- 
cgit v1.2.3