1040 files changed, 0 insertions, 0 deletions

diff --git a/cpp/sca/AUTHORS b/sca-cpp/trunk/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/AUTHORS
+++ b/sca-cpp/trunk/AUTHORS
diff --git a/cpp/sca/COPYING b/sca-cpp/trunk/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/cpp/sca/COPYING
+++ b/sca-cpp/trunk/COPYING
diff --git a/cpp/sca/ChangeLog b/sca-cpp/trunk/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/ChangeLog
+++ b/sca-cpp/trunk/ChangeLog
diff --git a/cpp/sca/GettingStarted.html b/sca-cpp/trunk/GettingStarted.html
index d41ed95580..d41ed95580 100644
--- a/cpp/sca/GettingStarted.html
+++ b/sca-cpp/trunk/GettingStarted.html
diff --git a/cpp/sca/INSTALL b/sca-cpp/trunk/INSTALL
index 9b027cad1f..9b027cad1f 100644
--- a/cpp/sca/INSTALL
+++ b/sca-cpp/trunk/INSTALL
diff --git a/cpp/sca/LICENSE b/sca-cpp/trunk/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/cpp/sca/LICENSE
+++ b/sca-cpp/trunk/LICENSE
diff --git a/cpp/sca/Makefile.am b/sca-cpp/trunk/Makefile.am
index caa00d389a..caa00d389a 100644
--- a/cpp/sca/Makefile.am
+++ b/sca-cpp/trunk/Makefile.am
diff --git a/cpp/sca/NEWS b/sca-cpp/trunk/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/NEWS
+++ b/sca-cpp/trunk/NEWS
diff --git a/cpp/sca/NOTICE b/sca-cpp/trunk/NOTICE
index 44befbee63..44befbee63 100644
--- a/cpp/sca/NOTICE
+++ b/sca-cpp/trunk/NOTICE
diff --git a/cpp/sca/README b/sca-cpp/trunk/README
index f17e5a86bb..f17e5a86bb 100644
--- a/cpp/sca/README
+++ b/sca-cpp/trunk/README
diff --git a/cpp/sca/autogen.sh b/sca-cpp/trunk/autogen.sh
index af38864985..af38864985 100755
--- a/cpp/sca/autogen.sh
+++ b/sca-cpp/trunk/autogen.sh
diff --git a/cpp/sca/build.sh b/sca-cpp/trunk/build.sh
index c306d2a20d..c306d2a20d 100755
--- a/cpp/sca/build.sh
+++ b/sca-cpp/trunk/build.sh
diff --git a/cpp/sca/builddist.sh b/sca-cpp/trunk/builddist.sh
index 737cc9dbf1..737cc9dbf1 100755
--- a/cpp/sca/builddist.sh
+++ b/sca-cpp/trunk/builddist.sh
diff --git a/cpp/sca/configure.ac b/sca-cpp/trunk/configure.ac
index 22eae7f4e3..22eae7f4e3 100644
--- a/cpp/sca/configure.ac
+++ b/sca-cpp/trunk/configure.ac
diff --git a/cpp/sca/configure.sh b/sca-cpp/trunk/configure.sh
index ca78ad8be0..ca78ad8be0 100755
--- a/cpp/sca/configure.sh
+++ b/sca-cpp/trunk/configure.sh
diff --git a/cpp/sca/doc/Axis2CWSExtension.html b/sca-cpp/trunk/doc/Axis2CWSExtension.html
index 17b9676650..17b9676650 100644
--- a/cpp/sca/doc/Axis2CWSExtension.html
+++ b/sca-cpp/trunk/doc/Axis2CWSExtension.html
diff --git a/cpp/sca/doc/CPPGeneratorTool.txt b/sca-cpp/trunk/doc/CPPGeneratorTool.txt
index c004799791..c004799791 100644
--- a/cpp/sca/doc/CPPGeneratorTool.txt
+++ b/sca-cpp/trunk/doc/CPPGeneratorTool.txt
diff --git a/cpp/sca/doc/CppExtension.html b/sca-cpp/trunk/doc/CppExtension.html
index 6e7420a9d4..6e7420a9d4 100644
--- a/cpp/sca/doc/CppExtension.html
+++ b/sca-cpp/trunk/doc/CppExtension.html
diff --git a/cpp/sca/doc/Doxyfile.in b/sca-cpp/trunk/doc/Doxyfile.in
index 8127448fd6..8127448fd6 100644
--- a/cpp/sca/doc/Doxyfile.in
+++ b/sca-cpp/trunk/doc/Doxyfile.in
diff --git a/cpp/sca/doc/Doxyfile.w32 b/sca-cpp/trunk/doc/Doxyfile.w32
index e97d3602db..e97d3602db 100644
--- a/cpp/sca/doc/Doxyfile.w32
+++ b/sca-cpp/trunk/doc/Doxyfile.w32
diff --git a/cpp/sca/doc/Makefile.am b/sca-cpp/trunk/doc/Makefile.am
index fdf2de8c58..fdf2de8c58 100644
--- a/cpp/sca/doc/Makefile.am
+++ b/sca-cpp/trunk/doc/Makefile.am
diff --git a/cpp/sca/doc/PythonExtension.html b/sca-cpp/trunk/doc/PythonExtension.html
index f51af0d6c9..f51af0d6c9 100644
--- a/cpp/sca/doc/PythonExtension.html
+++ b/sca-cpp/trunk/doc/PythonExtension.html
diff --git a/cpp/sca/doc/RESTExtension.html b/sca-cpp/trunk/doc/RESTExtension.html
index 71482d43ec..71482d43ec 100644
--- a/cpp/sca/doc/RESTExtension.html
+++ b/sca-cpp/trunk/doc/RESTExtension.html
diff --git a/cpp/sca/doc/RubyExtension.html b/sca-cpp/trunk/doc/RubyExtension.html
index 96a4ad2b82..96a4ad2b82 100644
--- a/cpp/sca/doc/RubyExtension.html
+++ b/sca-cpp/trunk/doc/RubyExtension.html
diff --git a/cpp/sca/doc/SCAExtension.html b/sca-cpp/trunk/doc/SCAExtension.html
index 63157dc9bf..63157dc9bf 100644
--- a/cpp/sca/doc/SCAExtension.html
+++ b/sca-cpp/trunk/doc/SCAExtension.html
diff --git a/cpp/sca/doc/css/maven-base.css b/sca-cpp/trunk/doc/css/maven-base.css
index e23caf04e5..e23caf04e5 100644
--- a/cpp/sca/doc/css/maven-base.css
+++ b/sca-cpp/trunk/doc/css/maven-base.css
diff --git a/cpp/sca/doc/css/maven-theme.css b/sca-cpp/trunk/doc/css/maven-theme.css
index 91cf29cda2..91cf29cda2 100644
--- a/cpp/sca/doc/css/maven-theme.css
+++ b/sca-cpp/trunk/doc/css/maven-theme.css
diff --git a/cpp/sca/etc/git-exclude b/sca-cpp/trunk/etc/git-exclude
index d9198b48ce..d9198b48ce 100644
--- a/cpp/sca/etc/git-exclude
+++ b/sca-cpp/trunk/etc/git-exclude
diff --git a/cpp/sca/etc/httpd-ipcrm b/sca-cpp/trunk/etc/httpd-ipcrm
index b457e7385f..b457e7385f 100755
--- a/cpp/sca/etc/httpd-ipcrm
+++ b/sca-cpp/trunk/etc/httpd-ipcrm
diff --git a/cpp/sca/etc/memgrind b/sca-cpp/trunk/etc/memgrind
index 1a220cd5d2..1a220cd5d2 100755
--- a/cpp/sca/etc/memgrind
+++ b/sca-cpp/trunk/etc/memgrind
diff --git a/cpp/sca/etc/svn-config b/sca-cpp/trunk/etc/svn-config
index 4f8cb41685..4f8cb41685 100644
--- a/cpp/sca/etc/svn-config
+++ b/sca-cpp/trunk/etc/svn-config
diff --git a/cpp/sca/etc/svn-ignore b/sca-cpp/trunk/etc/svn-ignore
index cf9bd507e4..cf9bd507e4 100644
--- a/cpp/sca/etc/svn-ignore
+++ b/sca-cpp/trunk/etc/svn-ignore
diff --git a/cpp/sca/kernel/Makefile.am b/sca-cpp/trunk/kernel/Makefile.am
index 0bbfa195c7..0bbfa195c7 100644
--- a/cpp/sca/kernel/Makefile.am
+++ b/sca-cpp/trunk/kernel/Makefile.am
diff --git a/cpp/sca/kernel/element.hpp b/sca-cpp/trunk/kernel/element.hpp
index 2b5336ba5c..2b5336ba5c 100644
--- a/cpp/sca/kernel/element.hpp
+++ b/sca-cpp/trunk/kernel/element.hpp
diff --git a/cpp/sca/kernel/function.hpp b/sca-cpp/trunk/kernel/function.hpp
index c99ee5dbad..c99ee5dbad 100644
--- a/cpp/sca/kernel/function.hpp
+++ b/sca-cpp/trunk/kernel/function.hpp
diff --git a/cpp/sca/kernel/gc.hpp b/sca-cpp/trunk/kernel/gc.hpp
index 7739e714c2..7739e714c2 100644
--- a/cpp/sca/kernel/gc.hpp
+++ b/sca-cpp/trunk/kernel/gc.hpp
diff --git a/cpp/sca/kernel/kernel-test.cpp b/sca-cpp/trunk/kernel/kernel-test.cpp
index 9346e31b71..9346e31b71 100644
--- a/cpp/sca/kernel/kernel-test.cpp
+++ b/sca-cpp/trunk/kernel/kernel-test.cpp
diff --git a/cpp/sca/kernel/list.hpp b/sca-cpp/trunk/kernel/list.hpp
index c21efe173b..c21efe173b 100644
--- a/cpp/sca/kernel/list.hpp
+++ b/sca-cpp/trunk/kernel/list.hpp
diff --git a/cpp/sca/kernel/monad.hpp b/sca-cpp/trunk/kernel/monad.hpp
index 98eb3799c0..98eb3799c0 100644
--- a/cpp/sca/kernel/monad.hpp
+++ b/sca-cpp/trunk/kernel/monad.hpp
diff --git a/cpp/sca/kernel/parallel.hpp b/sca-cpp/trunk/kernel/parallel.hpp
index c2a948bbeb..c2a948bbeb 100644
--- a/cpp/sca/kernel/parallel.hpp
+++ b/sca-cpp/trunk/kernel/parallel.hpp
diff --git a/cpp/sca/kernel/slist.hpp b/sca-cpp/trunk/kernel/slist.hpp
index 705152cb29..705152cb29 100644
--- a/cpp/sca/kernel/slist.hpp
+++ b/sca-cpp/trunk/kernel/slist.hpp
diff --git a/cpp/sca/kernel/value.hpp b/sca-cpp/trunk/kernel/value.hpp
index d602b30623..d602b30623 100644
--- a/cpp/sca/kernel/value.hpp
+++ b/sca-cpp/trunk/kernel/value.hpp
diff --git a/cpp/sca/kernel/xml.hpp b/sca-cpp/trunk/kernel/xml.hpp
index 8d561557ca..8d561557ca 100644
--- a/cpp/sca/kernel/xml.hpp
+++ b/sca-cpp/trunk/kernel/xml.hpp
diff --git a/cpp/sca/kernel/xsd-test.cpp b/sca-cpp/trunk/kernel/xsd-test.cpp
index 818c03ba68..818c03ba68 100644
--- a/cpp/sca/kernel/xsd-test.cpp
+++ b/sca-cpp/trunk/kernel/xsd-test.cpp
diff --git a/cpp/sca/makebindist.sh b/sca-cpp/trunk/makebindist.sh
index 50141f6c59..50141f6c59 100755
--- a/cpp/sca/makebindist.sh
+++ b/sca-cpp/trunk/makebindist.sh
diff --git a/cpp/sca/modules/Makefile.am b/sca-cpp/trunk/modules/Makefile.am
index 89256ae1a0..89256ae1a0 100644
--- a/cpp/sca/modules/Makefile.am
+++ b/sca-cpp/trunk/modules/Makefile.am
diff --git a/cpp/sca/modules/atom/Makefile.am b/sca-cpp/trunk/modules/atom/Makefile.am
index 61998ece8b..61998ece8b 100644
--- a/cpp/sca/modules/atom/Makefile.am
+++ b/sca-cpp/trunk/modules/atom/Makefile.am
diff --git a/cpp/sca/modules/atom/atom-test.cpp b/sca-cpp/trunk/modules/atom/atom-test.cpp
index 7c14b954a0..7c14b954a0 100644
--- a/cpp/sca/modules/atom/atom-test.cpp
+++ b/sca-cpp/trunk/modules/atom/atom-test.cpp
diff --git a/cpp/sca/modules/atom/atom.hpp b/sca-cpp/trunk/modules/atom/atom.hpp
index 5054c635a0..5054c635a0 100644
--- a/cpp/sca/modules/atom/atom.hpp
+++ b/sca-cpp/trunk/modules/atom/atom.hpp
diff --git a/cpp/sca/modules/cache/Makefile.am b/sca-cpp/trunk/modules/cache/Makefile.am
index 0597e91804..0597e91804 100644
--- a/cpp/sca/modules/cache/Makefile.am
+++ b/sca-cpp/trunk/modules/cache/Makefile.am
diff --git a/cpp/sca/modules/cache/cache.hpp b/sca-cpp/trunk/modules/cache/cache.hpp
index ba66021f3d..ba66021f3d 100644
--- a/cpp/sca/modules/cache/cache.hpp
+++ b/sca-cpp/trunk/modules/cache/cache.hpp
diff --git a/cpp/sca/modules/cache/diskcache-test.cpp b/sca-cpp/trunk/modules/cache/diskcache-test.cpp
index 3b21de7b9e..3b21de7b9e 100644
--- a/cpp/sca/modules/cache/diskcache-test.cpp
+++ b/sca-cpp/trunk/modules/cache/diskcache-test.cpp
diff --git a/cpp/sca/modules/cache/diskcached-test b/sca-cpp/trunk/modules/cache/diskcached-test
index 4c10abeceb..4c10abeceb 100755
--- a/cpp/sca/modules/cache/diskcached-test
+++ b/sca-cpp/trunk/modules/cache/diskcached-test
diff --git a/cpp/sca/modules/cache/memcache-test.cpp b/sca-cpp/trunk/modules/cache/memcache-test.cpp
index 3522094126..3522094126 100644
--- a/cpp/sca/modules/cache/memcache-test.cpp
+++ b/sca-cpp/trunk/modules/cache/memcache-test.cpp
diff --git a/cpp/sca/modules/cache/memcached-test b/sca-cpp/trunk/modules/cache/memcached-test
index d0e0dff3de..d0e0dff3de 100755
--- a/cpp/sca/modules/cache/memcached-test
+++ b/sca-cpp/trunk/modules/cache/memcached-test
diff --git a/cpp/sca/modules/cache/memcached.hpp b/sca-cpp/trunk/modules/cache/memcached.hpp
index 28bdc0fc89..28bdc0fc89 100644
--- a/cpp/sca/modules/cache/memcached.hpp
+++ b/sca-cpp/trunk/modules/cache/memcached.hpp
diff --git a/cpp/sca/modules/eval/Makefile.am b/sca-cpp/trunk/modules/eval/Makefile.am
index 68e01d42e2..68e01d42e2 100644
--- a/cpp/sca/modules/eval/Makefile.am
+++ b/sca-cpp/trunk/modules/eval/Makefile.am
diff --git a/cpp/sca/modules/eval/driver.hpp b/sca-cpp/trunk/modules/eval/driver.hpp
index 4c69ecb0a1..4c69ecb0a1 100644
--- a/cpp/sca/modules/eval/driver.hpp
+++ b/sca-cpp/trunk/modules/eval/driver.hpp
diff --git a/cpp/sca/modules/eval/environment.hpp b/sca-cpp/trunk/modules/eval/environment.hpp
index fa9667b1ba..fa9667b1ba 100644
--- a/cpp/sca/modules/eval/environment.hpp
+++ b/sca-cpp/trunk/modules/eval/environment.hpp
diff --git a/cpp/sca/modules/eval/eval-shell.cpp b/sca-cpp/trunk/modules/eval/eval-shell.cpp
index e1c90101da..e1c90101da 100644
--- a/cpp/sca/modules/eval/eval-shell.cpp
+++ b/sca-cpp/trunk/modules/eval/eval-shell.cpp
diff --git a/cpp/sca/modules/eval/eval-test.cpp b/sca-cpp/trunk/modules/eval/eval-test.cpp
index 984b17b26d..984b17b26d 100644
--- a/cpp/sca/modules/eval/eval-test.cpp
+++ b/sca-cpp/trunk/modules/eval/eval-test.cpp
diff --git a/cpp/sca/modules/eval/eval.hpp b/sca-cpp/trunk/modules/eval/eval.hpp
index 8c9ecfdecc..8c9ecfdecc 100644
--- a/cpp/sca/modules/eval/eval.hpp
+++ b/sca-cpp/trunk/modules/eval/eval.hpp
diff --git a/cpp/sca/modules/eval/io.hpp b/sca-cpp/trunk/modules/eval/io.hpp
index a898a11440..a898a11440 100644
--- a/cpp/sca/modules/eval/io.hpp
+++ b/sca-cpp/trunk/modules/eval/io.hpp
diff --git a/cpp/sca/modules/eval/primitive.hpp b/sca-cpp/trunk/modules/eval/primitive.hpp
index bd36c0e226..bd36c0e226 100644
--- a/cpp/sca/modules/eval/primitive.hpp
+++ b/sca-cpp/trunk/modules/eval/primitive.hpp
diff --git a/cpp/sca/modules/eval/tuscany-sca-1.1-implementation-eval.xsd b/sca-cpp/trunk/modules/eval/tuscany-sca-1.1-implementation-eval.xsd
index bbf4935346..bbf4935346 100644
--- a/cpp/sca/modules/eval/tuscany-sca-1.1-implementation-eval.xsd
+++ b/sca-cpp/trunk/modules/eval/tuscany-sca-1.1-implementation-eval.xsd
diff --git a/cpp/sca/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index ba5eadbab4..ba5eadbab4 100644
--- a/cpp/sca/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
diff --git a/cpp/sca/modules/http/conf/mime.types b/sca-cpp/trunk/modules/http/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/cpp/sca/modules/http/conf/mime.types
+++ b/sca-cpp/trunk/modules/http/conf/mime.types
diff --git a/cpp/sca/modules/http/curl-test.cpp b/sca-cpp/trunk/modules/http/curl-test.cpp
index 863aa98828..863aa98828 100644
--- a/cpp/sca/modules/http/curl-test.cpp
+++ b/sca-cpp/trunk/modules/http/curl-test.cpp
diff --git a/cpp/sca/modules/http/curl.hpp b/sca-cpp/trunk/modules/http/curl.hpp
index 5ee3a090b0..5ee3a090b0 100644
--- a/cpp/sca/modules/http/curl.hpp
+++ b/sca-cpp/trunk/modules/http/curl.hpp
diff --git a/cpp/sca/modules/http/htdocs/entry.xml b/sca-cpp/trunk/modules/http/htdocs/entry.xml
index 86b8a10547..86b8a10547 100644
--- a/cpp/sca/modules/http/htdocs/entry.xml
+++ b/sca-cpp/trunk/modules/http/htdocs/entry.xml
diff --git a/cpp/sca/modules/http/htdocs/feed.xml b/sca-cpp/trunk/modules/http/htdocs/feed.xml
index 5e37de6580..5e37de6580 100644
--- a/cpp/sca/modules/http/htdocs/feed.xml
+++ b/sca-cpp/trunk/modules/http/htdocs/feed.xml
diff --git a/cpp/sca/modules/http/htdocs/index.html b/sca-cpp/trunk/modules/http/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/cpp/sca/modules/http/htdocs/index.html
+++ b/sca-cpp/trunk/modules/http/htdocs/index.html
diff --git a/cpp/sca/modules/http/htdocs/json-request.txt b/sca-cpp/trunk/modules/http/htdocs/json-request.txt
index b4bd07fc46..b4bd07fc46 100644
--- a/cpp/sca/modules/http/htdocs/json-request.txt
+++ b/sca-cpp/trunk/modules/http/htdocs/json-request.txt
diff --git a/cpp/sca/modules/http/htdocs/json-result.txt b/sca-cpp/trunk/modules/http/htdocs/json-result.txt
index 121bf74902..121bf74902 100644
--- a/cpp/sca/modules/http/htdocs/json-result.txt
+++ b/sca-cpp/trunk/modules/http/htdocs/json-result.txt
diff --git a/cpp/sca/modules/http/http-test b/sca-cpp/trunk/modules/http/http-test
index d70db8d469..d70db8d469 100755
--- a/cpp/sca/modules/http/http-test
+++ b/sca-cpp/trunk/modules/http/http-test
diff --git a/cpp/sca/modules/http/httpd-client.scm b/sca-cpp/trunk/modules/http/httpd-client.scm
index 12275693f4..12275693f4 100644
--- a/cpp/sca/modules/http/httpd-client.scm
+++ b/sca-cpp/trunk/modules/http/httpd-client.scm
diff --git a/cpp/sca/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index 10a5b47ac2..10a5b47ac2 100755
--- a/cpp/sca/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
diff --git a/cpp/sca/modules/http/httpd-test b/sca-cpp/trunk/modules/http/httpd-test
index 1d9b3cb34d..1d9b3cb34d 100755
--- a/cpp/sca/modules/http/httpd-test
+++ b/sca-cpp/trunk/modules/http/httpd-test
diff --git a/cpp/sca/modules/http/httpd-test.composite b/sca-cpp/trunk/modules/http/httpd-test.composite
index 875d26ae1b..875d26ae1b 100644
--- a/cpp/sca/modules/http/httpd-test.composite
+++ b/sca-cpp/trunk/modules/http/httpd-test.composite
diff --git a/cpp/sca/modules/http/httpd-test.scm b/sca-cpp/trunk/modules/http/httpd-test.scm
index 0566eaf36f..0566eaf36f 100644
--- a/cpp/sca/modules/http/httpd-test.scm
+++ b/sca-cpp/trunk/modules/http/httpd-test.scm
diff --git a/cpp/sca/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp
index 1271afc03c..1271afc03c 100644
--- a/cpp/sca/modules/http/httpd.hpp
+++ b/sca-cpp/trunk/modules/http/httpd.hpp
diff --git a/cpp/sca/modules/http/mod-eval.cpp b/sca-cpp/trunk/modules/http/mod-eval.cpp
index 6fef2be2cb..6fef2be2cb 100644
--- a/cpp/sca/modules/http/mod-eval.cpp
+++ b/sca-cpp/trunk/modules/http/mod-eval.cpp
diff --git a/cpp/sca/modules/http/mod-wiring.cpp b/sca-cpp/trunk/modules/http/mod-wiring.cpp
index 965d5a87fb..965d5a87fb 100644
--- a/cpp/sca/modules/http/mod-wiring.cpp
+++ b/sca-cpp/trunk/modules/http/mod-wiring.cpp
diff --git a/cpp/sca/modules/http/wiring-test b/sca-cpp/trunk/modules/http/wiring-test
index 0c3f36b513..0c3f36b513 100755
--- a/cpp/sca/modules/http/wiring-test
+++ b/sca-cpp/trunk/modules/http/wiring-test
diff --git a/cpp/sca/modules/json/Makefile.am b/sca-cpp/trunk/modules/json/Makefile.am
index ab85d910ad..ab85d910ad 100644
--- a/cpp/sca/modules/json/Makefile.am
+++ b/sca-cpp/trunk/modules/json/Makefile.am
diff --git a/cpp/sca/modules/json/json-test.cpp b/sca-cpp/trunk/modules/json/json-test.cpp
index fd506cea65..fd506cea65 100644
--- a/cpp/sca/modules/json/json-test.cpp
+++ b/sca-cpp/trunk/modules/json/json-test.cpp
diff --git a/cpp/sca/modules/json/json.hpp b/sca-cpp/trunk/modules/json/json.hpp
index f6c8eb5fe8..f6c8eb5fe8 100644
--- a/cpp/sca/modules/json/json.hpp
+++ b/sca-cpp/trunk/modules/json/json.hpp
diff --git a/cpp/sca/modules/scdl/Makefile.am b/sca-cpp/trunk/modules/scdl/Makefile.am
index 55a190579c..55a190579c 100644
--- a/cpp/sca/modules/scdl/Makefile.am
+++ b/sca-cpp/trunk/modules/scdl/Makefile.am
diff --git a/cpp/sca/modules/scdl/scdl-test b/sca-cpp/trunk/modules/scdl/scdl-test
index acef45d225..acef45d225 100755
--- a/cpp/sca/modules/scdl/scdl-test
+++ b/sca-cpp/trunk/modules/scdl/scdl-test
diff --git a/cpp/sca/modules/scdl/scdl-test.cpp b/sca-cpp/trunk/modules/scdl/scdl-test.cpp
index c3da1013a8..c3da1013a8 100644
--- a/cpp/sca/modules/scdl/scdl-test.cpp
+++ b/sca-cpp/trunk/modules/scdl/scdl-test.cpp
diff --git a/cpp/sca/modules/scdl/scdl.hpp b/sca-cpp/trunk/modules/scdl/scdl.hpp
index 4d84610fb0..4d84610fb0 100644
--- a/cpp/sca/modules/scdl/scdl.hpp
+++ b/sca-cpp/trunk/modules/scdl/scdl.hpp
diff --git a/cpp/sca/modules/scdl/test.composite b/sca-cpp/trunk/modules/scdl/test.composite
index b315f23f9a..b315f23f9a 100644
--- a/cpp/sca/modules/scdl/test.composite
+++ b/sca-cpp/trunk/modules/scdl/test.composite
diff --git a/cpp/sca/runtime/Makefile.am b/sca-cpp/trunk/runtime/Makefile.am
index a03650cd83..a03650cd83 100644
--- a/cpp/sca/runtime/Makefile.am
+++ b/sca-cpp/trunk/runtime/Makefile.am
diff --git a/cpp/sca/runtime/core/Makefile.am b/sca-cpp/trunk/runtime/core/Makefile.am
index f833a2cb08..f833a2cb08 100644
--- a/cpp/sca/runtime/core/Makefile.am
+++ b/sca-cpp/trunk/runtime/core/Makefile.am
diff --git a/cpp/sca/runtime/core/src/Makefile.am b/sca-cpp/trunk/runtime/core/src/Makefile.am
index ebba243583..ebba243583 100644
--- a/cpp/sca/runtime/core/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/core/src/Makefile.am
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Exceptions.cpp
index 7fa9c5e6b9..7fa9c5e6b9 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Exceptions.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Exceptions.h
index 50cf91f7d4..50cf91f7d4 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Exceptions.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Operation.cpp
index 335ed5d369..335ed5d369 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Operation.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Operation.h
index 89cf0b63b7..89cf0b63b7 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/Operation.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
index d605f37f95..d605f37f95 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/SCARuntime.h
index ff93bd5005..ff93bd5005 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/SCARuntime.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
index c54d7648e3..c54d7648e3 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceProxy.h
index f1a0309be1..f1a0309be1 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceProxy.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
index 17666a5bb7..17666a5bb7 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
index 6a44c57675..6a44c57675 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/export.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/export.h
index 79b02fe4cf..79b02fe4cf 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/export.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/export.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
index a20cf1f6da..a20cf1f6da 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
index 524af2df77..524af2df77 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
index 584945344b..584945344b 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
index 5329104c77..5329104c77 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
index a7f60dcbec..a7f60dcbec 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
index c3d1e97c9e..c3d1e97c9e 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
index f5fe361d36..f5fe361d36 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
index d2f7e72ed0..d2f7e72ed0 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Binding.cpp
index a654b9f0f7..a654b9f0f7 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Binding.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Binding.h
index 66dc66e853..66dc66e853 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Binding.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Component.cpp
index 37bf381811..37bf381811 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Component.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Component.h
index 882d79a94c..882d79a94c 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Component.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ComponentType.cpp
index 20e70ede20..20e70ede20 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ComponentType.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ComponentType.h
index 86f17890e9..86f17890e9 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ComponentType.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Composite.cpp
index 6456b0cede..6456b0cede 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Composite.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Composite.h
index 40626feb14..40626feb14 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Composite.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
index be0bf71a17..be0bf71a17 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReference.h
index f5e2166e06..f5e2166e06 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReference.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
index 24191285c5..24191285c5 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
index 5c64c3b657..5c64c3b657 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeService.cpp
index e06dc548c1..e06dc548c1 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeService.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeService.h
index 8c626ccac3..8c626ccac3 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/CompositeService.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Contract.cpp
index 99a1d04dc2..99a1d04dc2 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Contract.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Contract.h
index e1d526f842..e1d526f842 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Contract.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Interface.cpp
index f8dd02a74a..f8dd02a74a 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Interface.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Interface.h
index 5ac7736d43..5ac7736d43 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Interface.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
index 549ffcfc7e..549ffcfc7e 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ModelLoader.h
index b3b3ec2df6..b3b3ec2df6 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ModelLoader.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Reference.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Reference.cpp
index 8820379c4e..8820379c4e 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Reference.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Reference.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Reference.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Reference.h
index 33413b488f..33413b488f 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Reference.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Reference.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
index c4e9d875b6..c4e9d875b6 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
index 197d40aabf..197d40aabf 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
index 732a14cace..732a14cace 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceType.h
index 87d38ab330..87d38ab330 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ReferenceType.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Service.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Service.cpp
index 4df1d1efc6..4df1d1efc6 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Service.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Service.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Service.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Service.h
index a1f2c5d672..a1f2c5d672 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Service.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Service.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
index ddc5e6a711..ddc5e6a711 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceBinding.h
index 4e68f492a3..4e68f492a3 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceBinding.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceType.cpp
index 819a832443..819a832443 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceType.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceType.h
index 08a76e3b3f..08a76e3b3f 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/ServiceType.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
index 53971b5a17..53971b5a17 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
index baf14fcd6d..baf14fcd6d 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
index 5fa45a9967..5fa45a9967 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLInterface.h
index b071dd221e..b071dd221e 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLInterface.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLMessagePart.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLMessagePart.cpp
index 957d7ab3c1..957d7ab3c1 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLMessagePart.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLMessagePart.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLMessagePart.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLMessagePart.h
index 2c381011ba..2c381011ba 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLMessagePart.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLMessagePart.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
index a61d122a72..a61d122a72 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLOperation.h
index 48d848170a..48d848170a 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/WSDLOperation.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Wire.cpp
index 03f475af09..03f475af09 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Wire.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Wire.h
index ab136e9109..ab136e9109 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/model/Wire.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
index 48cc0aa1e6..48cc0aa1e6 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
index 80e07d696c..80e07d696c 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/File.cpp
index 507c1b38ea..507c1b38ea 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/File.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/File.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/File.h
index 944a192cf6..944a192cf6 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/File.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/File.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
index 56eb3146dd..56eb3146dd 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/FileLogWriter.h
index 5925fdca85..5925fdca85 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/FileLogWriter.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Library.cpp
index 619205ab7e..619205ab7e 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Library.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Library.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Library.h
index 6b0a17d2b7..6b0a17d2b7 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Library.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Library.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/LogWriter.cpp
index e551d04eda..e551d04eda 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/LogWriter.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/LogWriter.h
index 5a6a5c38f7..5a6a5c38f7 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/LogWriter.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Logger.cpp
index 5745982f42..5745982f42 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Logger.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Logger.h
index eccf3cf02f..eccf3cf02f 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Logger.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Logging.h
index bf1419faa8..bf1419faa8 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Logging.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Mutex.cpp
index 7b62000717..7b62000717 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Mutex.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Mutex.h
index d509ba6d73..d509ba6d73 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Mutex.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Queue.cpp
index c124be572c..c124be572c 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Queue.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Queue.h
index e2ff104631..e2ff104631 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Queue.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
index 513409db6a..513409db6a 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/SDOUtils.h
index 5be65c355a..5be65c355a 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/SDOUtils.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Thread.cpp
index 064a91409b..064a91409b 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Thread.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Thread.h
index 2ca9142994..2ca9142994 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Thread.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
index 07c99b3cb1..07c99b3cb1 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/ThreadLocal.h
index 556055f183..556055f183 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/ThreadLocal.h
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Utils.cpp
index 98a929392d..98a929392d 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Utils.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.h b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Utils.h
index bbe1aa812a..bbe1aa812a 100644
--- a/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.h
+++ b/sca-cpp/trunk/runtime/core/src/tuscany/sca/util/Utils.h
diff --git a/cpp/sca/runtime/core/test/Makefile.am b/sca-cpp/trunk/runtime/core/test/Makefile.am
index de5c2d1b1e..de5c2d1b1e 100644
--- a/cpp/sca/runtime/core/test/Makefile.am
+++ b/sca-cpp/trunk/runtime/core/test/Makefile.am
diff --git a/cpp/sca/runtime/core/test/SCATestMacros.h b/sca-cpp/trunk/runtime/core/test/SCATestMacros.h
index 58c640f8a6..58c640f8a6 100644
--- a/cpp/sca/runtime/core/test/SCATestMacros.h
+++ b/sca-cpp/trunk/runtime/core/test/SCATestMacros.h
diff --git a/cpp/sca/runtime/core/test/main.cpp b/sca-cpp/trunk/runtime/core/test/main.cpp
index 9f9f733b49..9f9f733b49 100644
--- a/cpp/sca/runtime/core/test/main.cpp
+++ b/sca-cpp/trunk/runtime/core/test/main.cpp
diff --git a/cpp/sca/runtime/core/test/sca_test.bat b/sca-cpp/trunk/runtime/core/test/sca_test.bat
index b082dd19ee..b082dd19ee 100755
--- a/cpp/sca/runtime/core/test/sca_test.bat
+++ b/sca-cpp/trunk/runtime/core/test/sca_test.bat
diff --git a/cpp/sca/runtime/core/test/sca_test.sh b/sca-cpp/trunk/runtime/core/test/sca_test.sh
index 99d268af8e..99d268af8e 100755
--- a/cpp/sca/runtime/core/test/sca_test.sh
+++ b/sca-cpp/trunk/runtime/core/test/sca_test.sh
diff --git a/cpp/sca/runtime/core/test/wsdlTests/BaseWsdlTest.cpp b/sca-cpp/trunk/runtime/core/test/wsdlTests/BaseWsdlTest.cpp
index 88563e5dfa..88563e5dfa 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/BaseWsdlTest.cpp
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/BaseWsdlTest.cpp
diff --git a/cpp/sca/runtime/core/test/wsdlTests/BaseWsdlTest.h b/sca-cpp/trunk/runtime/core/test/wsdlTests/BaseWsdlTest.h
index 7a2be5db5f..7a2be5db5f 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/BaseWsdlTest.h
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/BaseWsdlTest.h
diff --git a/cpp/sca/runtime/core/test/wsdlTests/WSDLDefinitionTest.cpp b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLDefinitionTest.cpp
index df5e22bd68..df5e22bd68 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/WSDLDefinitionTest.cpp
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLDefinitionTest.cpp
diff --git a/cpp/sca/runtime/core/test/wsdlTests/WSDLDefinitionTest.h b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLDefinitionTest.h
index fb536b2153..fb536b2153 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/WSDLDefinitionTest.h
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLDefinitionTest.h
diff --git a/cpp/sca/runtime/core/test/wsdlTests/WSDLErrorsTest.cpp b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLErrorsTest.cpp
index 573c88d7ad..573c88d7ad 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/WSDLErrorsTest.cpp
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLErrorsTest.cpp
diff --git a/cpp/sca/runtime/core/test/wsdlTests/WSDLErrorsTest.h b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLErrorsTest.h
index e17d0edd28..e17d0edd28 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/WSDLErrorsTest.h
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/WSDLErrorsTest.h
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdlTests.h b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdlTests.h
index f8d86133c1..f8d86133c1 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdlTests.h
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdlTests.h
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_correct/simple.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_correct/simple.wsdl
index c9fe542dbd..c9fe542dbd 100644
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_correct/simple.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_correct/simple.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_input.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_input.wsdl
index 07423d3556..07423d3556 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_input.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_input.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_output.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_output.wsdl
index 4c295bf0f5..4c295bf0f5 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_output.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_binding_output.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_bindings.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_bindings.wsdl
index 39932da219..39932da219 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_bindings.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_bindings.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_messages.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_messages.wsdl
index e0388f19d6..e0388f19d6 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_messages.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_messages.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_partnames.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_partnames.wsdl
index 6b5b1630e0..6b5b1630e0 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_partnames.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_partnames.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_portTypes.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_portTypes.wsdl
index 1bbe57bbad..1bbe57bbad 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_portTypes.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_portTypes.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_services.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_services.wsdl
index e16d04a5ec..e16d04a5ec 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_services.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_services.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_address.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_address.wsdl
index 01af450396..01af450396 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_address.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_address.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_binding.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_binding.wsdl
index a2dac5e15e..a2dac5e15e 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_binding.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_binding.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_body.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_body.wsdl
index 3918b9e6f1..3918b9e6f1 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_body.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_body.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_operation.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_operation.wsdl
index 542d60b7cb..542d60b7cb 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_operation.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/duplicate_soap_operation.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_binding_for_port.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_binding_for_port.wsdl
index cfcb65f149..cfcb65f149 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_binding_for_port.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_binding_for_port.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_message.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_message.wsdl
index ec2d17204d..ec2d17204d 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_message.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_message.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_part.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_part.wsdl
index 4e927e222f..4e927e222f 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_part.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_part.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_port.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_port.wsdl
index f182c01cb6..f182c01cb6 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_port.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_name_for_port.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_operation.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_operation.wsdl
index f1fd4eba9c..f1fd4eba9c 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_operation.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_operation.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_portType.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_portType.wsdl
index bdfac4d13d..bdfac4d13d 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_portType.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_portType.wsdl
diff --git a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_type_for_part.wsdl b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_type_for_part.wsdl
index 1706ac2f13..1706ac2f13 100755
--- a/cpp/sca/runtime/core/test/wsdlTests/wsdls_erroneous/missing_type_for_part.wsdl
+++ b/sca-cpp/trunk/runtime/core/test/wsdlTests/wsdls_erroneous/missing_type_for_part.wsdl
diff --git a/cpp/sca/runtime/core/xsd/sca-core.xsd b/sca-cpp/trunk/runtime/core/xsd/sca-core.xsd
index d7661e3994..d7661e3994 100644
--- a/cpp/sca/runtime/core/xsd/sca-core.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/sca-core.xsd
diff --git a/cpp/sca/runtime/core/xsd/sca-implementation-composite.xsd b/sca-cpp/trunk/runtime/core/xsd/sca-implementation-composite.xsd
index 4bcc6747ba..4bcc6747ba 100644
--- a/cpp/sca/runtime/core/xsd/sca-implementation-composite.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/sca-implementation-composite.xsd
diff --git a/cpp/sca/runtime/core/xsd/sca-implementation-java.xsd b/sca-cpp/trunk/runtime/core/xsd/sca-implementation-java.xsd
index e20f0a9b50..e20f0a9b50 100644
--- a/cpp/sca/runtime/core/xsd/sca-implementation-java.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/sca-implementation-java.xsd
diff --git a/cpp/sca/runtime/core/xsd/sca-interface-java.xsd b/sca-cpp/trunk/runtime/core/xsd/sca-interface-java.xsd
index a6028c1434..a6028c1434 100644
--- a/cpp/sca/runtime/core/xsd/sca-interface-java.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/sca-interface-java.xsd
diff --git a/cpp/sca/runtime/core/xsd/sca-interface-wsdl.xsd b/sca-cpp/trunk/runtime/core/xsd/sca-interface-wsdl.xsd
index a3de838b7e..a3de838b7e 100644
--- a/cpp/sca/runtime/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/sca-interface-wsdl.xsd
diff --git a/cpp/sca/runtime/core/xsd/sca.xsd b/sca-cpp/trunk/runtime/core/xsd/sca.xsd
index 8853f25c11..8853f25c11 100644
--- a/cpp/sca/runtime/core/xsd/sca.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/sca.xsd
diff --git a/cpp/sca/runtime/core/xsd/tuscany.xsd b/sca-cpp/trunk/runtime/core/xsd/tuscany.xsd
index 8bad940782..8bad940782 100644
--- a/cpp/sca/runtime/core/xsd/tuscany.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/tuscany.xsd
diff --git a/cpp/sca/runtime/core/xsd/wsdl_11.xsd b/sca-cpp/trunk/runtime/core/xsd/wsdl_11.xsd
index 7cfdc5b58b..7cfdc5b58b 100644
--- a/cpp/sca/runtime/core/xsd/wsdl_11.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/wsdl_11.xsd
diff --git a/cpp/sca/runtime/core/xsd/wsdl_11_http.xsd b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_http.xsd
index 7003bf29d8..7003bf29d8 100644
--- a/cpp/sca/runtime/core/xsd/wsdl_11_http.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_http.xsd
diff --git a/cpp/sca/runtime/core/xsd/wsdl_11_mime.xsd b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_mime.xsd
index 46c62c822c..46c62c822c 100644
--- a/cpp/sca/runtime/core/xsd/wsdl_11_mime.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_mime.xsd
diff --git a/cpp/sca/runtime/core/xsd/wsdl_11_soap.xsd b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_soap.xsd
index 800059d6b0..800059d6b0 100644
--- a/cpp/sca/runtime/core/xsd/wsdl_11_soap.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_soap.xsd
diff --git a/cpp/sca/runtime/core/xsd/wsdl_11_soap12.xsd b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_soap12.xsd
index 281f2c0deb..281f2c0deb 100644
--- a/cpp/sca/runtime/core/xsd/wsdl_11_soap12.xsd
+++ b/sca-cpp/trunk/runtime/core/xsd/wsdl_11_soap12.xsd
diff --git a/cpp/sca/runtime/extensions/Makefile.am b/sca-cpp/trunk/runtime/extensions/Makefile.am
index 1cc28fe80e..1cc28fe80e 100644
--- a/cpp/sca/runtime/extensions/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/Makefile.am
diff --git a/cpp/sca/runtime/extensions/cpp/Makefile.am b/sca-cpp/trunk/runtime/extensions/cpp/Makefile.am
index 3ef2b728b3..3ef2b728b3 100644
--- a/cpp/sca/runtime/extensions/cpp/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/cpp/Makefile.am
diff --git a/cpp/sca/runtime/extensions/cpp/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/cpp/src/Makefile.am
index f234261f5b..f234261f5b 100644
--- a/cpp/sca/runtime/extensions/cpp/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
index d686c4c09f..d686c4c09f 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
index 2c305c5161..2c305c5161 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
index d3f06e1b12..d3f06e1b12 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
index a047f82e46..a047f82e46 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
index 6d64a32dd6..6d64a32dd6 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/export.h b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/export.h
index 8a69913be4..8a69913be4 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/export.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/export.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/sca.h b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/sca.h
index 6cce9453d7..6cce9453d7 100644
--- a/cpp/sca/runtime/extensions/cpp/src/osoa/sca/sca.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/sca.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
index 74a30fb772..74a30fb772 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
index d6c872629d..d6c872629d 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
index b5312ab243..b5312ab243 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
index 8eb7b88691..8eb7b88691 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
index 7bb84a7673..7bb84a7673 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
index 04ac9f6970..04ac9f6970 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
index cc45ea9fb8..cc45ea9fb8 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
index 8406e9bc44..8406e9bc44 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
index 1304ab92a0..1304ab92a0 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
index 899deca07a..899deca07a 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
index 3de0cb968c..3de0cb968c 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
index 412c276d8c..412c276d8c 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
index ae8183231e..ae8183231e 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
index ed0bb8b51c..ed0bb8b51c 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
index f8aad90f7a..f8aad90f7a 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
index b4cf31220a..b4cf31220a 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
index 56098ced93..56098ced93 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
index 2dfdac616e..2dfdac616e 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
index 2322d1bdf5..2322d1bdf5 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
index fdbf314d3d..fdbf314d3d 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
index 0c12b7af43..0c12b7af43 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
index 9860f14765..9860f14765 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
index 45afea8375..45afea8375 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
index 13b88a84dd..13b88a84dd 100644
--- a/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/Makefile.am b/sca-cpp/trunk/runtime/extensions/cpp/tools/Makefile.am
index 3a97f02513..3a97f02513 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/Makefile.am
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/META-INF/LICENSE b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/META-INF/LICENSE
index f433b1a53f..f433b1a53f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/META-INF/LICENSE
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/META-INF/LICENSE
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/META-INF/NOTICE b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/META-INF/NOTICE
index 44befbee63..44befbee63 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/META-INF/NOTICE
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/META-INF/NOTICE
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/META-INF/README b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/META-INF/README
index 2831dadd94..2831dadd94 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/META-INF/README
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/META-INF/README
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/Makefile.am
index 59b4d2095f..59b4d2095f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/Makefile.am
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/build.xml b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/build.xml
index 23e825a1b4..23e825a1b4 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/build.xml
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/build.xml
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
index 13c1273983..13c1273983 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
index 48d415dd8e..48d415dd8e 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
index ca7d50ae48..ca7d50ae48 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
index e019873489..e019873489 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
index 11cab070b2..11cab070b2 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
index a26321d2a3..a26321d2a3 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
index e529af0dd0..e529af0dd0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
index 3743a1f1f9..3743a1f1f9 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
index 1f1d2108e5..1f1d2108e5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
index 0d845e1b1e..0d845e1b1e 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
index 5d1fa568d1..5d1fa568d1 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
index 99c4158d1a..99c4158d1a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
index a1accb0fda..a1accb0fda 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
index 3f97eacef2..3f97eacef2 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
index f2a8e56c58..f2a8e56c58 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
index bc14167841..bc14167841 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
index af140f9575..af140f9575 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
index b3c5778b36..b3c5778b36 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
index 715a4dfc6c..715a4dfc6c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
index d10bfb4b1a..d10bfb4b1a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
index 0000086167..0000086167 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
index 182d9d89f2..182d9d89f2 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
index 733b4700e7..733b4700e7 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
index d1a634999c..d1a634999c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
index c2cfd3b399..c2cfd3b399 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
index c325a90b1e..c325a90b1e 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
index cb63dd1f06..cb63dd1f06 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
index 85fac59da8..85fac59da8 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
index c2cfd3b399..c2cfd3b399 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
index 95b70c3017..95b70c3017 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
index 5c5cb78b87..5c5cb78b87 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
index c2cfd3b399..c2cfd3b399 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
index 540873174b..540873174b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
index c4e3b35675..c4e3b35675 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
index 9a5cfd8da5..9a5cfd8da5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
index 48d34f7957..48d34f7957 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
index 928480df1f..928480df1f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
index c2cfd3b399..c2cfd3b399 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
index 8d2f810db0..8d2f810db0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
index c4e3b35675..c4e3b35675 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
index 9a5cfd8da5..9a5cfd8da5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
index 90835ca4af..90835ca4af 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index 785be08b72..785be08b72 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index 04a785cd26..04a785cd26 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
index 3e3c22a07b..3e3c22a07b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
index bbfcf15ed1..bbfcf15ed1 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
index 42cc4e9827..42cc4e9827 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
index 510bf36337..510bf36337 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
index 10c59480a8..10c59480a8 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index ddb463e3d7..ddb463e3d7 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
index 510bf36337..510bf36337 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
index 717ce02ede..717ce02ede 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
index bbda577c28..bbda577c28 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
index 5c5cb78b87..5c5cb78b87 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
index 928480df1f..928480df1f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
index c2cfd3b399..c2cfd3b399 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
index c275383ab4..c275383ab4 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
index c4e3b35675..c4e3b35675 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
index 9a5cfd8da5..9a5cfd8da5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
index 27d28368f5..27d28368f5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
index 32bf7572dc..32bf7572dc 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
index c2cfd3b399..c2cfd3b399 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
index 55f5813303..55f5813303 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
index 14bafd9ce7..14bafd9ce7 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
index 00b163ba76..00b163ba76 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
index b6e5c8a9f0..b6e5c8a9f0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
index 63bae2f75c..63bae2f75c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
index 79bfdbedbb..79bfdbedbb 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
index 277a3afb06..277a3afb06 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
index 09dd09c01c..09dd09c01c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
index bfa203598c..bfa203598c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
index 19056e836d..19056e836d 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
index 9213ec625b..9213ec625b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
index 7b1cad7770..7b1cad7770 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
index 0cb8404ca3..0cb8404ca3 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 85291cd069..85291cd069 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index cb9e4e6e2a..cb9e4e6e2a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index be09a57919..be09a57919 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index f3b2540ba8..f3b2540ba8 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 75f912d3ae..75f912d3ae 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 896a129145..896a129145 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index 6f2c95f45b..6f2c95f45b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 594f404d13..594f404d13 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 57add811a2..57add811a2 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index b85533cfd4..b85533cfd4 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index b0d9424ad4..b0d9424ad4 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 7f38178f9c..7f38178f9c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index e6800aa311..e6800aa311 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index d3fd4fbaf0..d3fd4fbaf0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 95c63da613..95c63da613 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 2bf1b90e87..2bf1b90e87 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index b32cf3863a..b32cf3863a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 82995c96b0..82995c96b0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index b0d9424ad4..b0d9424ad4 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index ac104f9aaf..ac104f9aaf 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index df388bf43d..df388bf43d 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index e6800aa311..e6800aa311 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index d3fd4fbaf0..d3fd4fbaf0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 21d956f547..21d956f547 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index bb92aa0556..bb92aa0556 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index de0f0a0563..de0f0a0563 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index cfc7c4c07a..cfc7c4c07a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 21d956f547..21d956f547 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 210da9a64c..210da9a64c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index f84fcf496b..f84fcf496b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 21d956f547..21d956f547 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index 210da9a64c..210da9a64c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index f84fcf496b..f84fcf496b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index 543b370282..543b370282 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 594f404d13..594f404d13 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 191dd3eed2..191dd3eed2 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index a57f5c4613..a57f5c4613 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index fe996eabdb..fe996eabdb 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 5bbd07a72a..5bbd07a72a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
index cfc7c4c07a..cfc7c4c07a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index ffcc1d0003..ffcc1d0003 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 6e4d0600bd..6e4d0600bd 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 4c3d626bfb..4c3d626bfb 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index a9b56bdb5c..a9b56bdb5c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 2aa9fcbdf2..2aa9fcbdf2 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/lib/readme.txt b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/lib/readme.txt
index d99c666c6a..d99c666c6a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/lib/readme.txt
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/lib/readme.txt
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/scagen.bat b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/scagen.bat
index 8ab5e4abdf..8ab5e4abdf 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/scagen.bat
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/scagen.bat
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/scagen.sh b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/scagen.sh
index c50f28b98f..c50f28b98f 100755
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/scagen.sh
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/scagen.sh
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
index 4ccbe0c750..4ccbe0c750 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
index 669901b4b5..669901b4b5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
index 246a489c9c..246a489c9c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
index 36d0af18b3..36d0af18b3 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
index a2bb4ba858..a2bb4ba858 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
index b6bdf92878..b6bdf92878 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
index 533e1fd14a..533e1fd14a 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
index 225909e1d1..225909e1d1 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
index 317ad2fc44..317ad2fc44 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
index a25610c1f9..a25610c1f9 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
index 6e951f03de..6e951f03de 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
index 2d98e0a836..2d98e0a836 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
index 876d2dc3e0..876d2dc3e0 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
index e51b2d781c..e51b2d781c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
index d7052b7843..d7052b7843 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
index d26c5ec5ae..d26c5ec5ae 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
index c423477193..c423477193 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
index 28974b41a6..28974b41a6 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
index 6c86fa25b5..6c86fa25b5 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
index 3eb8dc7d98..3eb8dc7d98 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
index 9cf7952afa..9cf7952afa 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
index 0756b5fc3b..0756b5fc3b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
index 37c2a1a81c..37c2a1a81c 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
index 1ec393959d..1ec393959d 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
index e7036037c6..e7036037c6 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
index 5631249769..5631249769 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
index 19e983c6b1..19e983c6b1 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
index cedb4bdb54..cedb4bdb54 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
index 956db364a1..956db364a1 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
index dd260c9787..dd260c9787 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
index ea15ca587b..ea15ca587b 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
index 3d9dafa103..3d9dafa103 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
index 2f5edb3a93..2f5edb3a93 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
index f983917e36..f983917e36 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
diff --git a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
index c8157fe2f6..c8157fe2f6 100644
--- a/cpp/sca/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
+++ b/sca-cpp/trunk/runtime/extensions/cpp/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
diff --git a/cpp/sca/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd b/sca-cpp/trunk/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
index ac2004bd73..ac2004bd73 100644
--- a/cpp/sca/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
+++ b/sca-cpp/trunk/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
diff --git a/cpp/sca/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd b/sca-cpp/trunk/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
index a8493fe726..a8493fe726 100644
--- a/cpp/sca/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
+++ b/sca-cpp/trunk/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
diff --git a/cpp/sca/runtime/extensions/php/AUTHORS b/sca-cpp/trunk/runtime/extensions/php/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/runtime/extensions/php/AUTHORS
+++ b/sca-cpp/trunk/runtime/extensions/php/AUTHORS
diff --git a/cpp/sca/runtime/extensions/php/COPYING b/sca-cpp/trunk/runtime/extensions/php/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/cpp/sca/runtime/extensions/php/COPYING
+++ b/sca-cpp/trunk/runtime/extensions/php/COPYING
diff --git a/cpp/sca/runtime/extensions/php/ChangeLog b/sca-cpp/trunk/runtime/extensions/php/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/runtime/extensions/php/ChangeLog
+++ b/sca-cpp/trunk/runtime/extensions/php/ChangeLog
diff --git a/cpp/sca/runtime/extensions/php/INSTALL b/sca-cpp/trunk/runtime/extensions/php/INSTALL
index 059a43057b..059a43057b 100644
--- a/cpp/sca/runtime/extensions/php/INSTALL
+++ b/sca-cpp/trunk/runtime/extensions/php/INSTALL
diff --git a/cpp/sca/runtime/extensions/php/LICENSE b/sca-cpp/trunk/runtime/extensions/php/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/cpp/sca/runtime/extensions/php/LICENSE
+++ b/sca-cpp/trunk/runtime/extensions/php/LICENSE
diff --git a/cpp/sca/runtime/extensions/php/Makefile.am b/sca-cpp/trunk/runtime/extensions/php/Makefile.am
index fb661fec63..fb661fec63 100644
--- a/cpp/sca/runtime/extensions/php/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/php/Makefile.am
diff --git a/cpp/sca/runtime/extensions/php/NEWS b/sca-cpp/trunk/runtime/extensions/php/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/runtime/extensions/php/NEWS
+++ b/sca-cpp/trunk/runtime/extensions/php/NEWS
diff --git a/cpp/sca/runtime/extensions/php/NOTICE b/sca-cpp/trunk/runtime/extensions/php/NOTICE
index b240b0a121..b240b0a121 100644
--- a/cpp/sca/runtime/extensions/php/NOTICE
+++ b/sca-cpp/trunk/runtime/extensions/php/NOTICE
diff --git a/cpp/sca/runtime/extensions/php/README b/sca-cpp/trunk/runtime/extensions/php/README
index ad96622516..ad96622516 100644
--- a/cpp/sca/runtime/extensions/php/README
+++ b/sca-cpp/trunk/runtime/extensions/php/README
diff --git a/cpp/sca/runtime/extensions/php/autogen.sh b/sca-cpp/trunk/runtime/extensions/php/autogen.sh
index af38864985..af38864985 100755
--- a/cpp/sca/runtime/extensions/php/autogen.sh
+++ b/sca-cpp/trunk/runtime/extensions/php/autogen.sh
diff --git a/cpp/sca/runtime/extensions/php/build.sh b/sca-cpp/trunk/runtime/extensions/php/build.sh
index 41e96d0565..41e96d0565 100755
--- a/cpp/sca/runtime/extensions/php/build.sh
+++ b/sca-cpp/trunk/runtime/extensions/php/build.sh
diff --git a/cpp/sca/runtime/extensions/php/configure.ac b/sca-cpp/trunk/runtime/extensions/php/configure.ac
index d68d262b78..d68d262b78 100644
--- a/cpp/sca/runtime/extensions/php/configure.ac
+++ b/sca-cpp/trunk/runtime/extensions/php/configure.ac
diff --git a/cpp/sca/runtime/extensions/php/samples/Makefile.am b/sca-cpp/trunk/runtime/extensions/php/samples/Makefile.am
index 920828ef4f..920828ef4f 100644
--- a/cpp/sca/runtime/extensions/php/samples/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/Makefile.am
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/Makefile.am b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/Makefile.am
index fd34c6442a..fd34c6442a 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/Makefile.am
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/README b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/README
index dbee1f5f85..dbee1f5f85 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/README
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/README
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
index ada4d89a1c..ada4d89a1c 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
index 548f9bdcb8..548f9bdcb8 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
index d4b37ee2b2..d4b37ee2b2 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
index 54ebfdbde4..54ebfdbde4 100755
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
index 5a6c3a199e..5a6c3a199e 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
index f0f35bab56..f0f35bab56 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
index b50b20d9c6..b50b20d9c6 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
index 5a08e5b063..5a08e5b063 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
index f945c6af8c..f945c6af8c 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
index 0a955f36d3..0a955f36d3 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
index 10020c4f03..10020c4f03 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
index ed2e75edc8..ed2e75edc8 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
diff --git a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
index f1a82a70db..f1a82a70db 100644
--- a/cpp/sca/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/trunk/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
diff --git a/cpp/sca/runtime/extensions/php/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/php/src/Makefile.am
index d0b04262f5..d0b04262f5 100644
--- a/cpp/sca/runtime/extensions/php/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/php/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
index 0ffb660139..0ffb660139 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
index 971ed93c86..971ed93c86 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
index 101667302f..101667302f 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
index 604c4ea102..604c4ea102 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
index a07c499dec..a07c499dec 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
index 4279376300..4279376300 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
index 4b66c42a5b..4b66c42a5b 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
index bddb262617..bddb262617 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
index 8c92be0d83..8c92be0d83 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
index be20f34217..be20f34217 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/export.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/export.h
index 11a9519361..11a9519361 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/export.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/export.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
index 63f1672ec5..63f1672ec5 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
index 78e678dff5..78e678dff5 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
index cbea3f2b71..cbea3f2b71 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
index 9a4f658eb0..9a4f658eb0 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
index 919d4c8646..919d4c8646 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
index 45b422da2c..45b422da2c 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
index 4d18424ae2..4d18424ae2 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
index ef3d6b1604..ef3d6b1604 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/php_sca.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
index 8aea8dadb2..8aea8dadb2 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/sca.cpp b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
index 4078226f63..4078226f63 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
diff --git a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/sca.h b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/sca.h
index 5bbc9001dc..5bbc9001dc 100644
--- a/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/sca.h
+++ b/sca-cpp/trunk/runtime/extensions/php/src/tuscany/sca/php/sca.h
diff --git a/cpp/sca/runtime/extensions/php/xsd/sca-implementation-php.xsd b/sca-cpp/trunk/runtime/extensions/php/xsd/sca-implementation-php.xsd
index c40d63799a..c40d63799a 100644
--- a/cpp/sca/runtime/extensions/php/xsd/sca-implementation-php.xsd
+++ b/sca-cpp/trunk/runtime/extensions/php/xsd/sca-implementation-php.xsd
diff --git a/cpp/sca/runtime/extensions/python/Makefile.am b/sca-cpp/trunk/runtime/extensions/python/Makefile.am
index 83e70b4b94..83e70b4b94 100644
--- a/cpp/sca/runtime/extensions/python/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/python/Makefile.am
diff --git a/cpp/sca/runtime/extensions/python/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/python/src/Makefile.am
index 15d75f8c42..15d75f8c42 100644
--- a/cpp/sca/runtime/extensions/python/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/python/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
index 0274ffc774..0274ffc774 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
index 783f37a228..783f37a228 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
index 84cc34c6a4..84cc34c6a4 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
index c94925c3fc..c94925c3fc 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
index 1d5e3b6361..1d5e3b6361 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
index 803d94743d..803d94743d 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
index 9282bb953c..9282bb953c 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
index 64f856f51d..64f856f51d 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
index cb876827bd..cb876827bd 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
index fbf75b3223..fbf75b3223 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/export.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/export.h
index b608a50711..b608a50711 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/export.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/export.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
index 235468eca9..235468eca9 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
index 75b14529bf..75b14529bf 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
index 3c30f363b8..3c30f363b8 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
index cfc2ca8914..cfc2ca8914 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
index 958a3a86ac..958a3a86ac 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
index 65028f4613..65028f4613 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
index 061aeb7515..061aeb7515 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
index 9a803cdced..9a803cdced 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
index dc2c7bfe22..dc2c7bfe22 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
diff --git a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
index 92a224275e..92a224275e 100644
--- a/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
+++ b/sca-cpp/trunk/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
diff --git a/cpp/sca/runtime/extensions/python/xsd/sca-implementation-python.xsd b/sca-cpp/trunk/runtime/extensions/python/xsd/sca-implementation-python.xsd
index 5730e66116..5730e66116 100644
--- a/cpp/sca/runtime/extensions/python/xsd/sca-implementation-python.xsd
+++ b/sca-cpp/trunk/runtime/extensions/python/xsd/sca-implementation-python.xsd
diff --git a/cpp/sca/runtime/extensions/python/xsd/sca-interface-python.xsd b/sca-cpp/trunk/runtime/extensions/python/xsd/sca-interface-python.xsd
index 1ce24b7249..1ce24b7249 100644
--- a/cpp/sca/runtime/extensions/python/xsd/sca-interface-python.xsd
+++ b/sca-cpp/trunk/runtime/extensions/python/xsd/sca-interface-python.xsd
diff --git a/cpp/sca/runtime/extensions/rest/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/Makefile.am
index 742a8152ad..742a8152ad 100644
--- a/cpp/sca/runtime/extensions/rest/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/interface/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/interface/Makefile.am
index f963effea2..f963effea2 100644
--- a/cpp/sca/runtime/extensions/rest/interface/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/interface/src/Makefile.am
index a2b7ac74e4..a2b7ac74e4 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
index c69febf39a..c69febf39a 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
index de61ee5751..de61ee5751 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
index f3636f0d39..f3636f0d39 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
index 34feda2049..34feda2049 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
diff --git a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
index 88aacecc16..88aacecc16 100644
--- a/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
diff --git a/cpp/sca/runtime/extensions/rest/reference/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/reference/Makefile.am
index 2a0247f16f..2a0247f16f 100644
--- a/cpp/sca/runtime/extensions/rest/reference/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/Makefile.am
index f963effea2..f963effea2 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/Makefile.am
index f6e6c28b55..f6e6c28b55 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
index f8eb9ad05c..f8eb9ad05c 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
index ad1d861d95..ad1d861d95 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
index e28e7976e8..e28e7976e8 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
index 42e136a5d4..42e136a5d4 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
index 72701bfa65..72701bfa65 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
index d19bcdacf5..d19bcdacf5 100644
--- a/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/rest/service/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/service/Makefile.am
index 2ecfda6c6c..2ecfda6c6c 100644
--- a/cpp/sca/runtime/extensions/rest/service/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/Makefile.am
index f963effea2..f963effea2 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/Makefile.am
index e5b3ce85bd..e5b3ce85bd 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
index 4a63991515..4a63991515 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
index 18720f42f5..18720f42f5 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
index 0d9e41841b..0d9e41841b 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
index 95affe6202..95affe6202 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
index 387add3f35..387add3f35 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
index 802218a2fe..802218a2fe 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
index 877ee01178..877ee01178 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
index 22fc04c356..22fc04c356 100644
--- a/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/rest/xsd/sca-binding-rest.xsd b/sca-cpp/trunk/runtime/extensions/rest/xsd/sca-binding-rest.xsd
index ace4c54a39..ace4c54a39 100644
--- a/cpp/sca/runtime/extensions/rest/xsd/sca-binding-rest.xsd
+++ b/sca-cpp/trunk/runtime/extensions/rest/xsd/sca-binding-rest.xsd
diff --git a/cpp/sca/runtime/extensions/rest/xsd/sca-interface-rest.xsd b/sca-cpp/trunk/runtime/extensions/rest/xsd/sca-interface-rest.xsd
index 30422ab038..30422ab038 100644
--- a/cpp/sca/runtime/extensions/rest/xsd/sca-interface-rest.xsd
+++ b/sca-cpp/trunk/runtime/extensions/rest/xsd/sca-interface-rest.xsd
diff --git a/cpp/sca/runtime/extensions/ruby/Makefile.am b/sca-cpp/trunk/runtime/extensions/ruby/Makefile.am
index 08ba2f553f..08ba2f553f 100644
--- a/cpp/sca/runtime/extensions/ruby/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ruby/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ruby/extension/Makefile.am b/sca-cpp/trunk/runtime/extensions/ruby/extension/Makefile.am
index 41ce75925b..41ce75925b 100644
--- a/cpp/sca/runtime/extensions/ruby/extension/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ruby/extension/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp b/sca-cpp/trunk/runtime/extensions/ruby/extension/src/Extension.cpp
index 458700e5f1..458700e5f1 100644
--- a/cpp/sca/runtime/extensions/ruby/extension/src/Extension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/extension/src/Extension.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb b/sca-cpp/trunk/runtime/extensions/ruby/extension/src/extconf.rb
index 9c41843d63..9c41843d63 100644
--- a/cpp/sca/runtime/extensions/ruby/extension/src/extconf.rb
+++ b/sca-cpp/trunk/runtime/extensions/ruby/extension/src/extconf.rb
diff --git a/cpp/sca/runtime/extensions/ruby/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/ruby/src/Makefile.am
index d9310440b9..d9310440b9 100644
--- a/cpp/sca/runtime/extensions/ruby/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
index a6b8ee8ffa..a6b8ee8ffa 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
index 5554ac6756..5554ac6756 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
index 2414b66fb1..2414b66fb1 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
index 5789517cfd..5789517cfd 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
index 232431ca1e..232431ca1e 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
index aa416f139a..aa416f139a 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
index 79d9ed2dbe..79d9ed2dbe 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
index d830cd92de..d830cd92de 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
index e6c37cf1da..e6c37cf1da 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
index db6bc07b7e..db6bc07b7e 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
index 2526084a72..2526084a72 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
index 5db72a1ebe..5db72a1ebe 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
index fa30642318..fa30642318 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
index c7bc851635..c7bc851635 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
index 3187c07973..3187c07973 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
index 72d39b5639..72d39b5639 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
index 163f8a9d8b..163f8a9d8b 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
index b772daf712..b772daf712 100644
--- a/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd b/sca-cpp/trunk/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
index 5772019a4f..5772019a4f 100644
--- a/cpp/sca/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
+++ b/sca-cpp/trunk/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
diff --git a/cpp/sca/runtime/extensions/sca/Makefile.am b/sca-cpp/trunk/runtime/extensions/sca/Makefile.am
index 50dfb45557..50dfb45557 100644
--- a/cpp/sca/runtime/extensions/sca/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/sca/Makefile.am
diff --git a/cpp/sca/runtime/extensions/sca/reference/Makefile.am b/sca-cpp/trunk/runtime/extensions/sca/reference/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/cpp/sca/runtime/extensions/sca/reference/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/sca/reference/Makefile.am
diff --git a/cpp/sca/runtime/extensions/sca/reference/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/sca/reference/src/Makefile.am
index d5fdf775ca..d5fdf775ca 100644
--- a/cpp/sca/runtime/extensions/sca/reference/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/sca/reference/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
index 7d70f595cc..7d70f595cc 100644
--- a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
diff --git a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
index 389541061a..389541061a 100644
--- a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
diff --git a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
index 3b5564a765..3b5564a765 100644
--- a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
index d73a10f202..d73a10f202 100644
--- a/cpp/sca/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/sca/service/Makefile.am b/sca-cpp/trunk/runtime/extensions/sca/service/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/cpp/sca/runtime/extensions/sca/service/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/sca/service/Makefile.am
diff --git a/cpp/sca/runtime/extensions/sca/service/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/sca/service/src/Makefile.am
index 1136dba677..1136dba677 100644
--- a/cpp/sca/runtime/extensions/sca/service/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/sca/service/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
index 789d8794df..789d8794df 100644
--- a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
diff --git a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
index 8cde2fbef4..8cde2fbef4 100644
--- a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
diff --git a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
index b8eaaaa1f9..b8eaaaa1f9 100644
--- a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
index f3e699e2ee..f3e699e2ee 100644
--- a/cpp/sca/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/sca/xsd/sca-binding-sca.xsd b/sca-cpp/trunk/runtime/extensions/sca/xsd/sca-binding-sca.xsd
index 6ec18bd992..6ec18bd992 100644
--- a/cpp/sca/runtime/extensions/sca/xsd/sca-binding-sca.xsd
+++ b/sca-cpp/trunk/runtime/extensions/sca/xsd/sca-binding-sca.xsd
diff --git a/cpp/sca/runtime/extensions/ws/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/Makefile.am
index 806786ce04..806786ce04 100644
--- a/cpp/sca/runtime/extensions/ws/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/reference/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/reference/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/cpp/sca/runtime/extensions/ws/reference/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/Makefile.am
index fbf304f8c2..fbf304f8c2 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
index fa55c049b7..fa55c049b7 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
index 397440dd5d..397440dd5d 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
index 53d6075bbd..53d6075bbd 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
index 68dd657657..68dd657657 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
index 4adcd5b4ff..4adcd5b4ff 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
index f7aebbb575..f7aebbb575 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
index d0e708f1a1..d0e708f1a1 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
index 26d8dffc45..26d8dffc45 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
index 3c8c5eb12d..3c8c5eb12d 100644
--- a/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
diff --git a/cpp/sca/runtime/extensions/ws/service/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/service/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/cpp/sca/runtime/extensions/ws/service/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/Makefile.am
index feadf9e317..feadf9e317 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/Makefile.am
index 88f7fc1a9e..88f7fc1a9e 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/Makefile.am
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/axis2.xml b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/axis2.xml
index 641085466e..641085466e 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/axis2.xml
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/axis2.xml
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/deploy.bat b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/deploy.bat
index 6493e1cec9..6493e1cec9 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/deploy.bat
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/deploy.bat
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/deploy.sh b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/deploy.sh
index ffe571b0ee..ffe571b0ee 100755
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/deploy.sh
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/deploy.sh
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/module.xml b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/module.xml
index 97d4d43a86..97d4d43a86 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/module.xml
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/module.xml
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/services.xml b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/services.xml
index 335d4d96be..335d4d96be 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/services.xml
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/services.xml
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
index b6d2ac9225..b6d2ac9225 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
index 0dc8f3358a..0dc8f3358a 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
index 9f1207dce8..9f1207dce8 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
index 09c3862590..09c3862590 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
index 4e8b069010..4e8b069010 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
index 24a7552bc4..24a7552bc4 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
index 712e7d2646..712e7d2646 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
index bea4168984..bea4168984 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
index 4d57514688..4d57514688 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
index e52adf4db0..e52adf4db0 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
index 4f170ebf52..4f170ebf52 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
diff --git a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
index 14f17dbc3c..14f17dbc3c 100644
--- a/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
+++ b/sca-cpp/trunk/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
diff --git a/cpp/sca/runtime/extensions/ws/xsd/sca-binding-webservice.xsd b/sca-cpp/trunk/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
index 680dd809a8..680dd809a8 100644
--- a/cpp/sca/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
+++ b/sca-cpp/trunk/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
diff --git a/cpp/sca/samples/AUTHORS b/sca-cpp/trunk/samples/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/samples/AUTHORS
+++ b/sca-cpp/trunk/samples/AUTHORS
diff --git a/cpp/sca/samples/AlertAggregator/AlertAggregatorSCADiagram.png b/sca-cpp/trunk/samples/AlertAggregator/AlertAggregatorSCADiagram.png
index 4672a5e22e..4672a5e22e 100644
--- a/cpp/sca/samples/AlertAggregator/AlertAggregatorSCADiagram.png
+++ b/sca-cpp/trunk/samples/AlertAggregator/AlertAggregatorSCADiagram.png
diff --git a/cpp/sca/samples/AlertAggregator/Makefile.am b/sca-cpp/trunk/samples/AlertAggregator/Makefile.am
index 0b39db277d..0b39db277d 100644
--- a/cpp/sca/samples/AlertAggregator/Makefile.am
+++ b/sca-cpp/trunk/samples/AlertAggregator/Makefile.am
diff --git a/cpp/sca/samples/AlertAggregator/README b/sca-cpp/trunk/samples/AlertAggregator/README
index e605168052..e605168052 100644
--- a/cpp/sca/samples/AlertAggregator/README
+++ b/sca-cpp/trunk/samples/AlertAggregator/README
diff --git a/cpp/sca/samples/AlertAggregator/README.html b/sca-cpp/trunk/samples/AlertAggregator/README.html
index 69d5434527..69d5434527 100644
--- a/cpp/sca/samples/AlertAggregator/README.html
+++ b/sca-cpp/trunk/samples/AlertAggregator/README.html
diff --git a/cpp/sca/samples/AlertAggregator/config.xml b/sca-cpp/trunk/samples/AlertAggregator/config.xml
index 0b33cb7911..0b33cb7911 100644
--- a/cpp/sca/samples/AlertAggregator/config.xml
+++ b/sca-cpp/trunk/samples/AlertAggregator/config.xml
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/README b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/README
index 207e6394e1..207e6394e1 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/README
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/README
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/conf/httpd.conf b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/conf/httpd.conf
index 92026c9717..92026c9717 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/conf/httpd.conf
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/conf/httpd.conf
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/conf/mime.types b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/conf/mime.types
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/conf/mime.types
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php
index 2b9eb916a0..2b9eb916a0 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd
index 58b9982d38..58b9982d38 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml
index 03901c804c..03901c804c 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/index.html b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/index.html
index 2ecd0434b6..2ecd0434b6 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/index.html
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/index.html
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/pop.png b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/pop.png
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/pop.png
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/rss.png b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/rss.png
index b3c949d224..b3c949d224 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/rss.png
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/rss.png
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/style.css b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/style.css
index cd377e90e5..cd377e90e5 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/htdocs/style.css
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/htdocs/style.css
diff --git a/cpp/sca/samples/AlertAggregator/httpserver.php/startserver.bat b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/startserver.bat
index dab8cd6c61..dab8cd6c61 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver.php/startserver.bat
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver.php/startserver.bat
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/Makefile.am b/sca-cpp/trunk/samples/AlertAggregator/httpserver/Makefile.am
index 5db11696dc..5db11696dc 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/Makefile.am
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/Makefile.am
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/conf/httpd.conf b/sca-cpp/trunk/samples/AlertAggregator/httpserver/conf/httpd.conf
index d243f85fbf..d243f85fbf 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/conf/httpd.conf
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/conf/httpd.conf
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/conf/mime.types b/sca-cpp/trunk/samples/AlertAggregator/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/conf/mime.types
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/conf/mime.types
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/index.html b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/index.html
index 911f66e013..911f66e013 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/index.html
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/index.html
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/pop.png b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/pop.png
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/pop.png
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/rss.png b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/rss.png
index b3c949d224..b3c949d224 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/rss.png
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/rss.png
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/style.css b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/style.css
index cd377e90e5..cd377e90e5 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/htdocs/style.css
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/htdocs/style.css
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/startserver.bat b/sca-cpp/trunk/samples/AlertAggregator/httpserver/startserver.bat
index fa4d66df31..fa4d66df31 100644
--- a/cpp/sca/samples/AlertAggregator/httpserver/startserver.bat
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/startserver.bat
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/startserver.sh b/sca-cpp/trunk/samples/AlertAggregator/httpserver/startserver.sh
index d197b94245..d197b94245 100755
--- a/cpp/sca/samples/AlertAggregator/httpserver/startserver.sh
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/startserver.sh
diff --git a/cpp/sca/samples/AlertAggregator/httpserver/stopserver.sh b/sca-cpp/trunk/samples/AlertAggregator/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/cpp/sca/samples/AlertAggregator/httpserver/stopserver.sh
+++ b/sca-cpp/trunk/samples/AlertAggregator/httpserver/stopserver.sh
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter.app.composite b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter.app.composite
index 4c0d4ccd1a..4c0d4ccd1a 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter.app.composite
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter.app.composite
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py
index d9aab820ac..d9aab820ac 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py
index 2800a940b4..2800a940b4 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/Alerter.xsd b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/Alerter.xsd
index c59460995d..c59460995d 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/Alerter.xsd
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/Alerter.xsd
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/Makefile.am b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/Makefile.am
index 9a0ca276a0..9a0ca276a0 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/Makefile.am
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/Makefile.am
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py
index 0ae115ac2e..0ae115ac2e 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb
index e61046cb84..e61046cb84 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py
index 2e320c0b22..2e320c0b22 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py
diff --git a/cpp/sca/samples/AlertAggregator/sample.alerter/sample.alerter.composite b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/sample.alerter.composite
index 21c4ee1093..21c4ee1093 100644
--- a/cpp/sca/samples/AlertAggregator/sample.alerter/sample.alerter.composite
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.alerter/sample.alerter.composite
diff --git a/cpp/sca/samples/AlertAggregator/sample.display/Alerter.xsd b/sca-cpp/trunk/samples/AlertAggregator/sample.display/Alerter.xsd
index c59460995d..c59460995d 100644
--- a/cpp/sca/samples/AlertAggregator/sample.display/Alerter.xsd
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.display/Alerter.xsd
diff --git a/cpp/sca/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py b/sca-cpp/trunk/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py
index 0122701063..0122701063 100644
--- a/cpp/sca/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py
diff --git a/cpp/sca/samples/AlertAggregator/sample.display/Makefile.am b/sca-cpp/trunk/samples/AlertAggregator/sample.display/Makefile.am
index 6ac781c7df..6ac781c7df 100644
--- a/cpp/sca/samples/AlertAggregator/sample.display/Makefile.am
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.display/Makefile.am
diff --git a/cpp/sca/samples/AlertAggregator/sample.display/sample.display.composite b/sca-cpp/trunk/samples/AlertAggregator/sample.display/sample.display.composite
index 593c53c15f..593c53c15f 100644
--- a/cpp/sca/samples/AlertAggregator/sample.display/sample.display.composite
+++ b/sca-cpp/trunk/samples/AlertAggregator/sample.display/sample.display.composite
diff --git a/cpp/sca/samples/COPYING b/sca-cpp/trunk/samples/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/cpp/sca/samples/COPYING
+++ b/sca-cpp/trunk/samples/COPYING
diff --git a/cpp/sca/samples/ChangeLog b/sca-cpp/trunk/samples/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/samples/ChangeLog
+++ b/sca-cpp/trunk/samples/ChangeLog
diff --git a/cpp/sca/samples/CppBigBank/Makefile.am b/sca-cpp/trunk/samples/CppBigBank/Makefile.am
index 95045e0be6..95045e0be6 100644
--- a/cpp/sca/samples/CppBigBank/Makefile.am
+++ b/sca-cpp/trunk/samples/CppBigBank/Makefile.am
diff --git a/cpp/sca/samples/CppBigBank/README b/sca-cpp/trunk/samples/CppBigBank/README
index 341db17b63..341db17b63 100644
--- a/cpp/sca/samples/CppBigBank/README
+++ b/sca-cpp/trunk/samples/CppBigBank/README
diff --git a/cpp/sca/samples/CppBigBank/README.html b/sca-cpp/trunk/samples/CppBigBank/README.html
index 4720dd7b57..4720dd7b57 100644
--- a/cpp/sca/samples/CppBigBank/README.html
+++ b/sca-cpp/trunk/samples/CppBigBank/README.html
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataService.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataService.h
index 64d093ac6f..64d093ac6f 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataService.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataService.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType
index b1cab9e1f9..b1cab9e1f9 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp
index 2deee17eb2..2deee17eb2 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h
index 9312175540..9312175540 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountService.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountService.h
index 85337d37a9..85337d37a9 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountService.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountService.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountService.wsdl b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountService.wsdl
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType
index b65fa1dc18..b65fa1dc18 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
index e9fcace81f..e9fcace81f 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountServiceImpl.h
index 0c172823fb..0c172823fb 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/AccountServiceImpl.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/Makefile.am b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/Makefile.am
index e9af461312..e9af461312 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/Makefile.am
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteService.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteService.h
index 379af5b425..379af5b425 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteService.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteService.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType
index 6ac2b77255..6ac2b77255 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp
index 8332730d73..8332730d73 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h
index 9b0ac69b0c..9b0ac69b0c 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd
index 5bce3a63dc..5bce3a63dc 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteWebService.h b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteWebService.h
index 5c32ff8eaa..5c32ff8eaa 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteWebService.h
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteWebService.h
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/bigbank.account.composite b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/bigbank.account.composite
index 7173d584d2..7173d584d2 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/bigbank.account.composite
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/runwsserver.bat b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/runwsserver.bat
index c08a8fc5d9..c08a8fc5d9 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.account/runwsserver.bat
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/runwsserver.bat
diff --git a/cpp/sca/samples/CppBigBank/bigbank.account/runwsserver.sh b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/runwsserver.sh
index 047e541360..047e541360 100755
--- a/cpp/sca/samples/CppBigBank/bigbank.account/runwsserver.sh
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.account/runwsserver.sh
diff --git a/cpp/sca/samples/CppBigBank/bigbank.app.composite b/sca-cpp/trunk/samples/CppBigBank/bigbank.app.composite
index 5d68e0ae1a..5d68e0ae1a 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.app.composite
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.app.composite
diff --git a/cpp/sca/samples/CppBigBank/bigbank.client/AccountClient.cpp b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/AccountClient.cpp
index 009c2d0c4d..009c2d0c4d 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.client/AccountClient.cpp
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/AccountClient.cpp
diff --git a/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/Makefile.am
index cfc5e8a661..cfc5e8a661 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/Makefile.am
diff --git a/cpp/sca/samples/CppBigBank/bigbank.client/runclient.bat b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/runclient.bat
index 069463ba2d..069463ba2d 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.client/runclient.bat
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/runclient.bat
diff --git a/cpp/sca/samples/CppBigBank/bigbank.client/runclient.sh b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/runclient.sh
index 1cf924a008..1cf924a008 100755
--- a/cpp/sca/samples/CppBigBank/bigbank.client/runclient.sh
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.client/runclient.sh
diff --git a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl
diff --git a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/Makefile.am b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/Makefile.am
index bdc846e58c..bdc846e58c 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/Makefile.am
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/Makefile.am
diff --git a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/README b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/README
index d02873e860..d02873e860 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/README
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/README
diff --git a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php
index b9f77d3297..b9f77d3297 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php
diff --git a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php
index 32159ddc16..32159ddc16 100644
--- a/cpp/sca/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php
+++ b/sca-cpp/trunk/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php
diff --git a/cpp/sca/samples/CppCalculator/Makefile.am b/sca-cpp/trunk/samples/CppCalculator/Makefile.am
index d9d4b499b7..d9d4b499b7 100644
--- a/cpp/sca/samples/CppCalculator/Makefile.am
+++ b/sca-cpp/trunk/samples/CppCalculator/Makefile.am
diff --git a/cpp/sca/samples/CppCalculator/README b/sca-cpp/trunk/samples/CppCalculator/README
index b9dedd2da3..b9dedd2da3 100644
--- a/cpp/sca/samples/CppCalculator/README
+++ b/sca-cpp/trunk/samples/CppCalculator/README
diff --git a/cpp/sca/samples/CppCalculator/README.html b/sca-cpp/trunk/samples/CppCalculator/README.html
index 264ba3d881..264ba3d881 100644
--- a/cpp/sca/samples/CppCalculator/README.html
+++ b/sca-cpp/trunk/samples/CppCalculator/README.html
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator.app.composite b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.app.composite
index 5753b3c593..5753b3c593 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator.app.composite
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.app.composite
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
index 37e9d40f66..37e9d40f66 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/Makefile.am
index 9782bf5041..9782bf5041 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/Makefile.am
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.bat b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.bat
index 795325ab52..795325ab52 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.bat
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.sh
index feae29d557..feae29d557 100755
--- a/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.sh
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/Calculator.h b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/Calculator.h
index 90e97b5319..90e97b5319 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/Calculator.h
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/Calculator.h
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType
index 72fe9842e8..72fe9842e8 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp
index 01dac77c92..01dac77c92 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/CalculatorImpl.h b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/CalculatorImpl.h
index af8a5eeab1..af8a5eeab1 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/CalculatorImpl.h
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/CalculatorImpl.h
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/Divide.h b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/Divide.h
index 6e171ed733..6e171ed733 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/Divide.h
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/Divide.h
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/DivideImpl.componentType b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/DivideImpl.componentType
index d7369e3ff0..d7369e3ff0 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/DivideImpl.componentType
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/DivideImpl.componentType
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/DivideImpl.cpp b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/DivideImpl.cpp
index f1a927cf4c..f1a927cf4c 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/DivideImpl.cpp
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/DivideImpl.cpp
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/DivideImpl.h b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/DivideImpl.h
index 64045f1899..64045f1899 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/DivideImpl.h
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/DivideImpl.h
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/Makefile.am b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/Makefile.am
index de6dad787d..de6dad787d 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/Makefile.am
diff --git a/cpp/sca/samples/CppCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/sample.calculator.composite
index 6903cf21d8..6903cf21d8 100644
--- a/cpp/sca/samples/CppCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/trunk/samples/CppCalculator/sample.calculator/sample.calculator.composite
diff --git a/cpp/sca/samples/GettingStarted.html b/sca-cpp/trunk/samples/GettingStarted.html
index dcb2cfd19c..dcb2cfd19c 100644
--- a/cpp/sca/samples/GettingStarted.html
+++ b/sca-cpp/trunk/samples/GettingStarted.html
diff --git a/cpp/sca/samples/HttpdBigBank/Makefile.am b/sca-cpp/trunk/samples/HttpdBigBank/Makefile.am
index 7ae86e6d2c..7ae86e6d2c 100644
--- a/cpp/sca/samples/HttpdBigBank/Makefile.am
+++ b/sca-cpp/trunk/samples/HttpdBigBank/Makefile.am
diff --git a/cpp/sca/samples/HttpdBigBank/README b/sca-cpp/trunk/samples/HttpdBigBank/README
index a3442236bd..a3442236bd 100644
--- a/cpp/sca/samples/HttpdBigBank/README
+++ b/sca-cpp/trunk/samples/HttpdBigBank/README
diff --git a/cpp/sca/samples/HttpdBigBank/README.html b/sca-cpp/trunk/samples/HttpdBigBank/README.html
index bfd33ee1cd..bfd33ee1cd 100644
--- a/cpp/sca/samples/HttpdBigBank/README.html
+++ b/sca-cpp/trunk/samples/HttpdBigBank/README.html
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/AccountService.wsdl b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/AccountService.wsdl
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb
index 20af2cfedb..20af2cfedb 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/Makefile.am b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/Makefile.am
index 01c8681555..01c8681555 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/Makefile.am
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb
index 7f8634072c..7f8634072c 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd
index 2f7012b5fb..2f7012b5fb 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.account/bigbank.account.composite b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/bigbank.account.composite
index 208402cdb3..208402cdb3 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.account/bigbank.account.composite
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd
index 8c8ff7c637..8c8ff7c637 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb
index 8ae0e23bab..8ae0e23bab 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/Makefile.am b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/Makefile.am
index 7735720b26..7735720b26 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/Makefile.am
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/Makefile.am
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite
index 30c2802d5b..30c2802d5b 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.app.composite b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.app.composite
index 9507997464..9507997464 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.app.composite
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.app.composite
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb
index 6775b80f7a..6775b80f7a 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/Makefile.am b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/Makefile.am
index b1f1cfff0e..b1f1cfff0e 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/Makefile.am
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/Makefile.am
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite
index f484a2fc7c..f484a2fc7c 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
index 05d0ee2153..05d0ee2153 100644
--- a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
diff --git a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh
index d50e6a4b0a..d50e6a4b0a 100755
--- a/cpp/sca/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh
+++ b/sca-cpp/trunk/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/Makefile.am b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/Makefile.am
index 1195ee1aae..1195ee1aae 100644
--- a/cpp/sca/samples/HttpdBigBank/httpserver/Makefile.am
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/Makefile.am
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/conf/httpd.conf
index e9a438dc85..e9a438dc85 100644
--- a/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/conf/httpd.conf
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/conf/mime.types b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/cpp/sca/samples/HttpdBigBank/httpserver/conf/mime.types
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/conf/mime.types
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/htdocs/index.html b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/cpp/sca/samples/HttpdBigBank/httpserver/htdocs/index.html
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/htdocs/index.html
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/startserver.bat
index fe319248f5..fe319248f5 100644
--- a/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/startserver.bat
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/startserver.sh
index cca8472b75..cca8472b75 100755
--- a/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/startserver.sh
diff --git a/cpp/sca/samples/HttpdBigBank/httpserver/stopserver.sh b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/cpp/sca/samples/HttpdBigBank/httpserver/stopserver.sh
+++ b/sca-cpp/trunk/samples/HttpdBigBank/httpserver/stopserver.sh
diff --git a/cpp/sca/samples/INSTALL b/sca-cpp/trunk/samples/INSTALL
index 3d7155367d..3d7155367d 100644
--- a/cpp/sca/samples/INSTALL
+++ b/sca-cpp/trunk/samples/INSTALL
diff --git a/cpp/sca/samples/LICENSE b/sca-cpp/trunk/samples/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/cpp/sca/samples/LICENSE
+++ b/sca-cpp/trunk/samples/LICENSE
diff --git a/cpp/sca/samples/Makefile.am b/sca-cpp/trunk/samples/Makefile.am
index 0fdf524cc1..0fdf524cc1 100644
--- a/cpp/sca/samples/Makefile.am
+++ b/sca-cpp/trunk/samples/Makefile.am
diff --git a/cpp/sca/samples/NEWS b/sca-cpp/trunk/samples/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/cpp/sca/samples/NEWS
+++ b/sca-cpp/trunk/samples/NEWS
diff --git a/cpp/sca/samples/NOTICE b/sca-cpp/trunk/samples/NOTICE
index 44befbee63..44befbee63 100644
--- a/cpp/sca/samples/NOTICE
+++ b/sca-cpp/trunk/samples/NOTICE
diff --git a/cpp/sca/samples/PHPCalculator/Makefile.am b/sca-cpp/trunk/samples/PHPCalculator/Makefile.am
index 3277f97e6e..3277f97e6e 100644
--- a/cpp/sca/samples/PHPCalculator/Makefile.am
+++ b/sca-cpp/trunk/samples/PHPCalculator/Makefile.am
diff --git a/cpp/sca/samples/PHPCalculator/README b/sca-cpp/trunk/samples/PHPCalculator/README
index d91c958763..d91c958763 100644
--- a/cpp/sca/samples/PHPCalculator/README
+++ b/sca-cpp/trunk/samples/PHPCalculator/README
diff --git a/cpp/sca/samples/PHPCalculator/phpcalculator.png b/sca-cpp/trunk/samples/PHPCalculator/phpcalculator.png
index c251364548..c251364548 100644
--- a/cpp/sca/samples/PHPCalculator/phpcalculator.png
+++ b/sca-cpp/trunk/samples/PHPCalculator/phpcalculator.png
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.app.composite b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.app.composite
index 1450ad687b..1450ad687b 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.app.composite
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.app.composite
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp
index e72b52f87e..e72b52f87e 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php
index 7a512260ae..7a512260ae 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.client/env.sh b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/env.sh
index de34f1b42a..de34f1b42a 100755
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.client/env.sh
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/env.sh
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat
index 0493d7410d..0493d7410d 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh
index 85a472b7fb..85a472b7fb 100755
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.client/runclient_php.bat b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/runclient_php.bat
index 815c4fb58e..815c4fb58e 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.client/runclient_php.bat
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.client/runclient_php.bat
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl
index 4d6904b687..4d6904b687 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php
index 82faf1ef19..82faf1ef19 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat
index a1482be5db..a1482be5db 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Add.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Add.componentType
index aca0b2a6e4..aca0b2a6e4 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Add.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Add.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Add.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Add.h
index 4abfe9af6b..4abfe9af6b 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Add.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Add.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Add.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Add.php
index 4b5747e10f..4b5747e10f 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Add.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Add.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.componentType
index 7767c663bf..7767c663bf 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.h
index 90e97b5319..90e97b5319 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.php
index ce8f7899da..ce8f7899da 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.wsdl
index 331b996ba2..331b996ba2 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Calculator.wsdl
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType
index e2799af955..e2799af955 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp
index 2d880de72d..2d880de72d 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl.h
index af8a5eeab1..af8a5eeab1 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp
index 084e6fbf2f..084e6fbf2f 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h
index 700a060636..700a060636 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp
index 82114b4d6d..82114b4d6d 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h
index 63bae2f75c..63bae2f75c 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp
index 510069c331..510069c331 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h
index 0459e70f33..0459e70f33 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Divide.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Divide.componentType
index 428d19f8bc..428d19f8bc 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Divide.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Divide.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Divide.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Divide.h
index c2ab3b816c..c2ab3b816c 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Divide.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Divide.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Divide.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Divide.php
index c2e9adda70..c2e9adda70 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Divide.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Divide.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl.componentType
index d7369e3ff0..d7369e3ff0 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl.cpp
index 88b9065171..88b9065171 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl.h
index 42cf47b1d4..42cf47b1d4 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp
index e8dbeb2e0d..e8dbeb2e0d 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h
index d66cde1c06..d66cde1c06 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp
index 9c6f2101fe..9c6f2101fe 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h
index 5cd10f5188..5cd10f5188 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Log.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Log.componentType
index 0b4423300d..0b4423300d 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Log.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Log.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Log.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Log.h
index c21da1bddf..c21da1bddf 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Log.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Log.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Log.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Log.php
index 0a955f36d3..0a955f36d3 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Log.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Log.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Makefile.am b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Makefile.am
index 84567a5add..84567a5add 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Makefile.am
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Multiply.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Multiply.componentType
index af1631518a..af1631518a 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Multiply.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Multiply.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Multiply.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Multiply.h
index 94de825f62..94de825f62 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Multiply.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Multiply.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Multiply.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Multiply.php
index 8ffe02675d..8ffe02675d 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Multiply.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Multiply.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Subtract.componentType b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Subtract.componentType
index 35dab8bb9b..35dab8bb9b 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Subtract.componentType
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Subtract.componentType
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Subtract.h b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Subtract.h
index a50b79ccc6..a50b79ccc6 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Subtract.h
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Subtract.h
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/Subtract.php b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Subtract.php
index 8d3a1b3ddf..8d3a1b3ddf 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/Subtract.php
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/Subtract.php
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/runwsserver.sh b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/runwsserver.sh
index 069d734fea..069d734fea 100755
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/runwsserver.sh
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/runwsserver.sh
diff --git a/cpp/sca/samples/PHPCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/sample.calculator.composite
index 09b7070fb8..09b7070fb8 100644
--- a/cpp/sca/samples/PHPCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/trunk/samples/PHPCalculator/sample.calculator/sample.calculator.composite
diff --git a/cpp/sca/samples/PythonCalculator/Makefile.am b/sca-cpp/trunk/samples/PythonCalculator/Makefile.am
index 21952e3df4..21952e3df4 100644
--- a/cpp/sca/samples/PythonCalculator/Makefile.am
+++ b/sca-cpp/trunk/samples/PythonCalculator/Makefile.am
diff --git a/cpp/sca/samples/PythonCalculator/README b/sca-cpp/trunk/samples/PythonCalculator/README
index 670f561dc1..670f561dc1 100644
--- a/cpp/sca/samples/PythonCalculator/README
+++ b/sca-cpp/trunk/samples/PythonCalculator/README
diff --git a/cpp/sca/samples/PythonCalculator/README.html b/sca-cpp/trunk/samples/PythonCalculator/README.html
index 3b9f72864e..3b9f72864e 100644
--- a/cpp/sca/samples/PythonCalculator/README.html
+++ b/sca-cpp/trunk/samples/PythonCalculator/README.html
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.app.composite
index ea4e3e118d..ea4e3e118d 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.app.composite
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/Makefile.am
index df1187aab1..df1187aab1 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/Makefile.am
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator.client/calculator_client.py b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/calculator_client.py
index 58d6f45606..58d6f45606 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator.client/calculator_client.py
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/calculator_client.py
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/runclient.bat
index 206b1e5a59..206b1e5a59 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/runclient.bat
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/runclient.sh
index d500d3d132..d500d3d132 100755
--- a/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator.client/runclient.sh
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/Calculator.wsdl
index 331b996ba2..331b996ba2 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/Calculator.wsdl
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.py b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
index 86dbef9e4d..86dbef9e4d 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator/DivideImpl.py b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/DivideImpl.py
index 3921731de6..3921731de6 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator/DivideImpl.py
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/DivideImpl.py
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/Makefile.am
index ec7cf8a8ad..ec7cf8a8ad 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/Makefile.am
diff --git a/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/sample.calculator.composite
index 7f2221b696..7f2221b696 100644
--- a/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/trunk/samples/PythonCalculator/sample.calculator/sample.calculator.composite
diff --git a/cpp/sca/samples/PythonWeatherForecast/Makefile.am b/sca-cpp/trunk/samples/PythonWeatherForecast/Makefile.am
index 6b2d218134..6b2d218134 100644
--- a/cpp/sca/samples/PythonWeatherForecast/Makefile.am
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/Makefile.am
diff --git a/cpp/sca/samples/PythonWeatherForecast/README b/sca-cpp/trunk/samples/PythonWeatherForecast/README
index c590973f5f..c590973f5f 100644
--- a/cpp/sca/samples/PythonWeatherForecast/README
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/README
diff --git a/cpp/sca/samples/PythonWeatherForecast/README.html b/sca-cpp/trunk/samples/PythonWeatherForecast/README.html
index c52cb6ec86..c52cb6ec86 100644
--- a/cpp/sca/samples/PythonWeatherForecast/README.html
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/README.html
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather.app.composite b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.app.composite
index 522a2fc0c8..522a2fc0c8 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather.app.composite
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.app.composite
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/Makefile.am b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/Makefile.am
index 8c4781759e..8c4781759e 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/Makefile.am
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/Makefile.am
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/runclient.bat b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/runclient.bat
index 93c044ed82..93c044ed82 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/runclient.bat
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/runclient.bat
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/runclient.sh b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/runclient.sh
index e6ec73b209..e6ec73b209 100755
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/runclient.sh
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/runclient.sh
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py
index 5de99fcf8e..5de99fcf8e 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather/Makefile.am b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/Makefile.am
index d0450ef707..d0450ef707 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather/Makefile.am
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/Makefile.am
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl
index ec39e2287a..ec39e2287a 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py
index 6e3775de0b..6e3775de0b 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py
diff --git a/cpp/sca/samples/PythonWeatherForecast/sample.weather/sample.weather.composite b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/sample.weather.composite
index 70e9674d23..70e9674d23 100644
--- a/cpp/sca/samples/PythonWeatherForecast/sample.weather/sample.weather.composite
+++ b/sca-cpp/trunk/samples/PythonWeatherForecast/sample.weather/sample.weather.composite
diff --git a/cpp/sca/samples/README b/sca-cpp/trunk/samples/README
index 3d7155367d..3d7155367d 100644
--- a/cpp/sca/samples/README
+++ b/sca-cpp/trunk/samples/README
diff --git a/cpp/sca/samples/RestCalculator/Makefile.am b/sca-cpp/trunk/samples/RestCalculator/Makefile.am
index e3b215ad90..e3b215ad90 100644
--- a/cpp/sca/samples/RestCalculator/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCalculator/Makefile.am
diff --git a/cpp/sca/samples/RestCalculator/README b/sca-cpp/trunk/samples/RestCalculator/README
index 03c6b6a325..03c6b6a325 100644
--- a/cpp/sca/samples/RestCalculator/README
+++ b/sca-cpp/trunk/samples/RestCalculator/README
diff --git a/cpp/sca/samples/RestCalculator/README.html b/sca-cpp/trunk/samples/RestCalculator/README.html
index 80f7462c8a..80f7462c8a 100644
--- a/cpp/sca/samples/RestCalculator/README.html
+++ b/sca-cpp/trunk/samples/RestCalculator/README.html
diff --git a/cpp/sca/samples/RestCalculator/httpserver/Makefile.am b/sca-cpp/trunk/samples/RestCalculator/httpserver/Makefile.am
index f9412183dc..f9412183dc 100644
--- a/cpp/sca/samples/RestCalculator/httpserver/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/Makefile.am
diff --git a/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf b/sca-cpp/trunk/samples/RestCalculator/httpserver/conf/httpd.conf
index 0303f787e9..0303f787e9 100644
--- a/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/conf/httpd.conf
diff --git a/cpp/sca/samples/RestCalculator/httpserver/conf/mime.types b/sca-cpp/trunk/samples/RestCalculator/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/cpp/sca/samples/RestCalculator/httpserver/conf/mime.types
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/conf/mime.types
diff --git a/cpp/sca/samples/RestCalculator/httpserver/htdocs/index.html b/sca-cpp/trunk/samples/RestCalculator/httpserver/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/cpp/sca/samples/RestCalculator/httpserver/htdocs/index.html
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/htdocs/index.html
diff --git a/cpp/sca/samples/RestCalculator/httpserver/startserver.bat b/sca-cpp/trunk/samples/RestCalculator/httpserver/startserver.bat
index 2fc567a7e6..2fc567a7e6 100644
--- a/cpp/sca/samples/RestCalculator/httpserver/startserver.bat
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/startserver.bat
diff --git a/cpp/sca/samples/RestCalculator/httpserver/startserver.sh b/sca-cpp/trunk/samples/RestCalculator/httpserver/startserver.sh
index e5d3d8f1ce..e5d3d8f1ce 100755
--- a/cpp/sca/samples/RestCalculator/httpserver/startserver.sh
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/startserver.sh
diff --git a/cpp/sca/samples/RestCalculator/httpserver/stopserver.sh b/sca-cpp/trunk/samples/RestCalculator/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/cpp/sca/samples/RestCalculator/httpserver/stopserver.sh
+++ b/sca-cpp/trunk/samples/RestCalculator/httpserver/stopserver.sh
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator.app.composite b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.app.composite
index b7c42f4731..b7c42f4731 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator.app.composite
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.app.composite
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
index 4305c3e185..4305c3e185 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/Makefile.am b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/Makefile.am
index 5eee4677b8..5eee4677b8 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/Makefile.am
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
index fb97ed8b74..fb97ed8b74 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
index 0c6c6c182c..0c6c6c182c 100755
--- a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
index fee8c6e14f..fee8c6e14f 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator/CalculatorImpl.rb b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/CalculatorImpl.rb
index 36ed15ff9b..36ed15ff9b 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator/CalculatorImpl.rb
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/CalculatorImpl.rb
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator/DivideImpl.rb b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/DivideImpl.rb
index c6615bfcfa..c6615bfcfa 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator/DivideImpl.rb
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/DivideImpl.rb
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator/Makefile.am b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/Makefile.am
index b715fe2424..b715fe2424 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/Makefile.am
diff --git a/cpp/sca/samples/RestCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/sample.calculator.composite
index 49fbf17f54..49fbf17f54 100644
--- a/cpp/sca/samples/RestCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/trunk/samples/RestCalculator/sample.calculator/sample.calculator.composite
diff --git a/cpp/sca/samples/RestCustomer/Makefile.am b/sca-cpp/trunk/samples/RestCustomer/Makefile.am
index bf259580ce..bf259580ce 100644
--- a/cpp/sca/samples/RestCustomer/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCustomer/Makefile.am
diff --git a/cpp/sca/samples/RestCustomer/README b/sca-cpp/trunk/samples/RestCustomer/README
index bf2a1c3eb6..bf2a1c3eb6 100644
--- a/cpp/sca/samples/RestCustomer/README
+++ b/sca-cpp/trunk/samples/RestCustomer/README
diff --git a/cpp/sca/samples/RestCustomer/README.html b/sca-cpp/trunk/samples/RestCustomer/README.html
index 7d43177b9a..7d43177b9a 100644
--- a/cpp/sca/samples/RestCustomer/README.html
+++ b/sca-cpp/trunk/samples/RestCustomer/README.html
diff --git a/cpp/sca/samples/RestCustomer/httpserver/Makefile.am b/sca-cpp/trunk/samples/RestCustomer/httpserver/Makefile.am
index af8c0bb550..af8c0bb550 100644
--- a/cpp/sca/samples/RestCustomer/httpserver/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/Makefile.am
diff --git a/cpp/sca/samples/RestCustomer/httpserver/conf/httpd.conf b/sca-cpp/trunk/samples/RestCustomer/httpserver/conf/httpd.conf
index 0303f787e9..0303f787e9 100644
--- a/cpp/sca/samples/RestCustomer/httpserver/conf/httpd.conf
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/conf/httpd.conf
diff --git a/cpp/sca/samples/RestCustomer/httpserver/conf/mime.types b/sca-cpp/trunk/samples/RestCustomer/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/cpp/sca/samples/RestCustomer/httpserver/conf/mime.types
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/conf/mime.types
diff --git a/cpp/sca/samples/RestCustomer/httpserver/htdocs/index.html b/sca-cpp/trunk/samples/RestCustomer/httpserver/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/cpp/sca/samples/RestCustomer/httpserver/htdocs/index.html
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/htdocs/index.html
diff --git a/cpp/sca/samples/RestCustomer/httpserver/startserver.bat b/sca-cpp/trunk/samples/RestCustomer/httpserver/startserver.bat
index a62f4bd510..a62f4bd510 100644
--- a/cpp/sca/samples/RestCustomer/httpserver/startserver.bat
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/startserver.bat
diff --git a/cpp/sca/samples/RestCustomer/httpserver/startserver.sh b/sca-cpp/trunk/samples/RestCustomer/httpserver/startserver.sh
index 0d4561e3d3..0d4561e3d3 100755
--- a/cpp/sca/samples/RestCustomer/httpserver/startserver.sh
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/startserver.sh
diff --git a/cpp/sca/samples/RestCustomer/httpserver/stopserver.sh b/sca-cpp/trunk/samples/RestCustomer/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/cpp/sca/samples/RestCustomer/httpserver/stopserver.sh
+++ b/sca-cpp/trunk/samples/RestCustomer/httpserver/stopserver.sh
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.app.composite b/sca-cpp/trunk/samples/RestCustomer/sample.customer.app.composite
index 65565f1e3c..65565f1e3c 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer.app.composite
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.app.composite
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.restclient/Customer.xsd b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/Customer.xsd
index 1cec1b0ae6..1cec1b0ae6 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer.restclient/Customer.xsd
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/Customer.xsd
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py
index 340da8700d..340da8700d 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.restclient/Makefile.am b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/Makefile.am
index 13c14d07e9..13c14d07e9 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer.restclient/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/Makefile.am
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.restclient/runrestclient.bat b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/runrestclient.bat
index 982b9b5e83..982b9b5e83 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer.restclient/runrestclient.bat
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/runrestclient.bat
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.restclient/runrestclient.sh b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/runrestclient.sh
index 54c068f4e2..54c068f4e2 100755
--- a/cpp/sca/samples/RestCustomer/sample.customer.restclient/runrestclient.sh
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/runrestclient.sh
diff --git a/cpp/sca/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite
index 15072f28f8..15072f28f8 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite
diff --git a/cpp/sca/samples/RestCustomer/sample.customer/2345.xml b/sca-cpp/trunk/samples/RestCustomer/sample.customer/2345.xml
index 48083380ea..48083380ea 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer/2345.xml
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer/2345.xml
diff --git a/cpp/sca/samples/RestCustomer/sample.customer/Customer.xsd b/sca-cpp/trunk/samples/RestCustomer/sample.customer/Customer.xsd
index 1cec1b0ae6..1cec1b0ae6 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer/Customer.xsd
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer/Customer.xsd
diff --git a/cpp/sca/samples/RestCustomer/sample.customer/CustomerResourceImpl.py b/sca-cpp/trunk/samples/RestCustomer/sample.customer/CustomerResourceImpl.py
index 1d6796959e..1d6796959e 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer/CustomerResourceImpl.py
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer/CustomerResourceImpl.py
diff --git a/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am b/sca-cpp/trunk/samples/RestCustomer/sample.customer/Makefile.am
index e48bb502c8..e48bb502c8 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer/Makefile.am
diff --git a/cpp/sca/samples/RestCustomer/sample.customer/sample.customer.composite b/sca-cpp/trunk/samples/RestCustomer/sample.customer/sample.customer.composite
index 1ee3b2d6a2..1ee3b2d6a2 100644
--- a/cpp/sca/samples/RestCustomer/sample.customer/sample.customer.composite
+++ b/sca-cpp/trunk/samples/RestCustomer/sample.customer/sample.customer.composite
diff --git a/cpp/sca/samples/RestYahoo/Makefile.am b/sca-cpp/trunk/samples/RestYahoo/Makefile.am
index de28cf2d53..de28cf2d53 100644
--- a/cpp/sca/samples/RestYahoo/Makefile.am
+++ b/sca-cpp/trunk/samples/RestYahoo/Makefile.am
diff --git a/cpp/sca/samples/RestYahoo/README b/sca-cpp/trunk/samples/RestYahoo/README
index 79ee6c7813..79ee6c7813 100644
--- a/cpp/sca/samples/RestYahoo/README
+++ b/sca-cpp/trunk/samples/RestYahoo/README
diff --git a/cpp/sca/samples/RestYahoo/README.html b/sca-cpp/trunk/samples/RestYahoo/README.html
index 967f2c84b1..967f2c84b1 100644
--- a/cpp/sca/samples/RestYahoo/README.html
+++ b/sca-cpp/trunk/samples/RestYahoo/README.html
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo.app.composite b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.app.composite
index eb19962fe3..eb19962fe3 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo.app.composite
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.app.composite
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo.client/Makefile.am b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/Makefile.am
index 4fcbf00e16..4fcbf00e16 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo.client/Makefile.am
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/Makefile.am
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb
index 0a87ccd815..0a87ccd815 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo.client/runclient.bat b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/runclient.bat
index bf95f27738..bf95f27738 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo.client/runclient.bat
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/runclient.bat
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo.client/runclient.sh b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/runclient.sh
index 7dbae64748..7dbae64748 100755
--- a/cpp/sca/samples/RestYahoo/sample.yahoo.client/runclient.sh
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo.client/runclient.sh
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo/Makefile.am b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/Makefile.am
index 7e330ca7b1..7e330ca7b1 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo/Makefile.am
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/Makefile.am
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py
index 7ba6ab80ef..7ba6ab80ef 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd
index 210aabcf42..210aabcf42 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd
diff --git a/cpp/sca/samples/RestYahoo/sample.yahoo/sample.yahoo.composite b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/sample.yahoo.composite
index a37a9be7c4..a37a9be7c4 100644
--- a/cpp/sca/samples/RestYahoo/sample.yahoo/sample.yahoo.composite
+++ b/sca-cpp/trunk/samples/RestYahoo/sample.yahoo/sample.yahoo.composite
diff --git a/cpp/sca/samples/RubyBigBank/Makefile.am b/sca-cpp/trunk/samples/RubyBigBank/Makefile.am
index ae0b4958f1..ae0b4958f1 100644
--- a/cpp/sca/samples/RubyBigBank/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyBigBank/Makefile.am
diff --git a/cpp/sca/samples/RubyBigBank/README b/sca-cpp/trunk/samples/RubyBigBank/README
index 6b2dba4206..6b2dba4206 100644
--- a/cpp/sca/samples/RubyBigBank/README
+++ b/sca-cpp/trunk/samples/RubyBigBank/README
diff --git a/cpp/sca/samples/RubyBigBank/README.html b/sca-cpp/trunk/samples/RubyBigBank/README.html
index 6eeb377d6f..6eeb377d6f 100644
--- a/cpp/sca/samples/RubyBigBank/README.html
+++ b/sca-cpp/trunk/samples/RubyBigBank/README.html
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb
index 8ae0e23bab..8ae0e23bab 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/AccountService.wsdl b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/AccountService.wsdl
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb
index aab789ca13..aab789ca13 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/Makefile.am b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/Makefile.am
index 6e5ec38414..6e5ec38414 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/Makefile.am
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb
index 7f8634072c..7f8634072c 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd
index 2f7012b5fb..2f7012b5fb 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/bigbank.account.composite b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/bigbank.account.composite
index 8fff8425a1..8fff8425a1 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/bigbank.account.composite
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/runwsserver.bat b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/runwsserver.bat
index 3ab4275436..3ab4275436 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/runwsserver.bat
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/runwsserver.bat
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.account/runwsserver.sh b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/runwsserver.sh
index e3bbca46c6..e3bbca46c6 100755
--- a/cpp/sca/samples/RubyBigBank/bigbank.account/runwsserver.sh
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.account/runwsserver.sh
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.app.composite b/sca-cpp/trunk/samples/RubyBigBank/bigbank.app.composite
index dd94e61e5b..dd94e61e5b 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.app.composite
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.app.composite
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.client/AccountClient.rb b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/AccountClient.rb
index 31c0acc909..31c0acc909 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.client/AccountClient.rb
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/AccountClient.rb
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.client/Makefile.am b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/Makefile.am
index 4e4936746a..4e4936746a 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.client/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/Makefile.am
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/runclient.bat
index 0495237f7f..0495237f7f 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.bat
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/runclient.bat
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/runclient.sh
index 94d5cd6ff8..94d5cd6ff8 100755
--- a/cpp/sca/samples/RubyBigBank/bigbank.client/runclient.sh
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.client/runclient.sh
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb
index 6775b80f7a..6775b80f7a 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/Makefile.am b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/Makefile.am
index 23f8b55959..23f8b55959 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/Makefile.am
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite
index f484a2fc7c..f484a2fc7c 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
index 6e1bb27b4a..6e1bb27b4a 100644
--- a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
diff --git a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
index d50e6a4b0a..d50e6a4b0a 100755
--- a/cpp/sca/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
+++ b/sca-cpp/trunk/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
diff --git a/cpp/sca/samples/RubyCalculator/Makefile.am b/sca-cpp/trunk/samples/RubyCalculator/Makefile.am
index 246ea1852f..246ea1852f 100644
--- a/cpp/sca/samples/RubyCalculator/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyCalculator/Makefile.am
diff --git a/cpp/sca/samples/RubyCalculator/README b/sca-cpp/trunk/samples/RubyCalculator/README
index 670f561dc1..670f561dc1 100644
--- a/cpp/sca/samples/RubyCalculator/README
+++ b/sca-cpp/trunk/samples/RubyCalculator/README
diff --git a/cpp/sca/samples/RubyCalculator/README.html b/sca-cpp/trunk/samples/RubyCalculator/README.html
index bb6fe7e0ea..bb6fe7e0ea 100644
--- a/cpp/sca/samples/RubyCalculator/README.html
+++ b/sca-cpp/trunk/samples/RubyCalculator/README.html
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.app.composite
index ada4d89a1c..ada4d89a1c 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.app.composite
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
index 253928df0c..253928df0c 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/Makefile.am
index 38f61539d3..38f61539d3 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/Makefile.am
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/runclient.bat
index 4a1079986a..4a1079986a 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/runclient.bat
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/runclient.sh
index bc2d6c0904..bc2d6c0904 100755
--- a/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator.client/runclient.sh
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/Calculator.wsdl
index 331b996ba2..331b996ba2 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/Calculator.wsdl
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
index 36ed15ff9b..36ed15ff9b 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator/DivideImpl.rb b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/DivideImpl.rb
index c6615bfcfa..c6615bfcfa 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator/DivideImpl.rb
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/DivideImpl.rb
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/Makefile.am
index 7de5b9fdd3..7de5b9fdd3 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/Makefile.am
diff --git a/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/sample.calculator.composite
index d77ba538fe..d77ba538fe 100644
--- a/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/trunk/samples/RubyCalculator/sample.calculator/sample.calculator.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.demo.app.composite
index 3b8738a843..3b8738a843 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.demo.app.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType b/sca-cpp/trunk/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
index a63e4c37d3..a63e4c37d3 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
diff --git a/cpp/sca/samples/SupplyChain/supplychain.demo/supplychain.demo.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
index 20b0e49ec1..20b0e49ec1 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType b/sca-cpp/trunk/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
index e78e602635..e78e602635 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
diff --git a/cpp/sca/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl b/sca-cpp/trunk/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
index c78357b1a8..c78357b1a8 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
diff --git a/cpp/sca/samples/SupplyChain/supplychain.logging/supplychain.logging.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
index 2b28c8f9e2..2b28c8f9e2 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
index fb0c8a5676..fb0c8a5676 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
index 63530bc0ee..63530bc0ee 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
index 256671f64f..256671f64f 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
index c61657c0a7..c61657c0a7 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturerA.app.composite
index 1963304b83..1963304b83 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturerA.app.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturerB.app.composite
index a2f9141f00..a2f9141f00 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturerB.app.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturerC.app.composite
index a48258b6ca..a48258b6ca 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.manufacturerC.app.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer.app.composite
index 734849de05..734849de05 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer.app.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.retailer/Retailer.wsdl b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
index 39bd1963f2..39bd1963f2 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
diff --git a/cpp/sca/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
index fb381ec9a6..fb381ec9a6 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
diff --git a/cpp/sca/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
index 51a2b96b1b..51a2b96b1b 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
diff --git a/cpp/sca/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
index a007f9957b..a007f9957b 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
diff --git a/cpp/sca/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
index fbc1edb462..fbc1edb462 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
diff --git a/cpp/sca/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
index 7f63d3b571..7f63d3b571 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
diff --git a/cpp/sca/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
index e44b964eb4..e44b964eb4 100644
--- a/cpp/sca/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
+++ b/sca-cpp/trunk/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
diff --git a/cpp/sca/samples/autogen.sh b/sca-cpp/trunk/samples/autogen.sh
index 18277601c8..18277601c8 100755
--- a/cpp/sca/samples/autogen.sh
+++ b/sca-cpp/trunk/samples/autogen.sh
diff --git a/cpp/sca/samples/build.sh b/sca-cpp/trunk/samples/build.sh
index c306d2a20d..c306d2a20d 100755
--- a/cpp/sca/samples/build.sh
+++ b/sca-cpp/trunk/samples/build.sh
diff --git a/cpp/sca/samples/configure.ac b/sca-cpp/trunk/samples/configure.ac
index 41cd6f4dbe..41cd6f4dbe 100644
--- a/cpp/sca/samples/configure.ac
+++ b/sca-cpp/trunk/samples/configure.ac
diff --git a/cpp/sca/samples/runtest.sh b/sca-cpp/trunk/samples/runtest.sh
index 1c016a5287..1c016a5287 100755
--- a/cpp/sca/samples/runtest.sh
+++ b/sca-cpp/trunk/samples/runtest.sh
diff --git a/cpp/sca/samples/scagen.bat b/sca-cpp/trunk/samples/scagen.bat
index 169855a0a9..169855a0a9 100644
--- a/cpp/sca/samples/scagen.bat
+++ b/sca-cpp/trunk/samples/scagen.bat
diff --git a/cpp/sca/test/Makefile.am b/sca-cpp/trunk/test/Makefile.am
index 4a20e27139..4a20e27139 100644
--- a/cpp/sca/test/Makefile.am
+++ b/sca-cpp/trunk/test/Makefile.am
diff --git a/cpp/sca/test/store-function/Makefile.am b/sca-cpp/trunk/test/store-function/Makefile.am
index 8d73bf3bff..8d73bf3bff 100644
--- a/cpp/sca/test/store-function/Makefile.am
+++ b/sca-cpp/trunk/test/store-function/Makefile.am
diff --git a/cpp/sca/test/store-function/cart.hpp b/sca-cpp/trunk/test/store-function/cart.hpp
index 9ed6474985..9ed6474985 100644
--- a/cpp/sca/test/store-function/cart.hpp
+++ b/sca-cpp/trunk/test/store-function/cart.hpp
diff --git a/cpp/sca/test/store-function/catalog.hpp b/sca-cpp/trunk/test/store-function/catalog.hpp
index c49ebc8fa3..c49ebc8fa3 100644
--- a/cpp/sca/test/store-function/catalog.hpp
+++ b/sca-cpp/trunk/test/store-function/catalog.hpp
diff --git a/cpp/sca/test/store-function/catalogs.composite b/sca-cpp/trunk/test/store-function/catalogs.composite
index 1638ed0a05..1638ed0a05 100644
--- a/cpp/sca/test/store-function/catalogs.composite
+++ b/sca-cpp/trunk/test/store-function/catalogs.composite
diff --git a/cpp/sca/test/store-function/currency-composite.hpp b/sca-cpp/trunk/test/store-function/currency-composite.hpp
index ae28471538..ae28471538 100644
--- a/cpp/sca/test/store-function/currency-composite.hpp
+++ b/sca-cpp/trunk/test/store-function/currency-composite.hpp
diff --git a/cpp/sca/test/store-function/currency.composite b/sca-cpp/trunk/test/store-function/currency.composite
index aefd474f1f..aefd474f1f 100644
--- a/cpp/sca/test/store-function/currency.composite
+++ b/sca-cpp/trunk/test/store-function/currency.composite
diff --git a/cpp/sca/test/store-function/currency.hpp b/sca-cpp/trunk/test/store-function/currency.hpp
index 453a5e1e81..453a5e1e81 100644
--- a/cpp/sca/test/store-function/currency.hpp
+++ b/sca-cpp/trunk/test/store-function/currency.hpp
diff --git a/cpp/sca/test/store-function/item.hpp b/sca-cpp/trunk/test/store-function/item.hpp
index fbe29915dc..fbe29915dc 100644
--- a/cpp/sca/test/store-function/item.hpp
+++ b/sca-cpp/trunk/test/store-function/item.hpp
diff --git a/cpp/sca/test/store-function/service.hpp b/sca-cpp/trunk/test/store-function/service.hpp
index b764e87d1a..b764e87d1a 100644
--- a/cpp/sca/test/store-function/service.hpp
+++ b/sca-cpp/trunk/test/store-function/service.hpp
diff --git a/cpp/sca/test/store-function/store-composite.hpp b/sca-cpp/trunk/test/store-function/store-composite.hpp
index 351c905eae..351c905eae 100644
--- a/cpp/sca/test/store-function/store-composite.hpp
+++ b/sca-cpp/trunk/test/store-function/store-composite.hpp
diff --git a/cpp/sca/test/store-function/store-function-test.cpp b/sca-cpp/trunk/test/store-function/store-function-test.cpp
index 8a6a86eb8a..8a6a86eb8a 100644
--- a/cpp/sca/test/store-function/store-function-test.cpp
+++ b/sca-cpp/trunk/test/store-function/store-function-test.cpp
diff --git a/cpp/sca/test/store-function/store-solution.hpp b/sca-cpp/trunk/test/store-function/store-solution.hpp
index e0addcba12..e0addcba12 100644
--- a/cpp/sca/test/store-function/store-solution.hpp
+++ b/sca-cpp/trunk/test/store-function/store-solution.hpp
diff --git a/cpp/sca/test/store-function/store-ui.hpp b/sca-cpp/trunk/test/store-function/store-ui.hpp
index 12b28d6a92..12b28d6a92 100644
--- a/cpp/sca/test/store-function/store-ui.hpp
+++ b/sca-cpp/trunk/test/store-function/store-ui.hpp
diff --git a/cpp/sca/test/store-function/store.composite b/sca-cpp/trunk/test/store-function/store.composite
index 124adff853..124adff853 100644
--- a/cpp/sca/test/store-function/store.composite
+++ b/sca-cpp/trunk/test/store-function/store.composite
diff --git a/cpp/sca/test/store-object/Makefile.am b/sca-cpp/trunk/test/store-object/Makefile.am
index 9e5621c6ca..9e5621c6ca 100644
--- a/cpp/sca/test/store-object/Makefile.am
+++ b/sca-cpp/trunk/test/store-object/Makefile.am
diff --git a/cpp/sca/test/store-object/cart.hpp b/sca-cpp/trunk/test/store-object/cart.hpp
index f35a5c4527..f35a5c4527 100644
--- a/cpp/sca/test/store-object/cart.hpp
+++ b/sca-cpp/trunk/test/store-object/cart.hpp
diff --git a/cpp/sca/test/store-object/catalog.hpp b/sca-cpp/trunk/test/store-object/catalog.hpp
index fab013cf8e..fab013cf8e 100644
--- a/cpp/sca/test/store-object/catalog.hpp
+++ b/sca-cpp/trunk/test/store-object/catalog.hpp
diff --git a/cpp/sca/test/store-object/catalogs.composite b/sca-cpp/trunk/test/store-object/catalogs.composite
index 1638ed0a05..1638ed0a05 100644
--- a/cpp/sca/test/store-object/catalogs.composite
+++ b/sca-cpp/trunk/test/store-object/catalogs.composite
diff --git a/cpp/sca/test/store-object/currency-composite.hpp b/sca-cpp/trunk/test/store-object/currency-composite.hpp
index 94b52b461e..94b52b461e 100644
--- a/cpp/sca/test/store-object/currency-composite.hpp
+++ b/sca-cpp/trunk/test/store-object/currency-composite.hpp
diff --git a/cpp/sca/test/store-object/currency.composite b/sca-cpp/trunk/test/store-object/currency.composite
index aefd474f1f..aefd474f1f 100644
--- a/cpp/sca/test/store-object/currency.composite
+++ b/sca-cpp/trunk/test/store-object/currency.composite
diff --git a/cpp/sca/test/store-object/currency.hpp b/sca-cpp/trunk/test/store-object/currency.hpp
index a8228ea51c..a8228ea51c 100644
--- a/cpp/sca/test/store-object/currency.hpp
+++ b/sca-cpp/trunk/test/store-object/currency.hpp
diff --git a/cpp/sca/test/store-object/item.hpp b/sca-cpp/trunk/test/store-object/item.hpp
index ab8e52769b..ab8e52769b 100644
--- a/cpp/sca/test/store-object/item.hpp
+++ b/sca-cpp/trunk/test/store-object/item.hpp
diff --git a/cpp/sca/test/store-object/store-composite.hpp b/sca-cpp/trunk/test/store-object/store-composite.hpp
index 8cee5a943f..8cee5a943f 100644
--- a/cpp/sca/test/store-object/store-composite.hpp
+++ b/sca-cpp/trunk/test/store-object/store-composite.hpp
diff --git a/cpp/sca/test/store-object/store-object-test.cpp b/sca-cpp/trunk/test/store-object/store-object-test.cpp
index bfbf5459ac..bfbf5459ac 100644
--- a/cpp/sca/test/store-object/store-object-test.cpp
+++ b/sca-cpp/trunk/test/store-object/store-object-test.cpp
diff --git a/cpp/sca/test/store-object/store-solution.hpp b/sca-cpp/trunk/test/store-object/store-solution.hpp
index ecabb18f1c..ecabb18f1c 100644
--- a/cpp/sca/test/store-object/store-solution.hpp
+++ b/sca-cpp/trunk/test/store-object/store-solution.hpp
diff --git a/cpp/sca/test/store-object/store-ui.hpp b/sca-cpp/trunk/test/store-object/store-ui.hpp
index c9d0f4330b..c9d0f4330b 100644
--- a/cpp/sca/test/store-object/store-ui.hpp
+++ b/sca-cpp/trunk/test/store-object/store-ui.hpp
diff --git a/cpp/sca/test/store-object/store.composite b/sca-cpp/trunk/test/store-object/store.composite
index 124adff853..124adff853 100644
--- a/cpp/sca/test/store-object/store.composite
+++ b/sca-cpp/trunk/test/store-object/store.composite
diff --git a/cpp/sca/test/store-script/Makefile.am b/sca-cpp/trunk/test/store-script/Makefile.am
index d5c4a8c0eb..d5c4a8c0eb 100644
--- a/cpp/sca/test/store-script/Makefile.am
+++ b/sca-cpp/trunk/test/store-script/Makefile.am
diff --git a/cpp/sca/test/store-script/currency-converter.scm b/sca-cpp/trunk/test/store-script/currency-converter.scm
index 7f58335951..7f58335951 100644
--- a/cpp/sca/test/store-script/currency-converter.scm
+++ b/sca-cpp/trunk/test/store-script/currency-converter.scm
diff --git a/cpp/sca/test/store-script/currency.composite b/sca-cpp/trunk/test/store-script/currency.composite
index eaea331dbe..eaea331dbe 100644
--- a/cpp/sca/test/store-script/currency.composite
+++ b/sca-cpp/trunk/test/store-script/currency.composite
diff --git a/cpp/sca/test/store-script/fruits-catalog.scm b/sca-cpp/trunk/test/store-script/fruits-catalog.scm
index 390068d71a..390068d71a 100644
--- a/cpp/sca/test/store-script/fruits-catalog.scm
+++ b/sca-cpp/trunk/test/store-script/fruits-catalog.scm
diff --git a/cpp/sca/test/store-script/htdocs/.htaccess b/sca-cpp/trunk/test/store-script/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/cpp/sca/test/store-script/htdocs/.htaccess
+++ b/sca-cpp/trunk/test/store-script/htdocs/.htaccess
diff --git a/cpp/sca/test/store-script/htdocs/store.html b/sca-cpp/trunk/test/store-script/htdocs/store.html
index 4d300f1adb..4d300f1adb 100644
--- a/cpp/sca/test/store-script/htdocs/store.html
+++ b/sca-cpp/trunk/test/store-script/htdocs/store.html
diff --git a/cpp/sca/test/store-script/htdocs/store.js b/sca-cpp/trunk/test/store-script/htdocs/store.js
index 9cb09f4b78..9cb09f4b78 100644
--- a/cpp/sca/test/store-script/htdocs/store.js
+++ b/sca-cpp/trunk/test/store-script/htdocs/store.js
diff --git a/cpp/sca/test/store-script/shopping-cart.scm b/sca-cpp/trunk/test/store-script/shopping-cart.scm
index ebb3504e25..ebb3504e25 100644
--- a/cpp/sca/test/store-script/shopping-cart.scm
+++ b/sca-cpp/trunk/test/store-script/shopping-cart.scm
diff --git a/cpp/sca/test/store-script/store-http-test b/sca-cpp/trunk/test/store-script/store-http-test
index 551731e856..551731e856 100755
--- a/cpp/sca/test/store-script/store-http-test
+++ b/sca-cpp/trunk/test/store-script/store-http-test
diff --git a/cpp/sca/test/store-script/store-script-test.cpp b/sca-cpp/trunk/test/store-script/store-script-test.cpp
index add5cb75e5..add5cb75e5 100644
--- a/cpp/sca/test/store-script/store-script-test.cpp
+++ b/sca-cpp/trunk/test/store-script/store-script-test.cpp
diff --git a/cpp/sca/test/store-script/store-script.scm b/sca-cpp/trunk/test/store-script/store-script.scm
index 30c10d8184..30c10d8184 100644
--- a/cpp/sca/test/store-script/store-script.scm
+++ b/sca-cpp/trunk/test/store-script/store-script.scm
diff --git a/cpp/sca/test/store-script/store.composite b/sca-cpp/trunk/test/store-script/store.composite
index cd34f81840..cd34f81840 100644
--- a/cpp/sca/test/store-script/store.composite
+++ b/sca-cpp/trunk/test/store-script/store.composite
diff --git a/cpp/sca/test/store-script/store.scm b/sca-cpp/trunk/test/store-script/store.scm
index 2434b18b51..2434b18b51 100644
--- a/cpp/sca/test/store-script/store.scm
+++ b/sca-cpp/trunk/test/store-script/store.scm
diff --git a/cpp/sca/tools/Makefile.am b/sca-cpp/trunk/tools/Makefile.am
index de5c2d1b1e..de5c2d1b1e 100644
--- a/cpp/sca/tools/Makefile.am
+++ b/sca-cpp/trunk/tools/Makefile.am
diff --git a/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp b/sca-cpp/trunk/tools/TuscanyDriver/TuscanyServiceLoader.cpp
index 2abdc16c28..2abdc16c28 100644
--- a/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.cpp
+++ b/sca-cpp/trunk/tools/TuscanyDriver/TuscanyServiceLoader.cpp
diff --git a/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.h b/sca-cpp/trunk/tools/TuscanyDriver/TuscanyServiceLoader.h
index de35c38119..de35c38119 100644
--- a/cpp/sca/tools/TuscanyDriver/TuscanyServiceLoader.h
+++ b/sca-cpp/trunk/tools/TuscanyDriver/TuscanyServiceLoader.h
diff --git a/cpp/sca/tools/TuscanyDriver/main.cpp b/sca-cpp/trunk/tools/TuscanyDriver/main.cpp
index 7fdde27177..7fdde27177 100644
--- a/cpp/sca/tools/TuscanyDriver/main.cpp
+++ b/sca-cpp/trunk/tools/TuscanyDriver/main.cpp
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
index e8e8f7625a..e8e8f7625a 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
index 685e89a57e..685e89a57e 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
index 641798b17f..641798b17f 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
index f8d74e9c6e..f8d74e9c6e 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
index f6fc9c53b0..f6fc9c53b0 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
index c43e5814ed..c43e5814ed 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 24e0b5a975..24e0b5a975 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
index ac4b0ec8e6..ac4b0ec8e6 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
diff --git a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
index 16c791e533..16c791e533 100644
--- a/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ b/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
diff --git a/cpp/sca/xsd/sca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd
index de4620f460..de4620f460 100644
--- a/cpp/sca/xsd/sca-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-binding-jca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd
index 7f9baac45c..7f9baac45c 100644
--- a/cpp/sca/xsd/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-binding-jms-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd
index e16039a0cd..e16039a0cd 100644
--- a/cpp/sca/xsd/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-binding-sca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
index 897e869806..897e869806 100644
--- a/cpp/sca/xsd/sca-binding-sca-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-binding-ws-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
index 24198c943d..24198c943d 100644
--- a/cpp/sca/xsd/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-binding-ws-callback-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd
index 4bc2e73d4c..4bc2e73d4c 100644
--- a/cpp/sca/xsd/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-contribution-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd
index f13fbd1567..f13fbd1567 100644
--- a/cpp/sca/xsd/sca-contribution-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-contribution-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd
index 7e2cd739fd..7e2cd739fd 100644
--- a/cpp/sca/xsd/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-contribution-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd
index b808125568..b808125568 100644
--- a/cpp/sca/xsd/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-contribution-java-1.1-cd02.xsd b/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd
index 1dcd515c98..1dcd515c98 100644
--- a/cpp/sca/xsd/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd
diff --git a/cpp/sca/xsd/sca-core-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
index 654d568bab..654d568bab 100644
--- a/cpp/sca/xsd/sca-core-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-definitions-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
index 2034e4d2c8..2034e4d2c8 100644
--- a/cpp/sca/xsd/sca-definitions-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-implementation-bpel-1.1-cd03.xsd b/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd
index 11239e20d0..11239e20d0 100644
--- a/cpp/sca/xsd/sca-implementation-bpel-1.1-cd03.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd
diff --git a/cpp/sca/xsd/sca-implementation-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd
index 011c7a61ea..011c7a61ea 100644
--- a/cpp/sca/xsd/sca-implementation-c-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-implementation-composite-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
index e0524ee006..e0524ee006 100644
--- a/cpp/sca/xsd/sca-implementation-composite-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-implementation-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
index 777da1e8ab..777da1e8ab 100644
--- a/cpp/sca/xsd/sca-implementation-cpp-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-implementation-java-1.1-cd03.xsd b/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
index 53f6a0a51a..53f6a0a51a 100644
--- a/cpp/sca/xsd/sca-implementation-java-1.1-cd03.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
diff --git a/cpp/sca/xsd/sca-implementation-spring-1.1-cd01.xsd b/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd
index 51327ec84e..51327ec84e 100644
--- a/cpp/sca/xsd/sca-implementation-spring-1.1-cd01.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd
diff --git a/cpp/sca/xsd/sca-interface-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd
index 045118cb43..045118cb43 100644
--- a/cpp/sca/xsd/sca-interface-c-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-interface-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
index 536b592c04..536b592c04 100644
--- a/cpp/sca/xsd/sca-interface-cpp-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-interface-java-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
index faf6d1cfb1..faf6d1cfb1 100644
--- a/cpp/sca/xsd/sca-interface-java-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-interface-wsdl-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
index 980e4f90f5..980e4f90f5 100644
--- a/cpp/sca/xsd/sca-interface-wsdl-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-jee-1.1-wd03.xsd b/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd
index 6df685b881..6df685b881 100644
--- a/cpp/sca/xsd/sca-jee-1.1-wd03.xsd
+++ b/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd
diff --git a/cpp/sca/xsd/sca-policy-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
index a6cdfb2be5..a6cdfb2be5 100644
--- a/cpp/sca/xsd/sca-policy-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
diff --git a/cpp/sca/xsd/sca-policy-1.1-intents-definitions-cd02.xml b/sca-cpp/trunk/xsd/sca-policy-1.1-intents-definitions-cd02.xml
index 8efde2653f..8efde2653f 100644
--- a/cpp/sca/xsd/sca-policy-1.1-intents-definitions-cd02.xml
+++ b/sca-cpp/trunk/xsd/sca-policy-1.1-intents-definitions-cd02.xml
diff --git a/cpp/sca/xsd/tuscany-sca-1.1-binding-dwr.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
index de7bc6bdd0..de7bc6bdd0 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
diff --git a/cpp/sca/xsd/tuscany-sca-1.1-binding-http.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
index ce8d47b575..ce8d47b575 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
diff --git a/cpp/sca/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
index 92142d117d..92142d117d 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
diff --git a/cpp/sca/xsd/tuscany-sca-1.1-binding-rmi.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
index 9b15010624..9b15010624 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
diff --git a/cpp/sca/xsd/tuscany-sca-1.1-implementation-osgi.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd
index dfe819d97f..dfe819d97f 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd
diff --git a/cpp/sca/xsd/tuscany-sca-1.1-implementation-widget.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd
index 8e65b402d7..8e65b402d7 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1-implementation-widget.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd
diff --git a/cpp/sca/xsd/tuscany-sca-1.1.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd
index fb0a0cf9d5..fb0a0cf9d5 100644
--- a/cpp/sca/xsd/tuscany-sca-1.1.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd