1087 files changed, 0 insertions, 0 deletions

diff --git a/tags/native-sca-1.0.incubating-M3/AUTHORS b/sca-cpp/tags/native-sca-1.0.incubating-M3/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/AUTHORS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/AUTHORS
diff --git a/tags/native-sca-1.0.incubating-M3/COPYING b/sca-cpp/tags/native-sca-1.0.incubating-M3/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/native-sca-1.0.incubating-M3/COPYING
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/COPYING
diff --git a/tags/native-sca-1.0.incubating-M3/ChangeLog b/sca-cpp/tags/native-sca-1.0.incubating-M3/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/ChangeLog
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/ChangeLog
diff --git a/tags/native-sca-1.0.incubating-M3/GettingStarted.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/GettingStarted.html
index d0f3f2b50b..d0f3f2b50b 100644
--- a/tags/native-sca-1.0.incubating-M3/GettingStarted.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/GettingStarted.html
diff --git a/tags/native-sca-1.0.incubating-M3/INSTALL b/sca-cpp/tags/native-sca-1.0.incubating-M3/INSTALL
index 9b027cad1f..9b027cad1f 100644
--- a/tags/native-sca-1.0.incubating-M3/INSTALL
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/INSTALL
diff --git a/tags/native-sca-1.0.incubating-M3/LICENSE b/sca-cpp/tags/native-sca-1.0.incubating-M3/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/native-sca-1.0.incubating-M3/LICENSE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/LICENSE
diff --git a/tags/native-sca-1.0.incubating-M3/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/Makefile.am
index f0af655186..f0af655186 100644
--- a/tags/native-sca-1.0.incubating-M3/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/NEWS b/sca-cpp/tags/native-sca-1.0.incubating-M3/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/NEWS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/NEWS
diff --git a/tags/native-sca-1.0.incubating-M3/NOTICE b/sca-cpp/tags/native-sca-1.0.incubating-M3/NOTICE
index 44befbee63..44befbee63 100644
--- a/tags/native-sca-1.0.incubating-M3/NOTICE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/NOTICE
diff --git a/tags/native-sca-1.0.incubating-M3/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/README
index f17e5a86bb..f17e5a86bb 100644
--- a/tags/native-sca-1.0.incubating-M3/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/README
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/Build/Build.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/Build/Build.vcproj
index 24bffc9c29..24bffc9c29 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/Build/Build.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/Build/Build.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca.sln b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca.sln
index ed4eb80e88..ed4eb80e88 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca.sln
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca.sln
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca/tuscany_sca.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
index 06bbf55616..06bbf55616 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj
index df034780b6..df034780b6 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
index 740eea1a7c..740eea1a7c 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python_sca_module/tuscany_sca_python_sca_module.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python_sca_module/tuscany_sca_python_sca_module.vcproj
index 0fe0ac8bc8..0fe0ac8bc8 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python_sca_module/tuscany_sca_python_sca_module.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_python_sca_module/tuscany_sca_python_sca_module.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_interface/tuscany_sca_rest_interface.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_interface/tuscany_sca_rest_interface.vcproj
index fb8aacd93e..fb8aacd93e 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_interface/tuscany_sca_rest_interface.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_interface/tuscany_sca_rest_interface.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj
index f3b9be030c..f3b9be030c 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj
index 13f84c2d26..13f84c2d26 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj
index 57bfd7c596..57bfd7c596 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
index c3eca54a49..c3eca54a49 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj
index 57cd4ee20d..57cd4ee20d 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ruby_lang/tuscany_sca_ruby_lang.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_reference/tuscany_sca_scabinding_reference.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_reference/tuscany_sca_scabinding_reference.vcproj
index f04431ac62..f04431ac62 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_reference/tuscany_sca_scabinding_reference.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_reference/tuscany_sca_scabinding_reference.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_service/tuscany_sca_scabinding_service.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_service/tuscany_sca_scabinding_service.vcproj
index 3f03620cd7..3f03620cd7 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_service/tuscany_sca_scabinding_service.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_scabinding_service/tuscany_sca_scabinding_service.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
index 682155037c..682155037c 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj
index 199824f3bb..199824f3bb 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
index 5b206dd725..5b206dd725 100644
--- a/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/VSExpress/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/autogen.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/autogen.sh
index af38864985..af38864985 100755
--- a/tags/native-sca-1.0.incubating-M3/autogen.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/autogen.sh
diff --git a/tags/native-sca-1.0.incubating-M3/build.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/build.bat
index 205be00a16..205be00a16 100644
--- a/tags/native-sca-1.0.incubating-M3/build.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/build.bat
diff --git a/tags/native-sca-1.0.incubating-M3/build.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/build.sh
index 1ada1a7330..1ada1a7330 100755
--- a/tags/native-sca-1.0.incubating-M3/build.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/build.sh
diff --git a/tags/native-sca-1.0.incubating-M3/build_scanative.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/build_scanative.sh
index 3197e74884..3197e74884 100755
--- a/tags/native-sca-1.0.incubating-M3/build_scanative.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/build_scanative.sh
diff --git a/tags/native-sca-1.0.incubating-M3/builddist.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/builddist.bat
index cfa218f940..cfa218f940 100644
--- a/tags/native-sca-1.0.incubating-M3/builddist.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/builddist.bat
diff --git a/tags/native-sca-1.0.incubating-M3/builddist.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/builddist.sh
index 54b056c835..54b056c835 100755
--- a/tags/native-sca-1.0.incubating-M3/builddist.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/builddist.sh
diff --git a/tags/native-sca-1.0.incubating-M3/configure.ac b/sca-cpp/tags/native-sca-1.0.incubating-M3/configure.ac
index c1b2992065..c1b2992065 100644
--- a/tags/native-sca-1.0.incubating-M3/configure.ac
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/configure.ac
diff --git a/tags/native-sca-1.0.incubating-M3/doc/Axis2CWSExtension.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Axis2CWSExtension.html
index 17b9676650..17b9676650 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/Axis2CWSExtension.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Axis2CWSExtension.html
diff --git a/tags/native-sca-1.0.incubating-M3/doc/CPPGeneratorTool.txt b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/CPPGeneratorTool.txt
index c004799791..c004799791 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/CPPGeneratorTool.txt
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/CPPGeneratorTool.txt
diff --git a/tags/native-sca-1.0.incubating-M3/doc/CppExtension.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/CppExtension.html
index 4de7cf7d70..4de7cf7d70 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/CppExtension.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/CppExtension.html
diff --git a/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.in b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.in
index 8127448fd6..8127448fd6 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.in
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.in
diff --git a/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.w32 b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.w32
index e97d3602db..e97d3602db 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.w32
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Doxyfile.w32
diff --git a/tags/native-sca-1.0.incubating-M3/doc/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Makefile.am
index fdf2de8c58..fdf2de8c58 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/doc/PythonExtension.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/PythonExtension.html
index f51af0d6c9..f51af0d6c9 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/PythonExtension.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/PythonExtension.html
diff --git a/tags/native-sca-1.0.incubating-M3/doc/RESTExtension.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/RESTExtension.html
index 71482d43ec..71482d43ec 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/RESTExtension.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/RESTExtension.html
diff --git a/tags/native-sca-1.0.incubating-M3/doc/RubyExtension.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/RubyExtension.html
index 96a4ad2b82..96a4ad2b82 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/RubyExtension.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/RubyExtension.html
diff --git a/tags/native-sca-1.0.incubating-M3/doc/SCAExtension.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/SCAExtension.html
index 63157dc9bf..63157dc9bf 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/SCAExtension.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/SCAExtension.html
diff --git a/tags/native-sca-1.0.incubating-M3/doc/css/maven-base.css b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/css/maven-base.css
index e23caf04e5..e23caf04e5 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/css/maven-base.css
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/css/maven-base.css
diff --git a/tags/native-sca-1.0.incubating-M3/doc/css/maven-theme.css b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/css/maven-theme.css
index 91cf29cda2..91cf29cda2 100644
--- a/tags/native-sca-1.0.incubating-M3/doc/css/maven-theme.css
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/doc/css/maven-theme.css
diff --git a/tags/native-sca-1.0.incubating-M3/makebindist.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/makebindist.sh
index 37144f4f80..37144f4f80 100755
--- a/tags/native-sca-1.0.incubating-M3/makebindist.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/makebindist.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am
index 8b13058152..8b13058152 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat
index 178ffb7b39..178ffb7b39 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am
index afc25ae349..afc25ae349 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp
index a75da50c22..a75da50c22 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h
index 3b5b048736..3b5b048736 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp
index 335ed5d369..335ed5d369 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h
index 89cf0b63b7..89cf0b63b7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
index b518eff673..b518eff673 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h
index ff93bd5005..ff93bd5005 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
index c54d7648e3..c54d7648e3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h
index f1a0309be1..f1a0309be1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
index 17666a5bb7..17666a5bb7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
index 6a44c57675..6a44c57675 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h
index 79b02fe4cf..79b02fe4cf 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
index a20cf1f6da..a20cf1f6da 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
index 524af2df77..524af2df77 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
index 584945344b..584945344b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
index 5329104c77..5329104c77 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
index a7f60dcbec..a7f60dcbec 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
index c3d1e97c9e..c3d1e97c9e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
index f5fe361d36..f5fe361d36 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
index d2f7e72ed0..d2f7e72ed0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp
index a654b9f0f7..a654b9f0f7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h
index 66dc66e853..66dc66e853 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp
index 11429193be..11429193be 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h
index 882d79a94c..882d79a94c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp
index 306455840c..306455840c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h
index 86f17890e9..86f17890e9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp
index 7fcddd812a..7fcddd812a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h
index 5198e68f6d..5198e68f6d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
index be0bf71a17..be0bf71a17 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h
index f5e2166e06..f5e2166e06 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
index 7f24328cf5..7f24328cf5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
index b9daa534c2..b9daa534c2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp
index e06dc548c1..e06dc548c1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h
index 8c626ccac3..8c626ccac3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp
index 99a1d04dc2..99a1d04dc2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h
index e1d526f842..e1d526f842 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp
index f8dd02a74a..f8dd02a74a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h
index 5ac7736d43..5ac7736d43 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
index d22427c4d4..d22427c4d4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h
index 68893e7ba3..68893e7ba3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp
index 8820379c4e..8820379c4e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h
index 33413b488f..33413b488f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
index 1f74dfbbb3..1f74dfbbb3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
index 4563f0a736..4563f0a736 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
index 732a14cace..732a14cace 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h
index 87d38ab330..87d38ab330 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp
index 4df1d1efc6..4df1d1efc6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h
index a1f2c5d672..a1f2c5d672 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
index ddc5e6a711..ddc5e6a711 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h
index 4e68f492a3..4e68f492a3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp
index 819a832443..819a832443 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h
index 08a76e3b3f..08a76e3b3f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
index 5a98db3cdd..5a98db3cdd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
index 9be553205a..9be553205a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
index 5fa45a9967..5fa45a9967 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h
index b071dd221e..b071dd221e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
index 12a0b61fd2..12a0b61fd2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h
index 874da80450..874da80450 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp
index 03f475af09..03f475af09 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h
index ab136e9109..ab136e9109 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
index 48cc0aa1e6..48cc0aa1e6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
index 80e07d696c..80e07d696c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp
index 507c1b38ea..507c1b38ea 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h
index 944a192cf6..944a192cf6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
index 56eb3146dd..56eb3146dd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h
index 5925fdca85..5925fdca85 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp
index 366fcdf1f3..366fcdf1f3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h
index 6b0a17d2b7..6b0a17d2b7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp
index e551d04eda..e551d04eda 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h
index 5a6a5c38f7..5a6a5c38f7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp
index 9d55c5fb43..9d55c5fb43 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h
index eccf3cf02f..eccf3cf02f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h
index bf1419faa8..bf1419faa8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp
index 8a9494d7de..8a9494d7de 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h
index d509ba6d73..d509ba6d73 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp
index 099e3cece8..099e3cece8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h
index e2ff104631..e2ff104631 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
index f2ccda9d69..f2ccda9d69 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h
index 8b5b3b8130..8b5b3b8130 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp
index d70ce28190..d70ce28190 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h
index 2ca9142994..2ca9142994 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
index 33aa1f7605..33aa1f7605 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h
index 556055f183..556055f183 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp
index 98a929392d..98a929392d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h
index bbe1aa812a..bbe1aa812a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am
index 1cc28fe80e..1cc28fe80e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am
index 7fac33118a..7fac33118a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat
index 644cbfc4a3..644cbfc4a3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am
index bb28aed8b9..bb28aed8b9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
index d686c4c09f..d686c4c09f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
index 2c305c5161..2c305c5161 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
index d3f06e1b12..d3f06e1b12 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
index a047f82e46..a047f82e46 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
index 6d64a32dd6..6d64a32dd6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h
index 8a69913be4..8a69913be4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h
index 6cce9453d7..6cce9453d7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
index 74a30fb772..74a30fb772 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
index d6c872629d..d6c872629d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
index b5312ab243..b5312ab243 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
index 8eb7b88691..8eb7b88691 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
index 7bb84a7673..7bb84a7673 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
index 04ac9f6970..04ac9f6970 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
index cc45ea9fb8..cc45ea9fb8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
index 8406e9bc44..8406e9bc44 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
index fbf8281178..fbf8281178 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
index e8111b6423..e8111b6423 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
index 3de0cb968c..3de0cb968c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
index 412c276d8c..412c276d8c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
index ae8183231e..ae8183231e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
index ed0bb8b51c..ed0bb8b51c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
index f8aad90f7a..f8aad90f7a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
index b4cf31220a..b4cf31220a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
index 9e5a227f01..9e5a227f01 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
index 11f487361d..11f487361d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
index 2322d1bdf5..2322d1bdf5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
index fdbf314d3d..fdbf314d3d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
index ba20a1d5a0..ba20a1d5a0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
index 398417011f..398417011f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
index 45afea8375..45afea8375 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
index 13b88a84dd..13b88a84dd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
index 7292f747b8..7292f747b8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
index 585bac0dc4..585bac0dc4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL
index 059a43057b..059a43057b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am
index fb661fec63..fb661fec63 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE
index b240b0a121..b240b0a121 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README
index ad96622516..ad96622516 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
index 1a8f668c19..1a8f668c19 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh
index af38864985..af38864985 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh
index 41e96d0565..41e96d0565 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac
index d68d262b78..d68d262b78 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat
index 32d8378803..32d8378803 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am
index 920828ef4f..920828ef4f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am
index fd34c6442a..fd34c6442a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README
index dbee1f5f85..dbee1f5f85 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
index ada4d89a1c..ada4d89a1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
index 548f9bdcb8..548f9bdcb8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
index d4b37ee2b2..d4b37ee2b2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
index 54ebfdbde4..54ebfdbde4 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
index 5a6c3a199e..5a6c3a199e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
index f0f35bab56..f0f35bab56 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
index b50b20d9c6..b50b20d9c6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
index 5a08e5b063..5a08e5b063 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
index f945c6af8c..f945c6af8c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
index 0a955f36d3..0a955f36d3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
index 10020c4f03..10020c4f03 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
index ed2e75edc8..ed2e75edc8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
index f1a82a70db..f1a82a70db 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am
index b3622779e6..b3622779e6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
index 0ffb660139..0ffb660139 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
index 971ed93c86..971ed93c86 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
index 101667302f..101667302f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
index 604c4ea102..604c4ea102 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
index a07c499dec..a07c499dec 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
index 4279376300..4279376300 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
index 4b66c42a5b..4b66c42a5b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
index bddb262617..bddb262617 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
index 0236d3bc7f..0236d3bc7f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
index be20f34217..be20f34217 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h
index 11a9519361..11a9519361 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
index 63f1672ec5..63f1672ec5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
index 78e678dff5..78e678dff5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
index cbea3f2b71..cbea3f2b71 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
index 9a4f658eb0..9a4f658eb0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
index 8a8d15fe40..8a8d15fe40 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
index 8010752980..8010752980 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
index 4d18424ae2..4d18424ae2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
index ef3d6b1604..ef3d6b1604 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
index 8aea8dadb2..8aea8dadb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
index 4078226f63..4078226f63 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h
index 5bbc9001dc..5bbc9001dc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd
index 0f32f120e6..0f32f120e6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am
index 83e70b4b94..83e70b4b94 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat
index 43c7a45777..43c7a45777 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat
index 4403b0ce6c..4403b0ce6c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am
index ec81dd5840..ec81dd5840 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
index 0274ffc774..0274ffc774 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
index 783f37a228..783f37a228 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
index 84cc34c6a4..84cc34c6a4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
index c94925c3fc..c94925c3fc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
index 1d5e3b6361..1d5e3b6361 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
index 803d94743d..803d94743d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
index 9282bb953c..9282bb953c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
index 64f856f51d..64f856f51d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
index 57ac5baeb5..57ac5baeb5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
index fbf75b3223..fbf75b3223 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h
index b608a50711..b608a50711 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
index 235468eca9..235468eca9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
index 75b14529bf..75b14529bf 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
index 3c30f363b8..3c30f363b8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
index cfc2ca8914..cfc2ca8914 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
index c2564c4db1..c2564c4db1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
index f993730d8e..f993730d8e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
index 061aeb7515..061aeb7515 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
index 9a803cdced..9a803cdced 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
index bd34549f8a..bd34549f8a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
index 92a224275e..92a224275e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd
index e1c7247992..e1c7247992 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd
index dd9075c7fb..dd9075c7fb 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am
index 742a8152ad..742a8152ad 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat
index 6ad4ef66ea..6ad4ef66ea 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am
index f963effea2..f963effea2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat
index 07c74d9e81..07c74d9e81 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am
index 8007a89d13..8007a89d13 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
index c69febf39a..c69febf39a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
index de61ee5751..de61ee5751 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
index f3636f0d39..f3636f0d39 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
index 34feda2049..34feda2049 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
index 88aacecc16..88aacecc16 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am
index 2a0247f16f..2a0247f16f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am
index f963effea2..f963effea2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am
index 834853a6cf..834853a6cf 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
index f8eb9ad05c..f8eb9ad05c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
index ad1d861d95..ad1d861d95 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
index 424039666f..424039666f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
index af2fbcfc94..af2fbcfc94 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
index 72701bfa65..72701bfa65 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
index d19bcdacf5..d19bcdacf5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat
index 6717749990..6717749990 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am
index 2ecfda6c6c..2ecfda6c6c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat
index bea89aa81d..bea89aa81d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat
index b10b15d5c1..b10b15d5c1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am
index f963effea2..f963effea2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am
index 49d11faee3..49d11faee3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
index eb3ac60e01..eb3ac60e01 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
index 18720f42f5..18720f42f5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
index 0d9e41841b..0d9e41841b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
index 5806c83773..5806c83773 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
index 387add3f35..387add3f35 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
index 802218a2fe..802218a2fe 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
index 1b4b2d3403..1b4b2d3403 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
index d19f3926a1..d19f3926a1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd
index a2fd41121c..a2fd41121c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd
index 3f1aca6ecd..3f1aca6ecd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am
index 08ba2f553f..08ba2f553f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat
index c126025bb6..c126025bb6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am
index 41ce75925b..41ce75925b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat
index 8c8d1e0794..8c8d1e0794 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp
index 458700e5f1..458700e5f1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb
index 9c41843d63..9c41843d63 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am
index 50dd2d15b8..50dd2d15b8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
index a6b8ee8ffa..a6b8ee8ffa 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
index 5554ac6756..5554ac6756 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
index 2414b66fb1..2414b66fb1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
index 5789517cfd..5789517cfd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
index 232431ca1e..232431ca1e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
index aa416f139a..aa416f139a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
index 79d9ed2dbe..79d9ed2dbe 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
index bf160cc821..bf160cc821 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
index e6c37cf1da..e6c37cf1da 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
index ee87bdd132..ee87bdd132 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
index 2526084a72..2526084a72 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
index 5db72a1ebe..5db72a1ebe 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
index fa30642318..fa30642318 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
index c7bc851635..c7bc851635 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
index d1dda36cb5..d1dda36cb5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
index e71d69506c..e71d69506c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
index 163f8a9d8b..163f8a9d8b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
index b772daf712..b772daf712 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
index 3508b23f94..3508b23f94 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am
index 50dfb45557..50dfb45557 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat
index b3a33a8011..b3a33a8011 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat
index 0afc3ff4ea..0afc3ff4ea 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am
index ee1b9ea5e8..ee1b9ea5e8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
index 7d70f595cc..7d70f595cc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
index 389541061a..389541061a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
index 3b5564a765..3b5564a765 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
index d73a10f202..d73a10f202 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat
index e65ccb7715..e65ccb7715 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am
index 2b062f199b..2b062f199b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
index 789d8794df..789d8794df 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
index 8cde2fbef4..8cde2fbef4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
index b8eaaaa1f9..b8eaaaa1f9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
index f3e699e2ee..f3e699e2ee 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd
index 1051c3910c..1051c3910c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am
index 806786ce04..806786ce04 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat
index 567875624f..567875624f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am
index 4996d72c77..4996d72c77 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
index 20ceba5a87..20ceba5a87 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
index 397440dd5d..397440dd5d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
index 53d6075bbd..53d6075bbd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
index 68dd657657..68dd657657 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
index 4adcd5b4ff..4adcd5b4ff 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
index f7aebbb575..f7aebbb575 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
index d0e708f1a1..d0e708f1a1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
index 26d8dffc45..26d8dffc45 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
index 3c8c5eb12d..3c8c5eb12d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat
index 6d8c426da2..6d8c426da2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am
index feadf9e317..feadf9e317 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am
index 95924779da..95924779da 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml
index 641085466e..641085466e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat
index 6493e1cec9..6493e1cec9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh
index ffe571b0ee..ffe571b0ee 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml
index 97d4d43a86..97d4d43a86 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml
index 335d4d96be..335d4d96be 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
index b6d2ac9225..b6d2ac9225 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
index 0dc8f3358a..0dc8f3358a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
index 13c87c8c87..13c87c8c87 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
index 09c3862590..09c3862590 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
index 4e8b069010..4e8b069010 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
index 24a7552bc4..24a7552bc4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
index 712e7d2646..712e7d2646 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
index 8dd27ec60d..8dd27ec60d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
index 4d57514688..4d57514688 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
index e52adf4db0..e52adf4db0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
index 220caf2d0c..220caf2d0c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
index b565e6c30e..b565e6c30e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat
index ac4b50190b..ac4b50190b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat
index 246728b6b2..246728b6b2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
index 2c1c2abbcc..2c1c2abbcc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AUTHORS b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AUTHORS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AUTHORS
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/AlertAggregatorSCADiagram.png b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/AlertAggregatorSCADiagram.png
index 4672a5e22e..4672a5e22e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/AlertAggregatorSCADiagram.png
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/AlertAggregatorSCADiagram.png
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/Makefile.am
index 0b39db277d..0b39db277d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README
index e605168052..e605168052 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README.html
index 69d5434527..69d5434527 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/config.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/config.xml
index 0b33cb7911..0b33cb7911 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/config.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/config.xml
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/deploy.bat
index f96188e535..f96188e535 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/README
index 207e6394e1..207e6394e1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/httpd.conf b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/httpd.conf
index 92026c9717..92026c9717 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/httpd.conf
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/httpd.conf
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/mime.types b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/mime.types
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/conf/mime.types
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php
index 2b9eb916a0..2b9eb916a0 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/AlertDisplay.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd
index 58b9982d38..58b9982d38 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Alerter.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml
index 03901c804c..03901c804c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/Cached_Alerts.xml
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/index.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/index.html
index 2ecd0434b6..2ecd0434b6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/index.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/index.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/pop.png b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/pop.png
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/pop.png
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/rss.png b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/rss.png
index b3c949d224..b3c949d224 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/rss.png
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/rss.png
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/style.css b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/style.css
index cd377e90e5..cd377e90e5 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/style.css
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/htdocs/style.css
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/startserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/startserver.bat
index dab8cd6c61..dab8cd6c61 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/startserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver.php/startserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/Makefile.am
index 5db11696dc..5db11696dc 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/httpd.conf b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/httpd.conf
index d243f85fbf..d243f85fbf 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/httpd.conf
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/httpd.conf
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/mime.types b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/mime.types
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/conf/mime.types
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/index.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/index.html
index 911f66e013..911f66e013 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/index.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/index.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/pop.png b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/pop.png
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/pop.png
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/rss.png b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/rss.png
index b3c949d224..b3c949d224 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/rss.png
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/rss.png
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/style.css b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/style.css
index cd377e90e5..cd377e90e5 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/style.css
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/htdocs/style.css
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.bat
index fa4d66df31..fa4d66df31 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.sh
index d197b94245..d197b94245 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/startserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/stopserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/stopserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/httpserver/stopserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter.app.composite
index 4c0d4ccd1a..4c0d4ccd1a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py
index d9aab820ac..d9aab820ac 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertCheckerImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py
index 2800a940b4..2800a940b4 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/AlertConfigImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Alerter.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Alerter.xsd
index c59460995d..c59460995d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Alerter.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Alerter.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Makefile.am
index 9a0ca276a0..9a0ca276a0 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py
index 0ae115ac2e..0ae115ac2e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb
index e61046cb84..e61046cb84 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/POPCheckerImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py
index 2e320c0b22..2e320c0b22 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/RSSCheckerImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/sample.alerter.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/sample.alerter.composite
index 21c4ee1093..21c4ee1093 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/sample.alerter.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.alerter/sample.alerter.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Alerter.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Alerter.xsd
index c59460995d..c59460995d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Alerter.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Alerter.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py
index 0122701063..0122701063 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/HTMLDisplayImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Makefile.am
index 6ac781c7df..6ac781c7df 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/sample.display.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/sample.display.composite
index 593c53c15f..593c53c15f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/sample.display.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/AlertAggregator/sample.display/sample.display.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/COPYING b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/COPYING
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/COPYING
diff --git a/tags/native-sca-1.0.incubating-M3/samples/ChangeLog b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/ChangeLog
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/ChangeLog
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/Makefile.am
index 95045e0be6..95045e0be6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README
index 341db17b63..341db17b63 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README.html
index 4720dd7b57..4720dd7b57 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj
index 78527d02b5..78527d02b5 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj.user b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj.user
index 4eae0888d7..4eae0888d7 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj.user
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/Build/Build.vcproj.user
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/CppBigBank.sln b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/CppBigBank.sln
index 068eaed614..068eaed614 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/CppBigBank.sln
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/CppBigBank.sln
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj
index fce5d7091b..fce5d7091b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj
index 0460446ba2..0460446ba2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataService.h
index 64d093ac6f..64d093ac6f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataService.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType
index b1cab9e1f9..b1cab9e1f9 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp
index 2517236613..2517236613 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h
index 9312175540..9312175540 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountDataServiceImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.h
index 85337d37a9..85337d37a9 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType
index b65fa1dc18..b65fa1dc18 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
index 8544b36e7e..8544b36e7e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.h
index 0c172823fb..0c172823fb 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/AccountServiceImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/Makefile.am
index e9af461312..e9af461312 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteService.h
index 379af5b425..379af5b425 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteService.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType
index 6ac2b77255..6ac2b77255 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp
index 8332730d73..8332730d73 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h
index 9b0ac69b0c..9b0ac69b0c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteServiceImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd
index 5bce3a63dc..5bce3a63dc 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.h
index 5c32ff8eaa..5c32ff8eaa 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/bigbank.account.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/bigbank.account.composite
index 7173d584d2..7173d584d2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/bigbank.account.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.bat
index c08a8fc5d9..c08a8fc5d9 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.sh
index 047e541360..047e541360 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.account/runwsserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.app.composite
index 5d68e0ae1a..5d68e0ae1a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/AccountClient.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/AccountClient.cpp
index 009c2d0c4d..009c2d0c4d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/AccountClient.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/AccountClient.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/Makefile.am
index 8c619b63bd..8c619b63bd 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.bat
index 069463ba2d..069463ba2d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.sh
index d5476ee84c..d5476ee84c 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/AccountService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/Makefile.am
index bdc846e58c..bdc846e58c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/README
index d02873e860..d02873e860 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php
index b9f77d3297..b9f77d3297 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigaccount.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php
index 32159ddc16..32159ddc16 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/bigbank.phpwsclient/bigwelcome.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/build.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/build.bat
index 2b1a4898ea..2b1a4898ea 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/build.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/build.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deploy.bat
index 7a3f5d898d..7a3f5d898d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deployclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deployclient.bat
index 5033e5bee8..5033e5bee8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deployclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppBigBank/deployclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/Makefile.am
index d9d4b499b7..d9d4b499b7 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README
index b9dedd2da3..b9dedd2da3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README.html
index 264ba3d881..264ba3d881 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj
index c33437a8cd..c33437a8cd 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj.user b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj.user
index 8b18d57ac5..8b18d57ac5 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj.user
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/Build/Build.vcproj.user
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/CppCalculator.sln b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/CppCalculator.sln
index 941a48a3f7..941a48a3f7 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/CppCalculator.sln
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/CppCalculator.sln
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
index 66e62def41..66e62def41 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
index 81493af9aa..81493af9aa 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/build.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/build.bat
index dc18a451fe..dc18a451fe 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/build.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/build.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deploy.bat
index 939086dc97..939086dc97 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deployclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deployclient.bat
index b2361cfe0f..b2361cfe0f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deployclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/deployclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.app.composite
index 5753b3c593..5753b3c593 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
index 37e9d40f66..37e9d40f66 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/Makefile.am
index b51183d193..b51183d193 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.bat
index 795325ab52..795325ab52 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.sh
index feae29d557..feae29d557 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Calculator.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Calculator.h
index 90e97b5319..90e97b5319 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Calculator.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Calculator.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType
index 72fe9842e8..72fe9842e8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp
index 01dac77c92..01dac77c92 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.h
index af8a5eeab1..af8a5eeab1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/CalculatorImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Divide.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Divide.h
index 6e171ed733..6e171ed733 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Divide.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Divide.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.componentType
index d7369e3ff0..d7369e3ff0 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.cpp
index f1a927cf4c..f1a927cf4c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.h
index 64045f1899..64045f1899 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/DivideImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Makefile.am
index de6dad787d..de6dad787d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/sample.calculator.composite
index 6903cf21d8..6903cf21d8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/CppCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/GettingStarted.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/GettingStarted.html
index dcb2cfd19c..dcb2cfd19c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/GettingStarted.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/GettingStarted.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/Makefile.am
index 7ae86e6d2c..7ae86e6d2c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README
index a3442236bd..a3442236bd 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README.html
index bfd33ee1cd..bfd33ee1cd 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb
index 20af2cfedb..20af2cfedb 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/AccountServiceImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/Makefile.am
index 01c8681555..01c8681555 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb
index 7f8634072c..7f8634072c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteServiceImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd
index 2f7012b5fb..2f7012b5fb 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/bigbank.account.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/bigbank.account.composite
index 208402cdb3..208402cdb3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.account/bigbank.account.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd
index 8c8ff7c637..8c8ff7c637 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountData.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb
index 8ae0e23bab..8ae0e23bab 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/AccountDataServiceImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/Makefile.am
index 7735720b26..7735720b26 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite
index 30c2802d5b..30c2802d5b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.accountdata/bigbank.accountdata.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.app.composite
index 9507997464..9507997464 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb
index 6775b80f7a..6775b80f7a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/AccountWSClient.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/Makefile.am
index b1f1cfff0e..b1f1cfff0e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite
index f484a2fc7c..f484a2fc7c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/bigbank.wsclient.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
index 05d0ee2153..05d0ee2153 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh
index d50e6a4b0a..d50e6a4b0a 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/bigbank.wsclient/runwsclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/deploy.bat
index 2d8837bfac..2d8837bfac 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/Makefile.am
index 1195ee1aae..1195ee1aae 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/httpd.conf b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/httpd.conf
index e9a438dc85..e9a438dc85 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/httpd.conf
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/httpd.conf
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/mime.types b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/mime.types
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/conf/mime.types
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/htdocs/index.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/htdocs/index.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/htdocs/index.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.bat
index fe319248f5..fe319248f5 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.sh
index cca8472b75..cca8472b75 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/startserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/stopserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/stopserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/HttpdBigBank/httpserver/stopserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/INSTALL b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/INSTALL
index 3d7155367d..3d7155367d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/INSTALL
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/INSTALL
diff --git a/tags/native-sca-1.0.incubating-M3/samples/LICENSE b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/LICENSE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/LICENSE
diff --git a/tags/native-sca-1.0.incubating-M3/samples/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/Makefile.am
index 1751686e0e..1751686e0e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/NEWS b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/NEWS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/NEWS
diff --git a/tags/native-sca-1.0.incubating-M3/samples/NOTICE b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/NOTICE
index 44befbee63..44befbee63 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/NOTICE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/NOTICE
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/Makefile.am
index 3277f97e6e..3277f97e6e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/README
index d91c958763..d91c958763 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/Build/Build.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/Build/Build.vcproj
index c33437a8cd..c33437a8cd 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/Build/Build.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/Build/Build.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/PHPCalculator.sln b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/PHPCalculator.sln
index 899bb2c713..899bb2c713 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/PHPCalculator.sln
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/PHPCalculator.sln
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
index efc9194822..efc9194822 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
index 939c25e991..939c25e991 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deploy.bat
index fd1d8773d1..fd1d8773d1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deployclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deployclient.bat
index 5e20b30de5..5e20b30de5 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deployclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/deployclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/phpcalculator.png b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/phpcalculator.png
index c251364548..c251364548 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/phpcalculator.png
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/phpcalculator.png
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.app.composite
index 1450ad687b..1450ad687b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp
index e72b52f87e..e72b52f87e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php
index 7a512260ae..7a512260ae 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/CalculatorClient.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/Makefile b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/Makefile
index c335defb89..c335defb89 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/Makefile
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/Makefile
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/env.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/env.sh
index a2fa6eadc3..a2fa6eadc3 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/env.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/env.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat
index 655cef9ceb..655cef9ceb 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh
index e98e06c73f..e98e06c73f 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_cpp.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_php.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_php.bat
index 815c4fb58e..815c4fb58e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_php.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.client/runclient_php.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl
index 4d6904b687..4d6904b687 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/Calculator.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php
index 82faf1ef19..82faf1ef19 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/CalculatorWSClient.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat
index a1482be5db..a1482be5db 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator.wsclient/runwsclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.componentType
index aca0b2a6e4..aca0b2a6e4 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.h
index 4abfe9af6b..4abfe9af6b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.php
index 4b5747e10f..4b5747e10f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Add.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.componentType
index 7767c663bf..7767c663bf 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.h
index 90e97b5319..90e97b5319 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.php
index ce8f7899da..ce8f7899da 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.wsdl
index 331b996ba2..331b996ba2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Calculator.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType
index e2799af955..e2799af955 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp
index 2d880de72d..2d880de72d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.h
index af8a5eeab1..af8a5eeab1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp
index 084e6fbf2f..084e6fbf2f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h
index 700a060636..700a060636 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp
index 82114b4d6d..82114b4d6d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h
index 63bae2f75c..63bae2f75c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp
index 510069c331..510069c331 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h
index 0459e70f33..0459e70f33 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/CalculatorImpl_divideService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.componentType
index 428d19f8bc..428d19f8bc 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.h
index c2ab3b816c..c2ab3b816c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.php
index c2e9adda70..c2e9adda70 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Divide.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.componentType
index d7369e3ff0..d7369e3ff0 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.cpp
index 88b9065171..88b9065171 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.h
index 42cf47b1d4..42cf47b1d4 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp
index e8dbeb2e0d..e8dbeb2e0d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h
index d66cde1c06..d66cde1c06 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp
index 9c6f2101fe..9c6f2101fe 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h
index 5cd10f5188..5cd10f5188 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/DivideImpl_DivideService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.componentType
index 0b4423300d..0b4423300d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.h
index c21da1bddf..c21da1bddf 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.php
index 0a955f36d3..0a955f36d3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Log.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Makefile.am
index 84567a5add..84567a5add 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.componentType
index af1631518a..af1631518a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.h
index 94de825f62..94de825f62 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.php
index 8ffe02675d..8ffe02675d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Multiply.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.componentType
index 35dab8bb9b..35dab8bb9b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.h
index a50b79ccc6..a50b79ccc6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.h
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.php
index 8d3a1b3ddf..8d3a1b3ddf 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/Subtract.php
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.bat
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.sh
index 069d734fea..069d734fea 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/runwsserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite
index 09b7070fb8..09b7070fb8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite.back b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite.back
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite.back
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PHPCalculator/sample.calculator/sample.calculator.composite.back
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/Makefile.am
index 21952e3df4..21952e3df4 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README
index 670f561dc1..670f561dc1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README.html
index 3b9f72864e..3b9f72864e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/deploy.bat
index 185f621bbd..185f621bbd 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.app.composite
index ea4e3e118d..ea4e3e118d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/Makefile.am
index df1187aab1..df1187aab1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/calculator_client.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/calculator_client.py
index 58d6f45606..58d6f45606 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/calculator_client.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/calculator_client.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.bat
index 206b1e5a59..206b1e5a59 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.sh
index d500d3d132..d500d3d132 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Calculator.wsdl
index 331b996ba2..331b996ba2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Calculator.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/CalculatorImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
index 86dbef9e4d..86dbef9e4d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/DivideImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/DivideImpl.py
index 3921731de6..3921731de6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/DivideImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/DivideImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Makefile.am
index ec7cf8a8ad..ec7cf8a8ad 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/sample.calculator.composite
index 7f2221b696..7f2221b696 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/Makefile.am
index 6b2d218134..6b2d218134 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README
index c590973f5f..c590973f5f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README.html
index c52cb6ec86..c52cb6ec86 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/deploy.bat
index 86579ce38b..86579ce38b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.app.composite
index 522a2fc0c8..522a2fc0c8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/Makefile.am
index 8c4781759e..8c4781759e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.bat
index 93c044ed82..93c044ed82 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.sh
index e6ec73b209..e6ec73b209 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py
index 5de99fcf8e..5de99fcf8e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather.client/weather_forecast_client.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/Makefile.am
index d0450ef707..d0450ef707 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl
index ec39e2287a..ec39e2287a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecast.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py
index 6e3775de0b..6e3775de0b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/WeatherForecastImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/sample.weather.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/sample.weather.composite
index 70e9674d23..70e9674d23 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/sample.weather.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/PythonWeatherForecast/sample.weather/sample.weather.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/README
index 3d7155367d..3d7155367d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/Makefile.am
index e3b215ad90..e3b215ad90 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README
index 03c6b6a325..03c6b6a325 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README.html
index 80f7462c8a..80f7462c8a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/deploy.bat
index 76af30e367..76af30e367 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/Makefile.am
index f9412183dc..f9412183dc 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/httpd.conf b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/httpd.conf
index 0303f787e9..0303f787e9 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/httpd.conf
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/httpd.conf
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/mime.types b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/mime.types
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/conf/mime.types
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/htdocs/index.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/htdocs/index.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/htdocs/index.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.bat
index 2fc567a7e6..2fc567a7e6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.sh
index e5d3d8f1ce..e5d3d8f1ce 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/startserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/stopserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/stopserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/httpserver/stopserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.app.composite
index b7c42f4731..b7c42f4731 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
index 4305c3e185..4305c3e185 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/Makefile.am
index 5eee4677b8..5eee4677b8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
index fb97ed8b74..fb97ed8b74 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
index 0c6c6c182c..0c6c6c182c 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
index fee8c6e14f..fee8c6e14f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/CalculatorImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/CalculatorImpl.rb
index 36ed15ff9b..36ed15ff9b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/CalculatorImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/CalculatorImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/DivideImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/DivideImpl.rb
index c6615bfcfa..c6615bfcfa 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/DivideImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/DivideImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/Makefile.am
index b715fe2424..b715fe2424 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/sample.calculator.composite
index 49fbf17f54..49fbf17f54 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/Makefile.am
index bf259580ce..bf259580ce 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README
index bf2a1c3eb6..bf2a1c3eb6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README.html
index 7d43177b9a..7d43177b9a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/deploy.bat
index 9eb09d7430..9eb09d7430 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/Makefile.am
index af8c0bb550..af8c0bb550 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/httpd.conf b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/httpd.conf
index 0303f787e9..0303f787e9 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/httpd.conf
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/httpd.conf
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/mime.types b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/mime.types
index 4279f51bca..4279f51bca 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/mime.types
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/conf/mime.types
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/htdocs/index.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/htdocs/index.html
index 1bfb3e30c2..1bfb3e30c2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/htdocs/index.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/htdocs/index.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.bat
index a62f4bd510..a62f4bd510 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.sh
index 0d4561e3d3..0d4561e3d3 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/startserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/stopserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/stopserver.sh
index c17f632a3e..c17f632a3e 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/stopserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/httpserver/stopserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.app.composite
index 65565f1e3c..65565f1e3c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Customer.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Customer.xsd
index 1cec1b0ae6..1cec1b0ae6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Customer.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Customer.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py
index 340da8700d..340da8700d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/CustomerRestClient.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Makefile.am
index 13c14d07e9..13c14d07e9 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.bat
index 982b9b5e83..982b9b5e83 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.sh
index 54c068f4e2..54c068f4e2 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/runrestclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite
index 15072f28f8..15072f28f8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer.restclient/sample.customer.restclient.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/2345.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/2345.xml
index 48083380ea..48083380ea 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/2345.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/2345.xml
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Customer.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Customer.xsd
index 1cec1b0ae6..1cec1b0ae6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Customer.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Customer.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/CustomerResourceImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/CustomerResourceImpl.py
index 1d6796959e..1d6796959e 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/CustomerResourceImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/CustomerResourceImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Makefile.am
index e48bb502c8..e48bb502c8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/sample.customer.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/sample.customer.composite
index 1ee3b2d6a2..1ee3b2d6a2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/sample.customer.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestCustomer/sample.customer/sample.customer.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/Makefile.am
index de28cf2d53..de28cf2d53 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README
index 79ee6c7813..79ee6c7813 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README.html
index 967f2c84b1..967f2c84b1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/deploy.bat
index 128ceafc38..128ceafc38 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.app.composite
index eb19962fe3..eb19962fe3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/Makefile.am
index 4fcbf00e16..4fcbf00e16 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb
index 0a87ccd815..0a87ccd815 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/YahooWebSearchClient.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.bat
index bf95f27738..bf95f27738 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.sh
index 7dbae64748..7dbae64748 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/Makefile.am
index 7e330ca7b1..7e330ca7b1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py
index 7ba6ab80ef..7ba6ab80ef 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchImpl.py
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd
index 210aabcf42..210aabcf42 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/YahooWebSearchResponse.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/sample.yahoo.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/sample.yahoo.composite
index a37a9be7c4..a37a9be7c4 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/sample.yahoo.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RestYahoo/sample.yahoo/sample.yahoo.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/Makefile.am
index ae0b4958f1..ae0b4958f1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README
index 6b2dba4206..6b2dba4206 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README.html
index 6eeb377d6f..6eeb377d6f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb
index 8ae0e23bab..8ae0e23bab 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountDataServiceImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb
index aab789ca13..aab789ca13 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/AccountServiceImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/Makefile.am
index 6e5ec38414..6e5ec38414 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb
index 7f8634072c..7f8634072c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteServiceImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd
index 2f7012b5fb..2f7012b5fb 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/bigbank.account.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/bigbank.account.composite
index 8fff8425a1..8fff8425a1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/bigbank.account.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.bat
index 3ab4275436..3ab4275436 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.sh
index e3bbca46c6..e3bbca46c6 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.account/runwsserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.app.composite
index dd94e61e5b..dd94e61e5b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/AccountClient.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/AccountClient.rb
index 31c0acc909..31c0acc909 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/AccountClient.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/AccountClient.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/Makefile.am
index 4e4936746a..4e4936746a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.bat
index 0495237f7f..0495237f7f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.sh
index 94d5cd6ff8..94d5cd6ff8 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl
index b83c453462..b83c453462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountService.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb
index 6775b80f7a..6775b80f7a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/AccountWSClient.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/Makefile.am
index 23f8b55959..23f8b55959 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite
index f484a2fc7c..f484a2fc7c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/bigbank.wsclient.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
index 6e1bb27b4a..6e1bb27b4a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
index d50e6a4b0a..d50e6a4b0a 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/bigbank.wsclient/runwsclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/deploy.bat
index 566f4a7085..566f4a7085 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyBigBank/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/Makefile.am
index 246ea1852f..246ea1852f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README
index 670f561dc1..670f561dc1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README.html
index bb6fe7e0ea..bb6fe7e0ea 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/README.html
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/deploy.bat
index 6910b8ca2d..6910b8ca2d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.app.composite
index ada4d89a1c..ada4d89a1c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
index 253928df0c..253928df0c 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/Makefile.am
index 38f61539d3..38f61539d3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.bat
index 4a1079986a..4a1079986a 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.sh
index bc2d6c0904..bc2d6c0904 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Calculator.wsdl
index 331b996ba2..331b996ba2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Calculator.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
index 36ed15ff9b..36ed15ff9b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/DivideImpl.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/DivideImpl.rb
index c6615bfcfa..c6615bfcfa 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/DivideImpl.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/DivideImpl.rb
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Makefile.am
index 7de5b9fdd3..7de5b9fdd3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/sample.calculator.composite
index d77ba538fe..d77ba538fe 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/RubyCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo.app.composite
index 3b8738a843..3b8738a843 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
index a63e4c37d3..a63e4c37d3 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/supplychain.demo.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
index 20b0e49ec1..20b0e49ec1 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
index e78e602635..e78e602635 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
index c78357b1a8..c78357b1a8 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/supplychain.logging.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
index 2b28c8f9e2..2b28c8f9e2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
index fb0c8a5676..fb0c8a5676 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
index 63530bc0ee..63530bc0ee 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
index 256671f64f..256671f64f 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
index c61657c0a7..c61657c0a7 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerA.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerA.app.composite
index 1963304b83..1963304b83 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerA.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerA.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerB.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerB.app.composite
index a2f9141f00..a2f9141f00 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerB.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerB.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerC.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerC.app.composite
index a48258b6ca..a48258b6ca 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerC.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.manufacturerC.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer.app.composite
index 734849de05..734849de05 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/Retailer.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
index 39bd1963f2..39bd1963f2 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
index fb381ec9a6..fb381ec9a6 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
index 51a2b96b1b..51a2b96b1b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
index a007f9957b..a007f9957b 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
index fbc1edb462..fbc1edb462 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
index 7f63d3b571..7f63d3b571 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
index e44b964eb4..e44b964eb4 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
diff --git a/tags/native-sca-1.0.incubating-M3/samples/autogen.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/autogen.sh
index 18277601c8..18277601c8 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/autogen.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/autogen.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/build.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/build.sh
index b03a6e4941..b03a6e4941 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/build.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/build.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/configure.ac b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/configure.ac
index 6ebc4acb6d..6ebc4acb6d 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/configure.ac
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/configure.ac
diff --git a/tags/native-sca-1.0.incubating-M3/samples/runtest.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/runtest.sh
index 1c016a5287..1c016a5287 100755
--- a/tags/native-sca-1.0.incubating-M3/samples/runtest.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/runtest.sh
diff --git a/tags/native-sca-1.0.incubating-M3/samples/scagen.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/scagen.bat
index 968ec7a675..968ec7a675 100644
--- a/tags/native-sca-1.0.incubating-M3/samples/scagen.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/samples/scagen.bat
diff --git a/tags/native-sca-1.0.incubating-M3/test/AUTHORS b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/AUTHORS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/AUTHORS
diff --git a/tags/native-sca-1.0.incubating-M3/test/COPYING b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/native-sca-1.0.incubating-M3/test/COPYING
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/COPYING
diff --git a/tags/native-sca-1.0.incubating-M3/test/ChangeLog b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ChangeLog
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ChangeLog
diff --git a/tags/native-sca-1.0.incubating-M3/test/INSTALL b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/INSTALL
index b8a53409ed..b8a53409ed 100644
--- a/tags/native-sca-1.0.incubating-M3/test/INSTALL
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/INSTALL
diff --git a/tags/native-sca-1.0.incubating-M3/test/LICENSE b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/native-sca-1.0.incubating-M3/test/LICENSE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/LICENSE
diff --git a/tags/native-sca-1.0.incubating-M3/test/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/Makefile.am
index 24292e8033..24292e8033 100644
--- a/tags/native-sca-1.0.incubating-M3/test/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/test/NEWS b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/NEWS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/NEWS
diff --git a/tags/native-sca-1.0.incubating-M3/test/NOTICE b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/NOTICE
index 44befbee63..44befbee63 100644
--- a/tags/native-sca-1.0.incubating-M3/test/NOTICE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/NOTICE
diff --git a/tags/native-sca-1.0.incubating-M3/test/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/README
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/README
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
index 115858f09a..115858f09a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
index 5c48a3a683..5c48a3a683 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
index c804494b46..c804494b46 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
index 1706534042..1706534042 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj
index f82221700b..f82221700b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
index 15287150e0..15287150e0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp
index e2ca28345d..e2ca28345d 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
index 7d3b355b8a..7d3b355b8a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
index f38fd95c79..f38fd95c79 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
index a2da07322c..a2da07322c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
index 93f6cf7a28..93f6cf7a28 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
index 3f7b011749..3f7b011749 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
index f454a5bde0..f454a5bde0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml
index 2fd4580526..2fd4580526 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
index 91d3105f5b..91d3105f5b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem
index 91d3105f5b..91d3105f5b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
index c804494b46..c804494b46 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
index 1706534042..1706534042 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
index 15287150e0..15287150e0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
index 7d3b355b8a..7d3b355b8a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite
index f454a5bde0..f454a5bde0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/test/autogen.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/autogen.sh
index af38864985..af38864985 100755
--- a/tags/native-sca-1.0.incubating-M3/test/autogen.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/autogen.sh
diff --git a/tags/native-sca-1.0.incubating-M3/test/build.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/build.sh
index 7a3c439e8b..7a3c439e8b 100755
--- a/tags/native-sca-1.0.incubating-M3/test/build.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/build.sh
diff --git a/tags/native-sca-1.0.incubating-M3/test/configure.ac b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/configure.ac
index f84c32ab1e..f84c32ab1e 100644
--- a/tags/native-sca-1.0.incubating-M3/test/configure.ac
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/configure.ac
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/deploy.bat
index d6d0c72cb9..d6d0c72cb9 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/TestClient.c b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/TestClient.c
index bb728dc916..bb728dc916 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/TestClient.c
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/TestClient.c
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/runclient.bat
index 13f3164751..13f3164751 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj
index 03c007662b..03c007662b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.sln b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.sln
index b1de123e0a..b1de123e0a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.sln
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service.sln
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.h
index aaff35a6cc..aaff35a6cc 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.wsdl
index 23ab8b08e4..23ab8b08e4 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/Test.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.componentType
index d0cca1882d..d0cca1882d 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.cpp
index e24534701d..e24534701d 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.h
index 3026d4c7aa..3026d4c7aa 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/TestImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/services.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/services.xml
index b223a53dad..b223a53dad 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/services.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/services.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.composite
index 98393813f3..98393813f3 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.composite
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite
index e1e402454b..e1e402454b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj
index 4c06194728..4c06194728 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/Makefile.am
index bc0e430ee7..bc0e430ee7 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/deploy.bat
index 3aab273673..3aab273673 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/Makefile.am
index 0a482e82f1..0a482e82f1 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/datagraph.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/datagraph.xsd
index 30727473a0..30727473a0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/datagraph.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/datagraph.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/importschema.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/importschema.xsd
index 082c389211..082c389211 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/importschema.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/importschema.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop.wsdl b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop.wsdl
index 258b31b2bd..258b31b2bd 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop.wsdl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop.wsdl
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01-in.xml
index be5da658c2..be5da658c2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01.xsd
index 083966d9f9..083966d9f9 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop01.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02-in.xml
index d57593625b..d57593625b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02.xsd
index a46c21c4f9..a46c21c4f9 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop02.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03-in.xml
index f4f50bf28c..f4f50bf28c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03.xsd
index 631dc0bfff..631dc0bfff 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop03.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04-in.xml
index ae06607013..ae06607013 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04.xsd
index 4d968e7b3c..4d968e7b3c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop04.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06-in.xml
index 168c41d380..168c41d380 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06.xsd
index acedc99232..acedc99232 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop06.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07-in.xml
index 029387c5d4..029387c5d4 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07.xsd
index e1cfc492d2..e1cfc492d2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop07.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08-in.xml
index 5a8c0de3b9..5a8c0de3b9 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08.xsd
index b7ca9dc916..b7ca9dc916 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop08.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09-in.xml
index 37d72454c0..37d72454c0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09.xsd
index 3a793fd8c5..3a793fd8c5 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop09.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10-in.xml
index 164b7242b4..164b7242b4 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10.xsd
index 593860b84b..593860b84b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop10.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11-in.xml
index 5e5d9af4a7..5e5d9af4a7 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11.xsd
index a72cda91e5..a72cda91e5 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop11.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12-in.xml
index 09fc39d2e1..09fc39d2e1 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12.xsd
index f428e65bf8..f428e65bf8 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop12.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13-in.xml
index 256f42646d..256f42646d 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13.xsd
index 3d553a7171..3d553a7171 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop13.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14-in.xml
index eb73036a8b..eb73036a8b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14.xsd
index 0155718348..0155718348 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop14.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15-in.xml
index 2376cbae06..2376cbae06 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15.xsd
index ad59a9710b..ad59a9710b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop15.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16-in.xml
index 94b51e764f..94b51e764f 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16.xsd
index f6518cfb3f..f6518cfb3f 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop16.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17-in.xml
index 4e6895d46f..4e6895d46f 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17.xsd
index bbfc755fb7..bbfc755fb7 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop17.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18-in.xml
index ea28b230ea..ea28b230ea 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18.xsd
index de8dc5b79e..de8dc5b79e 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop18.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19-in.xml
index 77d828227c..77d828227c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19.xsd
index 7d28e0d9b3..7d28e0d9b3 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop19.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20-in.xml
index 8b0e8df4ba..8b0e8df4ba 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20.xsd
index 1c4ffa6a5c..1c4ffa6a5c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop20.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21-in.xml
index 3bb03bb36f..3bb03bb36f 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21.xsd
index 4888a7d385..4888a7d385 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop21.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22-in.xml
index 4ee0a343a4..4ee0a343a4 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22.xsd
index 11c8d5c980..11c8d5c980 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop22.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23-in.xml
index 7f0d845be2..7f0d845be2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23.xsd
index b2f358c69e..b2f358c69e 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop23.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24-in.xml
index 913004272e..913004272e 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24.xsd
index c7c5a7f1af..c7c5a7f1af 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop24.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop25-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop25-in.xml
index 4a87e3e401..4a87e3e401 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop25-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop25-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26-in.xml
index 28ef8e7eaf..28ef8e7eaf 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26.xsd
index dc72404fae..dc72404fae 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop26.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop27-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop27-in.xml
index c596e781ff..c596e781ff 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop27-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop27-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28-in.xml
index ea47654916..ea47654916 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28.xsd
index 36ca723a0c..36ca723a0c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop28.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29-in.xml
index 37dc992ac0..37dc992ac0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29.xsd
index febb95142e..febb95142e 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop29.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30-in.xml
index 1f802101c4..1f802101c4 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30.xsd
index d42361b509..d42361b509 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop30.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31-in.xml
index 3cd54829a9..3cd54829a9 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31.xsd
index 9ba51daca8..9ba51daca8 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop31.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32-in.xml
index 72dc7ceb44..72dc7ceb44 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32.xsd
index bf33516371..bf33516371 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop32.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33-in.xml
index 61a0fdf2aa..61a0fdf2aa 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33.xsd
index 27f6c22d12..27f6c22d12 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop33.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34-in.xml
index 3c488be77c..3c488be77c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34.xsd
index 8fe33e9776..8fe33e9776 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop34.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35-in.xml
index 63f84a91da..63f84a91da 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35.xsd
index 706326b22f..706326b22f 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop35.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36-in.xml
index 2a4b63f958..2a4b63f958 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36.xsd
index 2e1c95b1c3..2e1c95b1c3 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop36.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37-in.xml
index f25366e905..f25366e905 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37.xsd
index b2afa51290..b2afa51290 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop37.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38-in.xml
index 5a97314a46..5a97314a46 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38.xsd
index a4b406550a..a4b406550a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop38.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop39-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop39-in.xml
index d6ec278d2a..d6ec278d2a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop39-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop39-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40-in.xml
index ac7a3835b7..ac7a3835b7 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40.xsd
index 3e2ca8765a..3e2ca8765a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop40.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41-in.xml
index 6fe9f99157..6fe9f99157 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41.xsd
index a473626f03..a473626f03 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop41.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42-in.xml
index 427f07b22b..427f07b22b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42.xsd
index 99a9afecd1..99a9afecd1 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop42.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43-in.xml
index 005879cf42..005879cf42 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43.xsd
index 60d31e94cc..60d31e94cc 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop43.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44-in.xml
index 1170e4a991..1170e4a991 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44.xsd
index 45c74b90fa..45c74b90fa 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop44.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45-in.xml
index f0160f713a..f0160f713a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45.xsd
index 7a6236c9eb..7a6236c9eb 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop45.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46-in.xml
index f5ddf4a859..f5ddf4a859 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46.xsd
index 54573c0bdb..54573c0bdb 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop46.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47-in.xml
index 4cff425ea2..4cff425ea2 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47.xsd
index be67383db3..be67383db3 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop47.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50-in.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50-in.xml
index 5aa3d442a9..5aa3d442a9 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50-in.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50-in.xml
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50.xsd
index f2d4ed7679..f2d4ed7679 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/resources/interop50.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/runtest.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/runtest.sh
index 831246bbc6..831246bbc6 100755
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/runtest.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/runtest.sh
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/Makefile.am
index 9fef007b19..9fef007b19 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/TestClient.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/TestClient.cpp
index da3a90cff4..da3a90cff4 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/TestClient.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/TestClient.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.bat
index 4ab0ea4cf3..4ab0ea4cf3 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.bat
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.sh
index 57e4b6b90f..57e4b6b90f 100755
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj
index 2646bb025c..2646bb025c 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.sln b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.sln
index b0bda8950b..b0bda8950b 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.sln
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop.sln
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Makefile.am
index d8a82e241a..d8a82e241a 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Test.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Test.h
index 59f55984e7..59f55984e7 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Test.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/Test.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.componentType
index d0cca1882d..d0cca1882d 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.cpp
index c99667e362..c99667e362 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.h
index 2f4f57e475..2f4f57e475 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/TestImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.bat
index 804688fc56..804688fc56 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.bat
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.sh
index ec0a75188b..ec0a75188b 100755
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/runwsserver.sh
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.composite
index 997aebfdc0..997aebfdc0 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.composite
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite
index 4a47d431a8..4a47d431a8 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite
diff --git a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj
index 57749e2b40..57749e2b40 100644
--- a/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/tools/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/Makefile.am
index 3a97f02513..3a97f02513 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/LICENSE b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/LICENSE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/LICENSE
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/NOTICE b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/NOTICE
index 44befbee63..44befbee63 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/NOTICE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/NOTICE
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/README
index 2831dadd94..2831dadd94 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/META-INF/README
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/Makefile.am
index 35f72cef08..35f72cef08 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/build.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/build.xml
index 0b657f84e6..0b657f84e6 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/build.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/build.xml
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/deploy.bat
index e643f1929a..e643f1929a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
index 13c1273983..13c1273983 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
index 48d415dd8e..48d415dd8e 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
index ca7d50ae48..ca7d50ae48 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
index e019873489..e019873489 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
index 11cab070b2..11cab070b2 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
index a26321d2a3..a26321d2a3 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
index e529af0dd0..e529af0dd0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
index 3743a1f1f9..3743a1f1f9 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
index 1f1d2108e5..1f1d2108e5 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
index 0d845e1b1e..0d845e1b1e 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
index 5d1fa568d1..5d1fa568d1 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
index 99c4158d1a..99c4158d1a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
index 41bbb22bde..41bbb22bde 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
index 3f97eacef2..3f97eacef2 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
index 04d3e8fbdb..04d3e8fbdb 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
index bc14167841..bc14167841 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
index af140f9575..af140f9575 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
index d527d9c358..d527d9c358 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
index 9d226cd5dc..9d226cd5dc 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
index d10bfb4b1a..d10bfb4b1a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
index d717e8636e..d717e8636e 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
index 182d9d89f2..182d9d89f2 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
index 733b4700e7..733b4700e7 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
index d1a634999c..d1a634999c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
index c325a90b1e..c325a90b1e 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
index cb63dd1f06..cb63dd1f06 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
index 85fac59da8..85fac59da8 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
index 95b70c3017..95b70c3017 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
index 5c5cb78b87..5c5cb78b87 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
index 540873174b..540873174b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
index b83a65be8c..b83a65be8c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
index 42c50da77f..42c50da77f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
index 48d34f7957..48d34f7957 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
index 928480df1f..928480df1f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
index 8d2f810db0..8d2f810db0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
index b83a65be8c..b83a65be8c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
index 42c50da77f..42c50da77f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
index 90835ca4af..90835ca4af 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index 6b830833a4..6b830833a4 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index 04a785cd26..04a785cd26 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
index a724c56c9a..a724c56c9a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
index bbfcf15ed1..bbfcf15ed1 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
index f5921f4216..f5921f4216 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
index 6171c47fba..6171c47fba 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
index 10c59480a8..10c59480a8 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index be5bc060c5..be5bc060c5 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
index 6171c47fba..6171c47fba 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
index 717ce02ede..717ce02ede 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
index bbda577c28..bbda577c28 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
index 5c5cb78b87..5c5cb78b87 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
index 928480df1f..928480df1f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
index c275383ab4..c275383ab4 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
index b83a65be8c..b83a65be8c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
index 42c50da77f..42c50da77f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
index 27d28368f5..27d28368f5 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
index 32bf7572dc..32bf7572dc 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
index 55f5813303..55f5813303 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
index 14bafd9ce7..14bafd9ce7 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
index 00b163ba76..00b163ba76 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
index b6e5c8a9f0..b6e5c8a9f0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
index 63bae2f75c..63bae2f75c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
index 79bfdbedbb..79bfdbedbb 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
index 277a3afb06..277a3afb06 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
index 09dd09c01c..09dd09c01c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
index bfa203598c..bfa203598c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
index 19056e836d..19056e836d 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
index 9213ec625b..9213ec625b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
index 7b1cad7770..7b1cad7770 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
index 0cb8404ca3..0cb8404ca3 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 85291cd069..85291cd069 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index cb9e4e6e2a..cb9e4e6e2a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index be09a57919..be09a57919 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index f3b2540ba8..f3b2540ba8 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 75f912d3ae..75f912d3ae 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 896a129145..896a129145 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index 6f2c95f45b..6f2c95f45b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 594f404d13..594f404d13 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 57add811a2..57add811a2 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index b85533cfd4..b85533cfd4 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index b0d9424ad4..b0d9424ad4 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 7f38178f9c..7f38178f9c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index e6800aa311..e6800aa311 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index d3fd4fbaf0..d3fd4fbaf0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 95c63da613..95c63da613 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 2bf1b90e87..2bf1b90e87 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index b32cf3863a..b32cf3863a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 82995c96b0..82995c96b0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index b0d9424ad4..b0d9424ad4 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index ac104f9aaf..ac104f9aaf 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index df388bf43d..df388bf43d 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index e6800aa311..e6800aa311 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index d3fd4fbaf0..d3fd4fbaf0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 21d956f547..21d956f547 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index bb92aa0556..bb92aa0556 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index de0f0a0563..de0f0a0563 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index cfc7c4c07a..cfc7c4c07a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 21d956f547..21d956f547 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 210da9a64c..210da9a64c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index f84fcf496b..f84fcf496b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 21d956f547..21d956f547 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index 210da9a64c..210da9a64c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index f84fcf496b..f84fcf496b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index 543b370282..543b370282 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 594f404d13..594f404d13 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 191dd3eed2..191dd3eed2 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index a57f5c4613..a57f5c4613 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index fe996eabdb..fe996eabdb 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 5bbd07a72a..5bbd07a72a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
index cfc7c4c07a..cfc7c4c07a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index ffcc1d0003..ffcc1d0003 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 6e4d0600bd..6e4d0600bd 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 4c3d626bfb..4c3d626bfb 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index a9b56bdb5c..a9b56bdb5c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 2aa9fcbdf2..2aa9fcbdf2 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/lib/readme.txt b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/lib/readme.txt
index d99c666c6a..d99c666c6a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/lib/readme.txt
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/lib/readme.txt
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.bat
index 8ab5e4abdf..8ab5e4abdf 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.bat
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.sh
index c50f28b98f..c50f28b98f 100755
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/scagen.sh
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
index 4ccbe0c750..4ccbe0c750 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
index 669901b4b5..669901b4b5 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
index 246a489c9c..246a489c9c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
index 36d0af18b3..36d0af18b3 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
index a2bb4ba858..a2bb4ba858 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
index b6bdf92878..b6bdf92878 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
index 533e1fd14a..533e1fd14a 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
index 225909e1d1..225909e1d1 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
index 317ad2fc44..317ad2fc44 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
index a25610c1f9..a25610c1f9 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
index 6e951f03de..6e951f03de 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
index 2d98e0a836..2d98e0a836 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
index 876d2dc3e0..876d2dc3e0 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
index e51b2d781c..e51b2d781c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
index d7052b7843..d7052b7843 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
index d26c5ec5ae..d26c5ec5ae 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
index c423477193..c423477193 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
index 28974b41a6..28974b41a6 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
index 6c86fa25b5..6c86fa25b5 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
index 3eb8dc7d98..3eb8dc7d98 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
index 9cf7952afa..9cf7952afa 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
index 0756b5fc3b..0756b5fc3b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
index 37c2a1a81c..37c2a1a81c 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
index 1ec393959d..1ec393959d 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
index e7036037c6..e7036037c6 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
index 5631249769..5631249769 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
index 19e983c6b1..19e983c6b1 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
index cedb4bdb54..cedb4bdb54 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
index 956db364a1..956db364a1 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
index dd260c9787..dd260c9787 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
index ea15ca587b..ea15ca587b 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
index 3d9dafa103..3d9dafa103 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
index 2f5edb3a93..2f5edb3a93 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
index f983917e36..f983917e36 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
diff --git a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
index c8157fe2f6..c8157fe2f6 100644
--- a/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/sca-core.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-core.xsd
index d7661e3994..d7661e3994 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/sca-core.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-core.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-composite.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-composite.xsd
index 4bcc6747ba..4bcc6747ba 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-composite.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-composite.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-java.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-java.xsd
index e20f0a9b50..e20f0a9b50 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-java.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-implementation-java.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-java.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-java.xsd
index a6028c1434..a6028c1434 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-java.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-java.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-wsdl.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-wsdl.xsd
index a3de838b7e..a3de838b7e 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-wsdl.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca-interface-wsdl.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/sca.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca.xsd
index 8853f25c11..8853f25c11 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/sca.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/sca.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/xsd/tuscany.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/tuscany.xsd
index 8bad940782..8bad940782 100644
--- a/tags/native-sca-1.0.incubating-M3/xsd/tuscany.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/xsd/tuscany.xsd