Cleaning up SVN structure, moving tag under sca-cpp/tags.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@880618 13f79535-47bb-0310-9956-ffa450edef68

1374 files changed, 0 insertions, 0 deletions

diff --git a/tags/cpp-1.0-incubating-M2-final/build.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build.sh
index da0169b8e8..da0169b8e8 100755
--- a/tags/cpp-1.0-incubating-M2-final/build.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/build.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build.txt
index 2158457d6e..2158457d6e 100644
--- a/tags/cpp-1.0-incubating-M2-final/build.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/build_tuscany_sca.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build_tuscany_sca.bat
index 243c229735..243c229735 100644
--- a/tags/cpp-1.0-incubating-M2-final/build_tuscany_sca.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build_tuscany_sca.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/build_tuscany_sdo.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build_tuscany_sdo.bat
index bbfcdf0437..bbfcdf0437 100644
--- a/tags/cpp-1.0-incubating-M2-final/build_tuscany_sdo.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/build_tuscany_sdo.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/etc/svn-config b/sca-cpp/tags/cpp-1.0-incubating-M2-final/etc/svn-config
index 4f8cb41685..4f8cb41685 100644
--- a/tags/cpp-1.0-incubating-M2-final/etc/svn-config
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/etc/svn-config
diff --git a/tags/cpp-1.0-incubating-M2-final/etc/svn-ignore b/sca-cpp/tags/cpp-1.0-incubating-M2-final/etc/svn-ignore
index 38a7548cb7..38a7548cb7 100644
--- a/tags/cpp-1.0-incubating-M2-final/etc/svn-ignore
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/etc/svn-ignore
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/AUTHORS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/AUTHORS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/AUTHORS
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/COPYING b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/COPYING
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/COPYING
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/ChangeLog b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/ChangeLog
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/ChangeLog
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/Developers Guide.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/Developers Guide.txt
index db7797b277..db7797b277 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/Developers Guide.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/Developers Guide.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/GettingStarted.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/GettingStarted.html
index 8e7e732148..8e7e732148 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/GettingStarted.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/GettingStarted.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/INSTALL b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/INSTALL
index 9e0a0b758a..9e0a0b758a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/INSTALL
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/INSTALL
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/LICENSE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/LICENSE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/LICENSE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/Makefile.am
index 08fe50d708..08fe50d708 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/NEWS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/NEWS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/NEWS
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/NOTICE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/NOTICE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/NOTICE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/README
index f61ed9af27..f61ed9af27 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/autogen.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/autogen.sh
index af38864985..af38864985 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/autogen.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/autogen.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/build.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/build.bat
index 750d234152..750d234152 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/build.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/build.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/build.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/build.sh
index 1be3833384..1be3833384 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/build.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/build.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/configure.ac b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/configure.ac
index 983ff2510c..983ff2510c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/configure.ac
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/configure.ac
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/doc/Axis2CWSService.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/Axis2CWSService.html
index 201ee10e26..201ee10e26 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/doc/Axis2CWSService.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/Axis2CWSService.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/doc/CPPComponents.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/CPPComponents.html
index 4994d4c610..4994d4c610 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/doc/CPPComponents.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/CPPComponents.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/doc/PythonExtension.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/PythonExtension.html
index 996262d663..996262d663 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/doc/PythonExtension.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/PythonExtension.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/doc/RubyExtension.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/RubyExtension.html
index a68bc283a9..a68bc283a9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/doc/RubyExtension.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/RubyExtension.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-base.css b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-base.css
index f2c4be6f4e..f2c4be6f4e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-base.css
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-base.css
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-theme.css b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-theme.css
index f0c0a9ac48..f0c0a9ac48 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-theme.css
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/doc/css/maven-theme.css
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/makebindist.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/makebindist.sh
index 8daee57fc8..8daee57fc8 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/makebindist.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/makebindist.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/makedist.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/makedist.sh
index bc4f36c1a2..bc4f36c1a2 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/makedist.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/makedist.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.dsp
index 9a8320cefb..9a8320cefb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.mak
index 80499ebc51..80499ebc51 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/Build/Build.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/build.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/build.cmd
index 561a03aea7..561a03aea7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/build.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/build.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.dsw b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.dsw
index 2d7d7f29ff..2d7d7f29ff 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.dsw
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.dsw
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.ncb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.ncb
index cbdf2a3778..cbdf2a3778 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.ncb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.ncb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.opt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.opt
index 0f1ec83a3c..0f1ec83a3c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.opt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca.opt
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
index 78a7ebf40e..78a7ebf40e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
index c68fa3519a..c68fa3519a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.dsp
index a371552c8d..a371552c8d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.mak
index b027cea266..b027cea266 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.dsp
index b7d6cba094..b7d6cba094 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.mak
index 0cd48c14f5..0cd48c14f5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_python/tuscany_sca_python.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.dsp
index ccba80b6bf..ccba80b6bf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.mak
index 140b842c47..140b842c47 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.dsp
index 8c47830df3..8c47830df3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.mak
index 20b6cc0564..20b6cc0564 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.dsp
index 27827f86da..27827f86da 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.mak
index 7c937e0b1b..7c937e0b1b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
index 8ddf85e4d9..8ddf85e4d9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak
index ea0dbe2aeb..ea0dbe2aeb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
index 6121273475..6121273475 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
index 95cbab7df7..95cbab7df7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj
index 73802bd5f1..73802bd5f1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
index a9ca8290d6..a9ca8290d6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
index 72eac9aa24..72eac9aa24 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
index 8093234c80..8093234c80 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj
index 844732078c..844732078c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
index ec65df0c2e..ec65df0c2e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/Makefile.am
index 8b13058152..8b13058152 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/deploy.bat
index 178ffb7b39..178ffb7b39 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/Makefile.am
index ce28bed32e..ce28bed32e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
index aa030a1ce7..aa030a1ce7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.h
index 84338ae9e8..84338ae9e8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/Operation.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
index 49ec646bb1..49ec646bb1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
index ef78296480..ef78296480 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
index f835b53267..f835b53267 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
index 69af373062..69af373062 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
index 51ee4f02b7..51ee4f02b7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
index 816e1d06f4..816e1d06f4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
index 5e6cd4a197..5e6cd4a197 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
index f1ac59f357..f1ac59f357 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/export.h
index 79b02fe4cf..79b02fe4cf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
index 21eab40c72..21eab40c72 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
index 4744a5b14c..4744a5b14c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
index f0cb0b1b2d..f0cb0b1b2d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
index 545eb92caa..545eb92caa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
index 9797cb33a9..9797cb33a9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
index 1af89e6c5a..1af89e6c5a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
index 9ffb4d10d1..9ffb4d10d1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
index 9d65a7441a..9d65a7441a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
index af7aa2ff6f..af7aa2ff6f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.h
index b68529020d..b68529020d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Binding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.cpp
index 905d8c3555..905d8c3555 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.h
index dc34b03a57..dc34b03a57 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Component.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
index a69364d7c4..a69364d7c4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
index 18e78ffedf..18e78ffedf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
index 7b7fbcbdda..7b7fbcbdda 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.h
index 3e9fdfa832..3e9fdfa832 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Composite.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
index e3ef4b05f4..e3ef4b05f4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.h
index aa2ed12e7f..aa2ed12e7f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeReference.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
index 691091449e..691091449e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.h
index c0c185676a..c0c185676a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/CompositeService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
index c9d8f017c7..c9d8f017c7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.h
index da533f4887..da533f4887 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Contract.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
index bbc6c79bc6..bbc6c79bc6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.h
index f02476745e..f02476745e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Interface.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
index fe83807af4..fe83807af4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
index d0374e61d6..d0374e61d6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.cpp
index 98084c6261..98084c6261 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.h
index b58ca54b4a..b58ca54b4a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Reference.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
index e18f8f3461..e18f8f3461 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
index 259d088a26..259d088a26 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
index cc9b40ca5b..cc9b40ca5b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
index a9d6adc0eb..a9d6adc0eb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.cpp
index 83a2858248..83a2858248 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.h
index bd632b7a3b..bd632b7a3b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Service.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
index b8f1aabb2c..b8f1aabb2c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h
index feaa989505..feaa989505 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
index 40ecca2ceb..40ecca2ceb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
index 7b6dd4b97f..7b6dd4b97f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
index ac7bf0306b..ac7bf0306b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
index 1f07294dcb..1f07294dcb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
index 1b7aed525c..1b7aed525c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h
index e59453e3f2..e59453e3f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
index 264286caf3..264286caf3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h
index 371c67a6da..371c67a6da 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
index 77caae53a2..77caae53a2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.h
index 707ac5da0e..707ac5da0e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/model/Wire.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
index 7b0b535523..7b0b535523 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
index 2c797010d0..2c797010d0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
index d8f86e0147..d8f86e0147 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
index 16188ed550..16188ed550 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.cpp
index 20066a09e0..20066a09e0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.h
index a0aef07cf3..a0aef07cf3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/File.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
index 109d398e1a..109d398e1a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
index 50d25ee932..50d25ee932 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.cpp
index a9ff01b293..a9ff01b293 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.h
index 48b2ad4430..48b2ad4430 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Library.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
index 7613e14c4a..7613e14c4a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
index 430ce1a785..430ce1a785 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
index cdaa3e562b..cdaa3e562b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.h
index b0b09adc50..b0b09adc50 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logger.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logging.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logging.h
index 047c653229..047c653229 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logging.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Logging.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
index 447f498eff..447f498eff 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.h
index 4d20d952c8..4d20d952c8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/src/tuscany/sca/util/Utils.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/test/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/test/Makefile.am
index 7aec56841b..7aec56841b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/test/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/core/test/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/Makefile.am
index d3499698ce..d3499698ce 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/Makefile.am
index 7fac33118a..7fac33118a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/deploy.bat
index e87f3b4dd6..e87f3b4dd6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/Makefile.am
index c579dd2598..c579dd2598 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
index bd0a6c39db..bd0a6c39db 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
index fae62062b2..fae62062b2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
index 43e5e6806e..43e5e6806e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
index ac13ed875e..ac13ed875e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
index 7bf8800242..7bf8800242 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/export.h
index 8a69913be4..8a69913be4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/sca.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/sca.h
index 6cce9453d7..6cce9453d7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/sca.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/osoa/sca/sca.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
index b418a52425..b418a52425 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
index d6c872629d..d6c872629d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
index 5ddf4b1113..5ddf4b1113 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
index 8548a208e9..8548a208e9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
index d470949746..d470949746 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
index 62c3b9854b..62c3b9854b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
index 56511fc9e6..56511fc9e6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
index 77a20d08b8..77a20d08b8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
index 3d7df2d44d..3d7df2d44d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
index eeeb9cdb82..eeeb9cdb82 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
index 76d6bbc5f6..76d6bbc5f6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
index 6d9b76feeb..6d9b76feeb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
index 009e0ed765..009e0ed765 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
index c11af16848..c11af16848 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
index 4fb7c7cfd5..4fb7c7cfd5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
index 20636df884..20636df884 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
index a728880e32..a728880e32 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
index d50d2f9485..d50d2f9485 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
index 3c87560445..3c87560445 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
index 81ba88940d..81ba88940d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
index 641d9452f8..641d9452f8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
index f7db3065b3..f7db3065b3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
index 7292f747b8..7292f747b8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
index 585bac0dc4..585bac0dc4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/Makefile.am
index b8c2a91db2..b8c2a91db2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/Makefile.am
index a8c2762484..a8c2762484 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/ServiceRuntimeException.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/ServiceRuntimeException.h
index d31679b994..d31679b994 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/ServiceRuntimeException.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/ServiceRuntimeException.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/export.h
index 99794a3352..99794a3352 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/osoa/sca/export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
index f8768738e9..f8768738e9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
index 971ed93c86..971ed93c86 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
index 7f204b0ce9..7f204b0ce9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
index 9aa4aea969..9aa4aea969 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
index 1b11e660c6..1b11e660c6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
index ef83a026a6..ef83a026a6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
index f8992ed498..f8992ed498 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
index b89ba8c5c2..b89ba8c5c2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
index fa162ce8f2..fa162ce8f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
index 6b1e694bd6..6b1e694bd6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/xsd/sca-implementation-php.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/xsd/sca-implementation-php.xsd
index 0f32f120e6..0f32f120e6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/xsd/sca-implementation-php.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/php/xsd/sca-implementation-php.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/Makefile.am
index 83e70b4b94..83e70b4b94 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/deploy.bat
index 94d4186eb5..94d4186eb5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/Makefile.am
index 94738b3c87..94738b3c87 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.cmd
index 7cd6bb29ab..7cd6bb29ab 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.sh
index 9f2dacab56..9f2dacab56 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/deploy.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
index 4744f628e0..4744f628e0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
index 783f37a228..783f37a228 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
index 0623fb206c..0623fb206c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
index 69414dce22..69414dce22 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
index 2a4c94b7af..2a4c94b7af 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
index 3596857c0d..3596857c0d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
index ef482f32e8..ef482f32e8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
index f16cb95609..f16cb95609 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceRuntimeException.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceRuntimeException.h
index aa8c88d06d..aa8c88d06d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceRuntimeException.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceRuntimeException.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
index 0223a5741d..0223a5741d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
index 51b0f1dd64..51b0f1dd64 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/export.h
index b608a50711..b608a50711 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
index 413d87173d..413d87173d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
index 6d4cece5fd..6d4cece5fd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
index 6836158e0d..6836158e0d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
index ed42a3920d..ed42a3920d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
index 82f5811203..82f5811203 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
index b37d261416..b37d261416 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
index 544682c18e..544682c18e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
index f2d64b3edc..f2d64b3edc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
index d3a92ba57b..d3a92ba57b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
index 1846bf994d..1846bf994d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_setup.py b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_setup.py
index 9363d5533f..9363d5533f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_setup.py
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/src/tuscany/sca/python/sca_setup.py
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-implementation-python.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-implementation-python.xsd
index e1c7247992..e1c7247992 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-implementation-python.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-implementation-python.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-interface-python.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-interface-python.xsd
index dd9075c7fb..dd9075c7fb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-interface-python.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/python/xsd/sca-interface-python.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/Makefile.am
index ac176d8811..ac176d8811 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/deploy.bat
index e53a8780cf..e53a8780cf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/Makefile.am
index 04eb6ea6b7..04eb6ea6b7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.cmd
index 5baf8289e3..5baf8289e3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.sh
index f02b9c6d54..f02b9c6d54 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/deploy.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
index a6b8ee8ffa..a6b8ee8ffa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
index 148bccc025..148bccc025 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
index 7153ef4fb1..7153ef4fb1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
index 232431ca1e..232431ca1e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
index 2bc5f9d0d9..2bc5f9d0d9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
index a1c5f26a3e..a1c5f26a3e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
index 228f1f8940..228f1f8940 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
index f4692733f1..f4692733f1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
index a0eb97142d..a0eb97142d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
index 849bbdd33e..849bbdd33e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
index 21f09dddfc..21f09dddfc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
index 877b98e7b4..877b98e7b4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
index 32b5801f42..32b5801f42 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
index 0e813983f2..0e813983f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
index cab1c22c48..cab1c22c48 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
index 376a4db0f7..376a4db0f7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
index 24c0275bb9..24c0275bb9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
index f6598590d1..f6598590d1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/Makefile.am
index 50dfb45557..50dfb45557 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/Makefile.am
index 75eba52f73..75eba52f73 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
index b12702bf43..b12702bf43 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.h
index 4cd05bee16..4cd05bee16 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
index a6b052f04f..a6b052f04f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.h
index 90eb222b7b..90eb222b7b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/model/SCAServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/Makefile.am
index feadf9e317..feadf9e317 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/Makefile.am
index b03e398106..b03e398106 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
index 7fb9b4af64..7fb9b4af64 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
index 9f5ddd55eb..9f5ddd55eb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
index 6e7b4eaccc..6e7b4eaccc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.h
index 445a00be82..445a00be82 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/model/SCAReferenceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/xsd/sca-binding-sca.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/xsd/sca-binding-sca.xsd
index 1051c3910c..1051c3910c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/xsd/sca-binding-sca.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/sca/xsd/sca-binding-sca.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/Makefile.am
index 806786ce04..806786ce04 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/deploy.bat
index 567875624f..567875624f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
index 208af0e15a..208af0e15a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
index 4dfb3e7efd..4dfb3e7efd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
index 5ec302f0c8..5ec302f0c8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
index c260445b60..c260445b60 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
index db2c0c791f..db2c0c791f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
index 5839aa8722..5839aa8722 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
index 93607db4a2..93607db4a2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
index 8980ec489b..8980ec489b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
index 15691ce6eb..15691ce6eb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/deploy.bat
index 2bba10425c..2bba10425c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/reference/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/Makefile.am
index feadf9e317..feadf9e317 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
index 37ab185259..37ab185259 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/axis2.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/axis2.xml
index 641085466e..641085466e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/axis2.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/axis2.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.cmd
index 6493e1cec9..6493e1cec9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.sh
index ffe571b0ee..ffe571b0ee 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/deploy.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/module.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/module.xml
index 97d4d43a86..97d4d43a86 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/module.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/module.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/services.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/services.xml
index 335d4d96be..335d4d96be 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/services.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/services.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
index fe3eb52064..fe3eb52064 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
index 0dc8f3358a..0dc8f3358a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
index 046a6e221b..046a6e221b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
index 7a30ab2994..7a30ab2994 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
index 4e8b069010..4e8b069010 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
index 2cf5e5d8e1..2cf5e5d8e1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
index c7972fe15a..c7972fe15a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
index 960c91ed60..960c91ed60 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
index 82ab4385f2..82ab4385f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
index 23ecc133e8..23ecc133e8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
index 90e28e326b..90e28e326b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploy.bat
index 0722342b03..0722342b03 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploymodule.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploymodule.bat
index 246728b6b2..246728b6b2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploymodule.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/service/deploymodule.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/xsd/sca-binding-webservice.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
index 2c1c2abbcc..2c1c2abbcc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/AUTHORS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/AUTHORS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/AUTHORS
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/Makefile.am
index aa315d4f46..aa315d4f46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README
index dc919e1aed..dc919e1aed 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README.html
index 597d05de67..597d05de67 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/README.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataService.h
index 04000698e7..04000698e7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.componentType
index b1cab9e1f9..b1cab9e1f9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.cpp
index 3f06809919..3f06809919 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.h
index 373da4ba95..373da4ba95 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.h
index b8e462fb72..b8e462fb72 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.wsdl
index cbfe180692..cbfe180692 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.componentType
index b65fa1dc18..b65fa1dc18 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.cpp
index fd18119bad..fd18119bad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.h
index 70dfc17b19..70dfc17b19 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/AccountServiceImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/Makefile.am
index 4e4d69e2d7..4e4d69e2d7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteService.h
index d67998059a..d67998059a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.componentType
index 6ac2b77255..6ac2b77255 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.cpp
index e78769f50e..e78769f50e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.h
index cccf161454..cccf161454 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteTypes.xsd
index 5bce3a63dc..5bce3a63dc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.h
index 9bee445c8d..9bee445c8d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/bigbank.account.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/bigbank.account.composite
index 7173d584d2..7173d584d2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/bigbank.account.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.bat
index f95d5136ef..f95d5136ef 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.sh
index eb20a3d670..eb20a3d670 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.account/runwsserver.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.accountmanagement.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.accountmanagement.composite
index 4bf2c35008..4bf2c35008 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.accountmanagement.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.accountmanagement.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/AccountClient.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/AccountClient.cpp
index a0b9de5f76..a0b9de5f76 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/AccountClient.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/AccountClient.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/Makefile.am
index 3ca7379572..3ca7379572 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.bat
index e8907e9302..e8907e9302 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.sh
index 54f3c27578..54f3c27578 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.client/runclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl
index cbfe180692..cbfe180692 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/Makefile.am
index 48843d8e56..48843d8e56 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/README
index d02873e860..d02873e860 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigaccount.php b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigaccount.php
index b9f77d3297..b9f77d3297 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigaccount.php
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigaccount.php
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigwelcome.php b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigwelcome.php
index 32159ddc16..32159ddc16 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigwelcome.php
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.phpwsclient/bigwelcome.php
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp
index b31959170f..b31959170f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/Makefile.am
index c9b565dc0c..c9b565dc0c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.cpp
index a219003a75..a219003a75 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.h
index f16b6d3a06..f16b6d3a06 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/axis2_Account_stub.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.bat
index aa3f7d6dad..aa3f7d6dad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.sh
index fa7d7d6813..fa7d7d6813 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/bigbank.wsclient/runwsclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploy.bat
index 2f1bdf1423..2f1bdf1423 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deployclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deployclient.bat
index 1f47e5ab13..1f47e5ab13 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deployclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deployclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploywsclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploywsclient.bat
index 3e2ce687fe..3e2ce687fe 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploywsclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/BigBank/deploywsclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/COPYING b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/COPYING
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/COPYING
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/Makefile.am
index 88ec180a84..88ec180a84 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README
index 4104ff46b6..4104ff46b6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README.html
index 8a1198df46..8a1198df46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/README.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploy.bat
index efd18e8219..efd18e8219 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deployclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deployclient.bat
index bf4fd47d43..bf4fd47d43 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deployclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deployclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploywsclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploywsclient.bat
index 8b1b1a53c5..8b1b1a53c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploywsclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/deploywsclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/CalculatorClient.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/CalculatorClient.cpp
index 9ec8b04bd1..9ec8b04bd1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/CalculatorClient.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/CalculatorClient.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/Makefile.am
index ced28cf042..ced28cf042 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.bat
index f4308ff739..f4308ff739 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.sh
index ec4b3bb643..ec4b3bb643 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.client/runclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.solution.composite
index 0445d645e4..0445d645e4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp
index 267baf1722..267baf1722 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
index 5d0af5df1f..5d0af5df1f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.cpp
index a24a3c9ed6..a24a3c9ed6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.h
index 833c6f85c6..833c6f85c6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/axis2_Calculator_stub.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.bat
index 6d50f23370..6d50f23370 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.sh
index 51d8dbac22..51d8dbac22 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator.wsclient/runwsclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.h
index 1a88c9cb67..1a88c9cb67 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.wsdl
index 37529c06c5..37529c06c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Calculator.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.componentType
index 72fe9842e8..72fe9842e8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.cpp
index 73abf2f1df..73abf2f1df 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.h
index af8a5eeab1..af8a5eeab1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/CalculatorImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Divide.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Divide.h
index 6e171ed733..6e171ed733 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Divide.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Divide.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.componentType
index d7369e3ff0..d7369e3ff0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.cpp
index 8b9db46ecb..8b9db46ecb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.h
index 64045f1899..64045f1899 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/DivideImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Makefile.am
index c57d0c9fe5..c57d0c9fe5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.bat
index 160152e6a9..160152e6a9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.sh
index b94d841d66..b94d841d66 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/runwsserver.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/sample.calculator.composite
index ae4657b366..ae4657b366 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Calculator/sample.calculator/sample.calculator.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ChangeLog b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ChangeLog
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ChangeLog
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/GettingStarted.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/GettingStarted.html
index d151185171..d151185171 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/GettingStarted.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/GettingStarted.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/INSTALL b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/INSTALL
index 3d7155367d..3d7155367d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/INSTALL
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/INSTALL
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/LICENSE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/LICENSE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/LICENSE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Makefile.am
index bf35b2c21f..bf35b2c21f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/Makefile.am
index dd71fa8f83..dd71fa8f83 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/MyValueClient.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/MyValueClient.cpp
index 0919c539da..0919c539da 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/MyValueClient.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Client/MyValueClient.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Makefile.am
index 9f00a2ad9a..9f00a2ad9a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo.fragment
index 2227f730dd..2227f730dd 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfo.h
index 61d3e18133..61d3e18133 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.componentType
index caed4c5327..caed4c5327 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.cpp
index 1a50dd4426..1a50dd4426 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.h
index e2721ea03d..e2721ea03d 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/Makefile.am
index 7e74c0defe..7e74c0defe 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/CustomerInfo/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/Makefile.am
index e13670bd01..e13670bd01 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/Makefile.am
index d695ed9db9..d695ed9db9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValue.h
index 615f62bde5..615f62bde5 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.componentType
index b03760247b..b03760247b 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.cpp
index 5c0d5506d3..5c0d5506d3 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.h
index 6380dac5e0..6380dac5e0 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.wsdl
index 6ea196e311..6ea196e311 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.xsd
index ab2f25a826..ab2f25a826 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/MyValue/MyValueService.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.h
index fda8a80e89..fda8a80e89 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.wsdl
index 159d15c2d8..159d15c2d8 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/StockQuoteService/StockQuoteService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/sca.composite
index 52461c7650..52461c7650 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueComposite/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueSubsystem/sca.subsystem b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
index 7336b818b7..7336b818b7 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/runMyValueClient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/runMyValueClient.sh
index 6a8a60c490..6a8a60c490 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/runMyValueClient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/runMyValueClient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/server.wsdd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/server.wsdd
index 1a82ab85a7..1a82ab85a7 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/server.wsdd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/MyValue/server.wsdd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/NEWS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/NEWS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/NEWS
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/NOTICE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/NOTICE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/NOTICE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/Makefile.am
index 5f234f1d65..5f234f1d65 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README
index b9e787c768..b9e787c768 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README.html
index aa1e0c6d4f..aa1e0c6d4f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/README.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/deploy.cmd
index 7db890865a..7db890865a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
index 2f569db441..2f569db441 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/calculator_client.py b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/calculator_client.py
index 58d6f45606..58d6f45606 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/calculator_client.py
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/calculator_client.py
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
index d02d5fced8..d02d5fced8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
index ced35b5f6b..ced35b5f6b 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.solution.composite
index 0a8ae343db..0a8ae343db 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl
index f74c3d5c33..f74c3d5c33 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
index 931612432a..931612432a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/calculator_wsclient.py b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/calculator_wsclient.py
index 1ec1f66d83..1ec1f66d83 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/calculator_wsclient.py
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/calculator_wsclient.py
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat
index dbcdf06313..dbcdf06313 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh
index a02f607d08..a02f607d08 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
index 6ee1169645..6ee1169645 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl
index 37529c06c5..37529c06c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.componentType
index b54b4e22b1..b54b4e22b1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.py b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
index 86dbef9e4d..86dbef9e4d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/CalculatorImpl.py
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.componentType
index fa2938279a..fa2938279a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.py b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.py
index 3921731de6..3921731de6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.py
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/DivideImpl.py
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Makefile.am
index 7c0cbd7b88..7c0cbd7b88 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat
index 2e5df325b2..2e5df325b2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh
index 570a439b4f..570a439b4f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
index caac112edf..caac112edf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/README
index 3d7155367d..3d7155367d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/Makefile.am
index 69b34906a1..69b34906a1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README
index 266b66cc9a..266b66cc9a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README.html
index f27d2752d3..f27d2752d3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/README.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountDataServiceImpl.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountDataServiceImpl.rb
index 8ae0e23bab..8ae0e23bab 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountDataServiceImpl.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountDataServiceImpl.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountService.wsdl
index cbfe180692..cbfe180692 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountServiceImpl.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountServiceImpl.rb
index a82b226a76..a82b226a76 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountServiceImpl.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/AccountServiceImpl.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/Makefile.am
index 19059a004f..19059a004f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteServiceImpl.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteServiceImpl.rb
index c8bbe248a3..c8bbe248a3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteServiceImpl.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteServiceImpl.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteTypes.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteTypes.xsd
index 2f7012b5fb..2f7012b5fb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteTypes.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteTypes.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteWebService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteWebService.wsdl
index c14f97c87b..c14f97c87b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteWebService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/StockQuoteWebService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/bigbank.account.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/bigbank.account.composite
index 96f0bd652f..96f0bd652f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/bigbank.account.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/bigbank.account.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.bat
index f95d5136ef..f95d5136ef 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.sh
index eb20a3d670..eb20a3d670 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.account/runwsserver.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.accountmanagement.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.accountmanagement.composite
index f5f0bbbb57..f5f0bbbb57 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.accountmanagement.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.accountmanagement.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/AccountClient.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/AccountClient.rb
index 731c77c9ce..731c77c9ce 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/AccountClient.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/AccountClient.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/Makefile.am
index a289a22914..a289a22914 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.bat
index f50bc2aa2d..f50bc2aa2d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.sh
index 7ed579d393..7ed579d393 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/bigbank.client/runclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/deploy.cmd
index 59b797e564..59b797e564 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyBank/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/Makefile.am
index e111e518cf..e111e518cf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README
index 4104ff46b6..4104ff46b6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README.html
index 6fb00eb23a..6fb00eb23a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/README.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/deploy.cmd
index 2609c3b1e5..2609c3b1e5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
index 253928df0c..253928df0c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/CalculatorClient.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
index 536a5f1072..536a5f1072 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
index 4e9cc0f2cd..4e9cc0f2cd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
index 974dd2e41c..974dd2e41c 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.solution.composite
index 0a8ae343db..0a8ae343db 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl
index f74c3d5c33..f74c3d5c33 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/CalculatorWSClient.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/CalculatorWSClient.rb
index 4022f8a636..4022f8a636 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/CalculatorWSClient.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/CalculatorWSClient.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
index baef3cbb92..baef3cbb92 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
index f9a1ad62a7..f9a1ad62a7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh
index ec4053fb74..ec4053fb74 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
index 22d31b539c..22d31b539c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl
index f74c3d5c33..f74c3d5c33 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
index 36ed15ff9b..36ed15ff9b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/CalculatorImpl.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/DivideImpl.rb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/DivideImpl.rb
index c6615bfcfa..c6615bfcfa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/DivideImpl.rb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/DivideImpl.rb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Makefile.am
index 2508e53093..2508e53093 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat
index 9870d4600d..9870d4600d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh
index 69906579b2..69906579b2 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
index 90f68e8234..90f68e8234 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo.solution.composite
index cf0df165ae..cf0df165ae 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
index a63e4c37d3..a63e4c37d3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/DemoClientImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/supplychain.demo.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
index 20b0e49ec1..20b0e49ec1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.demo/supplychain.demo.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
index e78e602635..e78e602635 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggerImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
index c78357b1a8..c78357b1a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/LoggingFacility.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/supplychain.logging.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
index 2b28c8f9e2..2b28c8f9e2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.logging/supplychain.logging.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
index fb0c8a5676..fb0c8a5676 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/Manufacturer.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
index 63530bc0ee..63530bc0ee 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/ManufacturerImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
index 256671f64f..256671f64f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/WarehouseCallback.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
index c61657c0a7..c61657c0a7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturer/supplychain.manufacturer.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerA.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerA.solution.composite
index 17449e51fa..17449e51fa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerA.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerA.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerB.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerB.solution.composite
index 94535d704a..94535d704a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerB.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerB.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerC.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerC.solution.composite
index b4b9380af0..b4b9380af0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerC.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.manufacturerC.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer.solution.composite
index f7bad01614..f7bad01614 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/Retailer.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
index 39bd1963f2..39bd1963f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/Retailer.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
index fb381ec9a6..fb381ec9a6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/RetailerImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
index 51a2b96b1b..51a2b96b1b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.retailer/supplychain.retailer.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
index a007f9957b..a007f9957b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/Warehouse.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
index fbc1edb462..fbc1edb462 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseCallbackImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
index 7f63d3b571..7f63d3b571 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/WarehouseImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
index e44b964eb4..e44b964eb4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/SupplyChain/supplychain.warehouse/supplychain.warehouse.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/autogen.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/autogen.sh
index 18277601c8..18277601c8 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/autogen.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/autogen.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/build.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/build.sh
index c332defce0..c332defce0 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/build.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/build.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/configure.ac b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/configure.ac
index f59c04ba2d..f59c04ba2d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/configure.ac
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/configure.ac
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.dsp
index afc73a11e9..afc73a11e9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.mak
index 0368231581..0368231581 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/AccountClient/AccountClient.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.dsp
index 91b6640c91..91b6640c91 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.mak
index b173c70132..b173c70132 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Accounts/Accounts.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.dsw b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.dsw
index 5771d655c1..5771d655c1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.dsw
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.dsw
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.ncb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.ncb
index e2b54fa05d..e2b54fa05d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.ncb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.ncb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.opt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.opt
index 3abec54f7b..3abec54f7b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.opt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/BigBank.opt
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.dsp
index 9a8320cefb..9a8320cefb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.mak
index 452df03c2d..452df03c2d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/Build/Build.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.dsp
index 1c240d56d4..1c240d56d4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.mak
index 9f6881a584..9f6881a584 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/WSAccountClient/WSAccountClient.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/build.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/build.cmd
index 0cf0ac8e3e..0cf0ac8e3e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/build.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/BigBank/build.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.dsp
index 9a8320cefb..9a8320cefb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
index 1c01e71a39..1c01e71a39 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
index 05f9141d98..05f9141d98 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
index fde3e53f96..fde3e53f96 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
index 790ea91cd2..790ea91cd2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
index 2dbc91fcf0..2dbc91fcf0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
index c0ecc9fecf..c0ecc9fecf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
index 2efa614a43..2efa614a43 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
index cef2af3f3f..cef2af3f3f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
index 0c5c7f825e..0c5c7f825e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
index 366db95229..366db95229 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/build.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/build.cmd
index 0cf0ac8e3e..0cf0ac8e3e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/build.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/build.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
index 6e956aa4e6..6e956aa4e6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
index 5c4f5fac71..5c4f5fac71 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/AccountClient/AccountClient.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/AccountClient/AccountClient.vcproj
index bf9e9aa352..bf9e9aa352 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/AccountClient/AccountClient.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/AccountClient/AccountClient.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/Accounts/Accounts.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/Accounts/Accounts.vcproj
index dbeb962b36..dbeb962b36 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/Accounts/Accounts.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/Accounts/Accounts.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/BigBank.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/BigBank.sln
index 26a497d219..26a497d219 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/BigBank.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/BigBank.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/WSAccountClient/WSAccountClient.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/WSAccountClient/WSAccountClient.vcproj
index ad6e7bfa89..ad6e7bfa89 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/WSAccountClient/WSAccountClient.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/BigBank/WSAccountClient/WSAccountClient.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln
index 271c1ae327..271c1ae327 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo
index 99ec75542f..99ec75542f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
index a2b02ca4d9..a2b02ca4d9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
index a53a3eccf3..a53a3eccf3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
index 8427616332..8427616332 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/samples/scagen.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/scagen.bat
index a717341086..a717341086 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/samples/scagen.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/samples/scagen.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/scatest.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/scatest.bat
index d749d5e084..d749d5e084 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/scatest.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/scatest.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/scatest.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/scatest.sh
index 45d5367550..45d5367550 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/scatest.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/scatest.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/AUTHORS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/AUTHORS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/AUTHORS
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/COPYING b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/COPYING
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/COPYING
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ChangeLog b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ChangeLog
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ChangeLog
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/INSTALL b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/INSTALL
index b8a53409ed..b8a53409ed 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/INSTALL
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/INSTALL
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/LICENSE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/LICENSE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/LICENSE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/Makefile.am
index 24292e8033..24292e8033 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/NEWS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/NEWS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/NEWS
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/NOTICE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/NOTICE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/NOTICE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/README
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
index 115858f09a..115858f09a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
index 5c48a3a683..5c48a3a683 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
index c804494b46..c804494b46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
index 1706534042..1706534042 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj
index f82221700b..f82221700b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCComposite.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
index 15287150e0..15287150e0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp
index e2ca28345d..e2ca28345d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
index 7d3b355b8a..7d3b355b8a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
index f38fd95c79..f38fd95c79 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
index a2da07322c..a2da07322c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
index 93f6cf7a28..93f6cf7a28 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
index 3f7b011749..3f7b011749 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
index f454a5bde0..f454a5bde0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml
index 2fd4580526..2fd4580526 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/services.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
index 91d3105f5b..91d3105f5b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem
index 91d3105f5b..91d3105f5b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/configuration/WSEntryPointTestRPCSubsystem/sca.subsystem
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
index c804494b46..c804494b46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
index 1706534042..1706534042 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPC.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
index 15287150e0..15287150e0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
index 7d3b355b8a..7d3b355b8a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/WSEntryPointTestRPCImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite
index f454a5bde0..f454a5bde0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/WSEntryPointTestRPC/runtime/packages/WSEntryPointTestRPCComposite/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/autogen.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/autogen.sh
index af38864985..af38864985 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/autogen.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/autogen.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/build.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/build.sh
index 7a3c439e8b..7a3c439e8b 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/build.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/build.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/configure.ac b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/configure.ac
index f84c32ab1e..f84c32ab1e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/configure.ac
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/configure.ac
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/deploy.cmd
index d6d0c72cb9..d6d0c72cb9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/TestClient.c b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/TestClient.c
index bb728dc916..bb728dc916 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/TestClient.c
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/TestClient.c
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/runclient.bat
index 13f3164751..13f3164751 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj
index 03c007662b..03c007662b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.client/ws.binding.service.client.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.sln
index b1de123e0a..b1de123e0a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.h
index aaff35a6cc..aaff35a6cc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.wsdl
index 23ab8b08e4..23ab8b08e4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/Test.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.componentType
index d0cca1882d..d0cca1882d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.cpp
index e24534701d..e24534701d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.h
index 3026d4c7aa..3026d4c7aa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/TestImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/services.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/services.xml
index b223a53dad..b223a53dad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/services.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/services.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.composite
index 98393813f3..98393813f3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite
index e1e402454b..e1e402454b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj
index 22c601b695..22c601b695 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.binding.service/ws.binding.service/ws.binding.service.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/Makefile.am
index bc0e430ee7..bc0e430ee7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/deploy.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/deploy.cmd
index 3aab273673..3aab273673 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/deploy.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/deploy.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/Makefile.am
index 0a482e82f1..0a482e82f1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/datagraph.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/datagraph.xsd
index 30727473a0..30727473a0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/datagraph.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/datagraph.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/importschema.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/importschema.xsd
index 082c389211..082c389211 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/importschema.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/importschema.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop.wsdl
index 258b31b2bd..258b31b2bd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01-in.xml
index be5da658c2..be5da658c2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01.xsd
index 083966d9f9..083966d9f9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop01.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02-in.xml
index d57593625b..d57593625b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02.xsd
index a46c21c4f9..a46c21c4f9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop02.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03-in.xml
index f4f50bf28c..f4f50bf28c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03.xsd
index 631dc0bfff..631dc0bfff 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop03.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04-in.xml
index ae06607013..ae06607013 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04.xsd
index 4d968e7b3c..4d968e7b3c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop04.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06-in.xml
index 168c41d380..168c41d380 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06.xsd
index acedc99232..acedc99232 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop06.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07-in.xml
index 029387c5d4..029387c5d4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07.xsd
index e1cfc492d2..e1cfc492d2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop07.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08-in.xml
index 5a8c0de3b9..5a8c0de3b9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08.xsd
index b7ca9dc916..b7ca9dc916 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop08.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09-in.xml
index 37d72454c0..37d72454c0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09.xsd
index 3a793fd8c5..3a793fd8c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop09.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10-in.xml
index 164b7242b4..164b7242b4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10.xsd
index 593860b84b..593860b84b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop10.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11-in.xml
index 5e5d9af4a7..5e5d9af4a7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11.xsd
index a72cda91e5..a72cda91e5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop11.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12-in.xml
index 09fc39d2e1..09fc39d2e1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12.xsd
index f428e65bf8..f428e65bf8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop12.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13-in.xml
index 256f42646d..256f42646d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13.xsd
index 3d553a7171..3d553a7171 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop13.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14-in.xml
index eb73036a8b..eb73036a8b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14.xsd
index 0155718348..0155718348 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop14.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15-in.xml
index 2376cbae06..2376cbae06 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15.xsd
index ad59a9710b..ad59a9710b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop15.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16-in.xml
index 94b51e764f..94b51e764f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16.xsd
index f6518cfb3f..f6518cfb3f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop16.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17-in.xml
index 4e6895d46f..4e6895d46f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17.xsd
index bbfc755fb7..bbfc755fb7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop17.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18-in.xml
index ea28b230ea..ea28b230ea 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18.xsd
index de8dc5b79e..de8dc5b79e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop18.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19-in.xml
index 77d828227c..77d828227c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19.xsd
index 7d28e0d9b3..7d28e0d9b3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop19.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20-in.xml
index 8b0e8df4ba..8b0e8df4ba 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20.xsd
index 1c4ffa6a5c..1c4ffa6a5c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop20.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21-in.xml
index 3bb03bb36f..3bb03bb36f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21.xsd
index 4888a7d385..4888a7d385 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop21.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22-in.xml
index 4ee0a343a4..4ee0a343a4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22.xsd
index 11c8d5c980..11c8d5c980 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop22.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23-in.xml
index 7f0d845be2..7f0d845be2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23.xsd
index b2f358c69e..b2f358c69e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop23.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24-in.xml
index 913004272e..913004272e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24.xsd
index c7c5a7f1af..c7c5a7f1af 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop24.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop25-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop25-in.xml
index 4a87e3e401..4a87e3e401 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop25-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop25-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26-in.xml
index 28ef8e7eaf..28ef8e7eaf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26.xsd
index dc72404fae..dc72404fae 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop26.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop27-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop27-in.xml
index c596e781ff..c596e781ff 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop27-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop27-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28-in.xml
index ea47654916..ea47654916 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28.xsd
index 36ca723a0c..36ca723a0c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop28.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29-in.xml
index 37dc992ac0..37dc992ac0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29.xsd
index febb95142e..febb95142e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop29.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30-in.xml
index 1f802101c4..1f802101c4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30.xsd
index d42361b509..d42361b509 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop30.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31-in.xml
index 3cd54829a9..3cd54829a9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31.xsd
index 9ba51daca8..9ba51daca8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop31.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32-in.xml
index 72dc7ceb44..72dc7ceb44 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32.xsd
index bf33516371..bf33516371 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop32.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33-in.xml
index 61a0fdf2aa..61a0fdf2aa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33.xsd
index 27f6c22d12..27f6c22d12 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop33.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34-in.xml
index 3c488be77c..3c488be77c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34.xsd
index 8fe33e9776..8fe33e9776 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop34.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35-in.xml
index 63f84a91da..63f84a91da 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35.xsd
index 706326b22f..706326b22f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop35.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36-in.xml
index 2a4b63f958..2a4b63f958 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36.xsd
index 2e1c95b1c3..2e1c95b1c3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop36.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37-in.xml
index f25366e905..f25366e905 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37.xsd
index b2afa51290..b2afa51290 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop37.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38-in.xml
index 5a97314a46..5a97314a46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38.xsd
index a4b406550a..a4b406550a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop38.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop39-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop39-in.xml
index d6ec278d2a..d6ec278d2a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop39-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop39-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40-in.xml
index ac7a3835b7..ac7a3835b7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40.xsd
index 3e2ca8765a..3e2ca8765a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop40.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41-in.xml
index 6fe9f99157..6fe9f99157 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41.xsd
index a473626f03..a473626f03 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop41.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42-in.xml
index 427f07b22b..427f07b22b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42.xsd
index 99a9afecd1..99a9afecd1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop42.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43-in.xml
index 005879cf42..005879cf42 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43.xsd
index 60d31e94cc..60d31e94cc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop43.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44-in.xml
index 1170e4a991..1170e4a991 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44.xsd
index 45c74b90fa..45c74b90fa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop44.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45-in.xml
index f0160f713a..f0160f713a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45.xsd
index 7a6236c9eb..7a6236c9eb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop45.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46-in.xml
index f5ddf4a859..f5ddf4a859 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46.xsd
index 54573c0bdb..54573c0bdb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop46.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47-in.xml
index 4cff425ea2..4cff425ea2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47.xsd
index be67383db3..be67383db3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop47.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50-in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50-in.xml
index 5aa3d442a9..5aa3d442a9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50-in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50-in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50.xsd
index f2d4ed7679..f2d4ed7679 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/resources/interop50.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/runtest.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/runtest.sh
index 831246bbc6..831246bbc6 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/runtest.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/runtest.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/Makefile.am
index 9fef007b19..9fef007b19 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/TestClient.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/TestClient.cpp
index da3a90cff4..da3a90cff4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/TestClient.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/TestClient.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.bat
index 4ab0ea4cf3..4ab0ea4cf3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.sh
index 57e4b6b90f..57e4b6b90f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/runclient.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj
index 2646bb025c..2646bb025c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.client/ws.service.interop.client.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.sln
index b0bda8950b..b0bda8950b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Makefile.am
index d8a82e241a..d8a82e241a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Test.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Test.h
index 59f55984e7..59f55984e7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Test.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/Test.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.componentType
index d0cca1882d..d0cca1882d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.cpp
index c99667e362..c99667e362 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.h
index 2f4f57e475..2f4f57e475 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/TestImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.bat
index 804688fc56..804688fc56 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.sh
index ec0a75188b..ec0a75188b 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/runwsserver.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.composite
index 997aebfdc0..997aebfdc0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite
index 4a47d431a8..4a47d431a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.solution.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj
index 56ffe19400..56ffe19400 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/test/ws.service.interop/ws.service.interop/ws.service.interop.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/Makefile.am
index 5bea4c88d5..5bea4c88d5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/LICENSE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/LICENSE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/LICENSE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/NOTICE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/NOTICE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/NOTICE
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/README
index 2831dadd94..2831dadd94 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/META-INF/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/Makefile.am
index a9df10fc30..a9df10fc30 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/build.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/build.xml
index a7bb207ee3..a7bb207ee3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/build.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/build.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
index d7af1ab841..d7af1ab841 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
index 870937b6ca..870937b6ca 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
index 9e70d06b7f..9e70d06b7f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
index 94b7c70854..94b7c70854 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
index 7dd2abdc98..7dd2abdc98 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
index 90c4d7dcac..90c4d7dcac 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
index a094a1c66c..a094a1c66c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingCompositeAndFragmentTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
index cb980e6d27..cb980e6d27 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
index f72ade38d3..f72ade38d3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
index 0c5fad7429..0c5fad7429 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
index d531010419..d531010419 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
index 21a08cebb5..21a08cebb5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
index da8305031b..da8305031b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
index 79432708b2..79432708b2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
index 302ccdb06a..302ccdb06a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
index 2c67915811..2c67915811 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
index 99c4158d1a..99c4158d1a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/Calculator.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
index 41bbb22bde..41bbb22bde 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
index 3f97eacef2..3f97eacef2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/CalculatorImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
index 04d3e8fbdb..04d3e8fbdb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorCompositeAndComponent/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
index bc14167841..bc14167841 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
index af140f9575..af140f9575 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
index d527d9c358..d527d9c358 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
index 9d226cd5dc..9d226cd5dc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
index d10bfb4b1a..d10bfb4b1a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
index d717e8636e..d717e8636e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
index 182d9d89f2..182d9d89f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
index 733b4700e7..733b4700e7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
index d1a634999c..d1a634999c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
index c325a90b1e..c325a90b1e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
index cb63dd1f06..cb63dd1f06 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
index 85fac59da8..85fac59da8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
index 95b70c3017..95b70c3017 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
index 5c5cb78b87..5c5cb78b87 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
index 540873174b..540873174b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
index b83a65be8c..b83a65be8c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl.hpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/StockQuoteService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
index 42c50da77f..42c50da77f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceComposite/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
index 48d34f7957..48d34f7957 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
index 928480df1f..928480df1f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
index 8d2f810db0..8d2f810db0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
index b83a65be8c..b83a65be8c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl.hpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/StockQuoteService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
index 42c50da77f..42c50da77f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespace/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
index af7687892d..af7687892d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index 05e70d64f7..05e70d64f7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index d9c7823f4b..d9c7823f4b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
index 2f1749a4a1..2f1749a4a1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
index bbfcf15ed1..bbfcf15ed1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
index f5921f4216..f5921f4216 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/MyValueImpl.hpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
index 6171c47fba..6171c47fba 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespace/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
index 10c59480a8..10c59480a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index be5bc060c5..be5bc060c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
index 6171c47fba..6171c47fba 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
index 717ce02ede..717ce02ede 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/CustomerInfo.fragmentX
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
index bbda577c28..bbda577c28 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeMissingScaComposite/sca.compositeX
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
index 5c5cb78b87..5c5cb78b87 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
index 928480df1f..928480df1f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
index c275383ab4..c275383ab4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
index 4334c82eca..4334c82eca 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
index b83a65be8c..b83a65be8c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
index 98a342fcb0..98a342fcb0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl.hpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
index 3f9feeed30..3f9feeed30 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
index 6a8fd51534..6a8fd51534 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/StockQuoteService.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
index 42c50da77f..42c50da77f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeTwoClasses/sca.composite
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
index 27d28368f5..27d28368f5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
index 32bf7572dc..32bf7572dc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
index bb81f4d66b..bb81f4d66b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
index 55f5813303..55f5813303 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
index 290124a2d7..290124a2d7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
index 00b163ba76..00b163ba76 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
index ceb34034e3..ceb34034e3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
index 63bae2f75c..63bae2f75c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
index 19725c6fff..19725c6fff 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
index 277a3afb06..277a3afb06 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
index 648fa5c8cb..648fa5c8cb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
index bfa203598c..bfa203598c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
index 3f2b560cbc..3f2b560cbc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
index 9213ec625b..9213ec625b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
index 4f5ab80728..4f5ab80728 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
index 0cb8404ca3..0cb8404ca3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index f1bb7cafaf..f1bb7cafaf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index cb9e4e6e2a..cb9e4e6e2a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 1f35f8fc96..1f35f8fc96 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 2dd37cba99..2dd37cba99 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 75f912d3ae..75f912d3ae 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index e0da638ea0..e0da638ea0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index a9d033d415..a9d033d415 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 594f404d13..594f404d13 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index ba75bde415..ba75bde415 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index b85533cfd4..b85533cfd4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index eeb977a62a..eeb977a62a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index f626664679..f626664679 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index f21b0dd83c..f21b0dd83c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 6d418bc330..6d418bc330 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 3dcfbb5a08..3dcfbb5a08 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 2bf1b90e87..2bf1b90e87 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index b2f23f5cf1..b2f23f5cf1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 82995c96b0..82995c96b0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index eeb977a62a..eeb977a62a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index d61c806e44..d61c806e44 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index f03b0fbc10..f03b0fbc10 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index df388bf43d..df388bf43d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index f21b0dd83c..f21b0dd83c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 6d418bc330..6d418bc330 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 2e32caea94..2e32caea94 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index d3b173ee57..d3b173ee57 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 0495bb9abc..0495bb9abc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 5522cde72a..5522cde72a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 70643f76f6..70643f76f6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 210da9a64c..210da9a64c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index e924448d4c..e924448d4c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 70643f76f6..70643f76f6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index 210da9a64c..210da9a64c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index e924448d4c..e924448d4c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index a9d033d415..a9d033d415 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 594f404d13..594f404d13 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 86b12f82e1..86b12f82e1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index b85533cfd4..b85533cfd4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index eeb977a62a..eeb977a62a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
index 742947ca69..742947ca69 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 9d8604c587..9d8604c587 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
index d3eef80e8f..d3eef80e8f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index f21b0dd83c..f21b0dd83c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
index 3d1d279b7c..3d1d279b7c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 6d418bc330..6d418bc330 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
index ad5cee3ca7..ad5cee3ca7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 2a060fc47e..2a060fc47e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index a9b56bdb5c..a9b56bdb5c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 9672e5efc7..9672e5efc7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 94b1d5cb4d..94b1d5cb4d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/lib/readme.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/lib/readme.txt
index d99c666c6a..d99c666c6a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/lib/readme.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/lib/readme.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.cmd
index 8ab5e4abdf..8ab5e4abdf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.sh
index c50f28b98f..c50f28b98f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/scagen.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
index 4ccbe0c750..4ccbe0c750 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
index 669901b4b5..669901b4b5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
index 246a489c9c..246a489c9c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
index 36d0af18b3..36d0af18b3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
index a2bb4ba858..a2bb4ba858 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
index b6bdf92878..b6bdf92878 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
index 533e1fd14a..533e1fd14a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
index 235d0a13d8..235d0a13d8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
index 317ad2fc44..317ad2fc44 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
index a25610c1f9..a25610c1f9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
index 6e951f03de..6e951f03de 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
index 2d98e0a836..2d98e0a836 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
index 876d2dc3e0..876d2dc3e0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
index e51b2d781c..e51b2d781c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
index d7052b7843..d7052b7843 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
index 4bc0a455e7..4bc0a455e7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
index c423477193..c423477193 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
index 28974b41a6..28974b41a6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
index 6c86fa25b5..6c86fa25b5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
index 3eb8dc7d98..3eb8dc7d98 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
index 9cf7952afa..9cf7952afa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
index 0756b5fc3b..0756b5fc3b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
index 37c2a1a81c..37c2a1a81c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
index 1ec393959d..1ec393959d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
index e7036037c6..e7036037c6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
index 5a79b49092..5a79b49092 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
index 19e983c6b1..19e983c6b1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
index c4ad140bfd..c4ad140bfd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
index 956db364a1..956db364a1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
index dd260c9787..dd260c9787 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
index ea15ca587b..ea15ca587b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
index b45fbb7b40..b45fbb7b40 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
index 2f5edb3a93..2f5edb3a93 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
index 915549788d..915549788d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
index c8157fe2f6..c8157fe2f6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-core.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-core.xsd
index d7661e3994..d7661e3994 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-core.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-core.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-composite.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-composite.xsd
index 4bcc6747ba..4bcc6747ba 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-composite.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-composite.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-java.xsd
index e20f0a9b50..e20f0a9b50 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-implementation-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-java.xsd
index a6028c1434..a6028c1434 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-wsdl.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-wsdl.xsd
index a3de838b7e..a3de838b7e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-wsdl.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca-interface-wsdl.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca.xsd
index 8853f25c11..8853f25c11 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/sca.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sca/xsd/tuscany.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/tuscany.xsd
index 8bad940782..8bad940782 100644
--- a/tags/cpp-1.0-incubating-M2-final/sca/xsd/tuscany.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sca/xsd/tuscany.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/AUTHORS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/AUTHORS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/AUTHORS
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/COPYING b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/COPYING
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/COPYING
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/ChangeLog b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/ChangeLog
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/ChangeLog
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/Committers Guide.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/Committers Guide.txt
index 5f82e39c14..5f82e39c14 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/Committers Guide.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/Committers Guide.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/GettingStarted.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/GettingStarted.html
index 3573403e78..3573403e78 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/GettingStarted.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/GettingStarted.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/INSTALL b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/INSTALL
index 07946d51f4..07946d51f4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/INSTALL
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/INSTALL
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/LICENSE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/LICENSE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/LICENSE
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/Makefile.am
index 05bd99526f..05bd99526f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/NEWS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/NEWS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/NEWS
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/NOTICE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/NOTICE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/NOTICE
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/README
index 61cca53eb8..61cca53eb8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/autogen.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/autogen.sh
index 18277601c8..18277601c8 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/autogen.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/autogen.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/build.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/build.bat
index c8f66f3a71..c8f66f3a71 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/build.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/build.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/build.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/build.sh
index a08a0db238..a08a0db238 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/build.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/build.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/configure.ac b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/configure.ac
index e46bc227cf..e46bc227cf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/configure.ac
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/configure.ac
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/doc/BuildingSTDCXX.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/doc/BuildingSTDCXX.html
index 283aa8bb48..283aa8bb48 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/doc/BuildingSTDCXX.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/doc/BuildingSTDCXX.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-base.css b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-base.css
index f2c4be6f4e..f2c4be6f4e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-base.css
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-base.css
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-theme.css b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-theme.css
index f0c0a9ac48..f0c0a9ac48 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-theme.css
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/doc/css/maven-theme.css
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/makebindist.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/makebindist.sh
index 25ac4226b3..25ac4226b3 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/makebindist.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/makebindist.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/makedist.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/makedist.sh
index 0a981895f0..0a981895f0 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/makedist.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/makedist.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dep b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dep
index b62497b7d8..b62497b7d8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dep
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dep
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dsp
index 9a8320cefb..9a8320cefb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.mak
index a393cc94e1..a393cc94e1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/Build/Build.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/build.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/build.cmd
index b52e9694c9..b52e9694c9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/build.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/build.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
index 0124c874ec..0124c874ec 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
index 01fc7df575..01fc7df575 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
index 87c1b8a4bd..87c1b8a4bd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
index e3539d4602..e3539d4602 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
index 015f97a75e..015f97a75e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
index 2bed69ba31..2bed69ba31 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
index f4fc233e2b..f4fc233e2b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
index 163664df97..163664df97 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
index 2cabf691b9..2cabf691b9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.dsw b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
index 9bbf975238..9bbf975238 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.ncb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
index 404b3790d0..404b3790d0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.opt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.opt
index 658f325cf3..658f325cf3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.opt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projects/tuscany_sdo/tuscany_sdo.opt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
index 854243b9fb..854243b9fb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
index a72c97a3af..a72c97a3af 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_interop/sdo_interop.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_interop/sdo_interop.vcproj
index edc93e960b..edc93e960b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_interop/sdo_interop.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_interop/sdo_interop.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
index fdfb44b4a8..fdfb44b4a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
index 6a27381a8f..6a27381a8f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
index a326090099..a326090099 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
index e0ce6b1e53..e0ce6b1e53 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
index d6d4944f83..d6d4944f83 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/Makefile.am
index edc02bb540..edc02bb540 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/Makefile.am
index 905089e7f9..905089e7f9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.cpp
index 7e4c480e26..7e4c480e26 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.h
index deebc64082..deebc64082 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/interop.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/main.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/main.cpp
index b22ffe3d6c..b22ffe3d6c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/main.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/main.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/runinterop.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/runinterop.bat
index 270687dbfd..270687dbfd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/runinterop.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/interop/runinterop.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/Makefile.am
index 87fda98097..87fda98097 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/deploy.bat
index ccbb253bf4..ccbb253bf4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
index d68f594125..d68f594125 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.h
index fb1beac41c..fb1beac41c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h
index bc9c8f55ed..bc9c8f55ed 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/Makefile.am
index 96710534f7..96710534f7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
index 31124fc2ff..31124fc2ff 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h
index 280a94ceec..280a94ceec 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtbuild b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtbuild
index 7c9117ffae..7c9117ffae 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtbuild
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtbuild
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtproject b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtproject
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.cdtproject
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.project b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.project
index a24e25672e..a24e25672e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.project
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.project
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 37a23c6dd7..37a23c6dd7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/Makefile.am
index 9a47026580..9a47026580 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/Makefile.am
index cc127b70dc..cc127b70dc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp
index 384956471c..384956471c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h
index 8e39904b65..8e39904b65 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
index d780fe2beb..d780fe2beb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h
index 59e158aeed..59e158aeed 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
index ccb2f3176a..ccb2f3176a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h
index 6137532315..6137532315 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h
index 61d2f62954..61d2f62954 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
index d759eb5bf3..d759eb5bf3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h
index 773eebb901..773eebb901 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
index 897ed9d0c8..897ed9d0c8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.h
index 22319168fe..22319168fe 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/CopyHelper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp
index 15354d0d61..15354d0d61 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.h
index 6ebf241723..6ebf241723 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASProperty.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.cpp
index 2f44f220de..2f44f220de 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.h
index 62d924a4f1..62d924a4f1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASType.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.cpp
index 3275b6db7d..3275b6db7d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.h
index d102961180..d102961180 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValue.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.cpp
index f94397cc87..f94397cc87 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.h
index f5dec7fa41..f5dec7fa41 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DASValues.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp
index 0f1981f853..0f1981f853 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.h
index 32e0782ee0..32e0782ee0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactory.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
index 3bdf86339a..3bdf86339a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h
index f4e07ac786..f4e07ac786 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp
index 9f4fb02c6d..9f4fb02c6d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.h
index eef42e393d..eef42e393d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraph.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp
index 3d4919767e..3d4919767e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h
index 6affa1cc46..6affa1cc46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.cpp
index a9415bc5f1..a9415bc5f1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.h
index 925fc9e10f..925fc9e10f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObject.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
index 1fc2ec4f3b..1fc2ec4f3b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h
index 5d02b91395..5d02b91395 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp
index c3a461b100..c3a461b100 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
index 963761e281..963761e281 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp
index 0e60693c55..0e60693c55 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.h
index 1e9da37141..1e9da37141 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectList.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
index c25a3e8b66..c25a3e8b66 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h
index ce2cc5488f..ce2cc5488f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp
index cf9029afa9..cf9029afa9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h
index deab314ef7..deab314ef7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
index 0024efa1fe..0024efa1fe 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h
index 3058bd8f72..3058bd8f72 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp
index e0c275ede1..e0c275ede1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h
index de5e3bbb5d..de5e3bbb5d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp
index 58c229ac0a..58c229ac0a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.h
index f6495687ba..f6495687ba 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/GroupEvent.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp
index ec17d97b02..ec17d97b02 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.h
index 426b069b56..426b069b56 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/HelperProvider.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp
index d43b918a77..d43b918a77 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.h
index 40954d9b25..40954d9b25 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/LogWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.cpp
index 47f7072c38..47f7072c38 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.h
index 556d503154..556d503154 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logger.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logging.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logging.h
index 2d72d6f42d..2d72d6f42d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logging.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Logging.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Makefile.am
index 6cced63259..6cced63259 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp
index 14d5d7aa1b..14d5d7aa1b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h
index 3304e8c384..3304e8c384 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.cpp
index 8e4a13ad9b..8e4a13ad9b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.h
index 74892ca832..74892ca832 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Property.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
index a528fff820..a528fff820 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
index 0775c02af8..0775c02af8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
index c9ac38a90c..c9ac38a90c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
index 08e61c2591..08e61c2591 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp
index 3ba5e8fd64..3ba5e8fd64 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h
index 700636d49f..700636d49f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
index 76de4fb772..76de4fb772 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.h
index cb13e15f28..cb13e15f28 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertyList.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
index 9cfc813a03..9cfc813a03 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
index 5301ef18bf..5301ef18bf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp
index e125f58a85..e125f58a85 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h
index 6e20ba49cb..6e20ba49cb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp
index 07d4834574..07d4834574 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
index dec13f2937..dec13f2937 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp
index 925ce3d372..925ce3d372 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h
index 37a3469a94..37a3469a94 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
index 016ebe08a4..016ebe08a4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h
index 7c832214e3..7c832214e3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp
index 9e8b13330e..9e8b13330e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h
index 525ad73945..525ad73945 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp
index 334d6f25d9..334d6f25d9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h
index fd11d98fde..fd11d98fde 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDO.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDO.h
index cc4fc6cf7b..cc4fc6cf7b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDO.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDO.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.cpp
index 9a129f8ca1..9a129f8ca1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.h
index 59306462e5..59306462e5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDODate.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp
index 09a014e8db..09a014e8db 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h
index d8a79cac3f..d8a79cac3f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
index a4c60d105e..a4c60d105e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h
index 67dc56e071..67dc56e071 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSPI.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSPI.h
index 011d112d2f..011d112d2f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSPI.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSPI.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
index 496864b93a..496864b93a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
index 151ca763f4..151ca763f4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOString.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOString.h
index 9661bb6294..9661bb6294 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOString.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOString.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
index 2fb84d5765..2fb84d5765 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.h
index 3a3d0ff048..3a3d0ff048 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOUtils.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp
index 38a4ff9799..38a4ff9799 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h
index bcfb226806..bcfb226806 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp
index 6420af9a96..6420af9a96 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h
index 83e2aa5a2c..83e2aa5a2c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp
index 12b1e59b9e..12b1e59b9e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h
index 977ff63a63..977ff63a63 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
index 72f93fe83d..72f93fe83d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
index 9b1026f1d8..9b1026f1d8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
index 6865721f53..6865721f53 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
index b71b49f942..b71b49f942 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp
index dfd464854a..dfd464854a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h
index c9354a8916..c9354a8916 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp
index 2794026aa3..2794026aa3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h
index a91becc15c..a91becc15c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp
index 0da33a80c0..0da33a80c0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h
index 18dade91ef..18dade91ef 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
index 59414a29aa..59414a29aa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h
index 7ba5b2421d..7ba5b2421d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp
index 10a5870ae0..10a5870ae0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h
index 4beb0108f5..4beb0108f5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp
index fcf252ece1..fcf252ece1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.h
index 858009dee3..858009dee3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoCheck.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp
index 54fcc8c2fc..54fcc8c2fc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h
index 3503307939..3503307939 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.cpp
index 489fb3f505..489fb3f505 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.h
index a697119460..a697119460 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Sequence.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
index 53a576bd7c..53a576bd7c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h
index 5a47598276..5a47598276 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.cpp
index 932a7c90f3..932a7c90f3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.h
index 19980d7b04..19980d7b04 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Setting.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
index 398de36a07..398de36a07 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.h
index 1f34acea72..1f34acea72 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/SettingList.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.cpp
index d63a9ed7d2..d63a9ed7d2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.h
index d4de2b5506..d4de2b5506 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/Type.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
index 876dfbce29..876dfbce29 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
index 6e52e7bbf0..6e52e7bbf0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
index d593473ade..d593473ade 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
index 2b608ad5ba..2b608ad5ba 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
index aa02c7fd95..aa02c7fd95 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
index a6840e05bc..a6840e05bc 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
index da86aad53f..da86aad53f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
index da85b7110e..da85b7110e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
index c42baad2b1..c42baad2b1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.h
index 4abd93b875..4abd93b875 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
index c1f7278ab6..c1f7278ab6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.h
index b003a8d37d..b003a8d37d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/TypeList.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp
index d6dfd02c8e..d6dfd02c8e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.h
index 757ba2113a..757ba2113a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocument.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp
index 1a97f26765..1a97f26765 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h
index f7726a449c..f7726a449c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp
index 0e1018ac99..0e1018ac99 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.h
index 6ff248cd98..6ff248cd98 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
index 37ad60e647..37ad60e647 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h
index d7200746dd..d7200746dd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp
index 9f897a8525..9f897a8525 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.h
index 4efeb15bc5..4efeb15bc5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XMLQName.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp
index 310716cc8c..310716cc8c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
index 3cf07f310d..3cf07f310d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
index aa99a3260e..aa99a3260e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
index ee0c2a5e56..ee0c2a5e56 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
index c1124b648a..c1124b648a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h
index d6ebad81e0..d6ebad81e0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp
index 214027fcb6..214027fcb6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h
index 16dd8c6eb8..16dd8c6eb8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp
index de5aff341b..de5aff341b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.h
index 1e02ea1dd3..1e02ea1dd3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/XpathHelper.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/disable_warn.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/disable_warn.h
index b02bb5bd81..b02bb5bd81 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/disable_warn.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/disable_warn.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/export.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/export.h
index 4a2d5f49ce..4a2d5f49ce 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/export.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/commonj/sdo/export.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/deploy.bat
index 8d6629ec40..8d6629ec40 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/src/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtbuild b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtbuild
index 17ebd43324..17ebd43324 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtbuild
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtbuild
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtproject b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtproject
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.cdtproject
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.project b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.project
index 32920ef4cf..32920ef4cf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.project
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.project
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 0c77f0af0f..0c77f0af0f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xml
index 43f4e46e1b..43f4e46e1b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xsd
index f8f1cb9d47..f8f1cb9d47 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Catalog.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Customer.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Customer.xsd
index 948dd07e85..948dd07e85 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Customer.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Customer.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Order.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Order.xsd
index b11fce2e60..b11fce2e60 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Order.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/47293Order.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48601.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48601.xsd
index 9e0b117520..9e0b117520 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48601.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48601.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xml
index 0197503c98..0197503c98 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xsd
index 45678b9a30..45678b9a30 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48686.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xml
index 97ab07c448..97ab07c448 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xsd
index fa2bf9ef75..fa2bf9ef75 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xml.txt
index d7b9d4b8d4..d7b9d4b8d4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xsd.txt
index 822a05ec7f..822a05ec7f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/48736_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Atom1.0.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Atom1.0.xsd
index a421b56c69..a421b56c69 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Atom1.0.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Atom1.0.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xml
index 180b050bf5..180b050bf5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xsd
index dd1f296a3a..dd1f296a3a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/BadElement.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Catalog.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Catalog.xsd
index 2c3708285a..2c3708285a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Catalog.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Catalog.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Customer.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Customer.xsd
index 1f21545592..1f21545592 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Customer.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Customer.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Makefile.am
index 060580dfbb..060580dfbb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xml
index d7b95510ad..d7b95510ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xsd
index 2f2d53c5a8..2f2d53c5a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/OddChars.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Order.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Order.xsd
index d87f690236..d87f690236 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Order.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Order.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Readme.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Readme.txt
index 326131a78c..326131a78c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Readme.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Readme.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/SdoGenerate.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/SdoGenerate.cpp
index 8806243fe8..8806243fe8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/SdoGenerate.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/SdoGenerate.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/StockQuoteService.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/StockQuoteService.wsdl
index 1ecdea337e..1ecdea337e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/StockQuoteService.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/StockQuoteService.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style1.xsd
index 25d800a02c..25d800a02c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style2.xsd
index a6aaf51013..a6aaf51013 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style3.xsd
index 62db1fa13e..62db1fa13e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style4.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style4.xsd
index ab4bd6ef46..ab4bd6ef46 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style4.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/Style4.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingSchema.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingSchema.xsd
index 2f2d53c5a8..2f2d53c5a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingSchema.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingSchema.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingUsingSchema.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingUsingSchema.xml
index d4a292083d..d4a292083d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingUsingSchema.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/TravelBookingUsingSchema.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/axis.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/axis.xsd
index 8832ae1afd..8832ae1afd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/axis.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/axis.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xml
index 5d6d2d7336..5d6d2d7336 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xsd
index 263f8bae30..263f8bae30 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46617b.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46633.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46633.txt
index da34a5196e..da34a5196e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46633.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46633.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46634_out.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46634_out.txt
index 0a978a4a66..0a978a4a66 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46634_out.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46634_out.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46693.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46693.xsd
index deb00d0473..deb00d0473 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46693.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b46693.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.txt
index d525bd7776..d525bd7776 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.xsd
index dbeba3fd22..dbeba3fd22 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.txt
index 202a17fc21..202a17fc21 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.xsd
index f78ce703f3..f78ce703f3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47137b.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47293.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47293.txt
index 9d571da67c..9d571da67c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47293.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b47293.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48602.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48602.xsd
index 859068d11d..859068d11d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48602.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48602.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xml
index 201b90fcc1..201b90fcc1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xsd
index ad3b1acb92..ad3b1acb92 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633_xml.txt
index 7c0425d298..7c0425d298 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b.xsd
index f2ddbca89f..f2ddbca89f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b_xsd.txt
index 0836fda6cd..0836fda6cd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48633b_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xml
index 50e4d9c017..50e4d9c017 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xsd
index b14da69279..b14da69279 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xml.txt
index 4b5b55ced7..4b5b55ced7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xsd.txt
index 81ccaee474..81ccaee474 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48636_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xml
index d4dc9e1852..d4dc9e1852 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xsd
index 3845d69471..3845d69471 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xml.txt
index f4899d810e..f4899d810e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xsd.txt
index df670b8066..df670b8066 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/b48686_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/badelement.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/badelement.txt
index f9ddc1e3b1..f9ddc1e3b1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/badelement.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/badelement.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups.xsd
index 36d1b8f047..36d1b8f047 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups_xsd.txt
index 5d92da21c5..5d92da21c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroups_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename.xsd
index 0ccdf615f0..0ccdf615f0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename_xsd.txt
index 5d92da21c5..5d92da21c5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bothgroupssamename_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug2.txt
index aae01a0c9c..aae01a0c9c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug45933-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug45933-output.txt
index 366d41ef02..366d41ef02 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug45933-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug45933-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xml
index e4b79cdf2f..e4b79cdf2f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xsd
index e0e69eebf1..e0e69eebf1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xml.txt
index d8b1345d0d..d8b1345d0d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xsd.txt
index 38d7c904f0..38d7c904f0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bug48300_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xml
index 7fd3b119e6..7fd3b119e6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xsd
index f5fd88a424..f5fd88a424 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/company.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/include.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/include.xsd
index 16089cecae..16089cecae 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/include.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/include.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok1.xsd
index d24e5c39e7..d24e5c39e7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok2.xsd
index 3d90cbdec3..3d90cbdec3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok3.xsd
index 45d5db2ed4..45d5db2ed4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bugs/1/ok3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.txt
index da1aabead7..da1aabead7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.xsd_safe.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.xsd_safe.txt
index 1b4c6bb7da..1b4c6bb7da 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.xsd_safe.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-out.xsd_safe.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-outxml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-outxml.txt
index 44650e05a4..44650e05a4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-outxml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/bunique-outxml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/buniqueread-out.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/buniqueread-out.txt
index 44650e05a4..44650e05a4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/buniqueread-out.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/buniqueread-out.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator.xsd
index a5a26de117..a5a26de117 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2.wsdl
index 88b5b80b3d..88b5b80b3d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2a.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2a.wsdl
index f2f008bf6e..f2f008bf6e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2a.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/calculator2a.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/carotest3.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/carotest3.txt
index cb5e4ed9b3..cb5e4ed9b3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/carotest3.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/carotest3.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company.xsd
index d165367196..d165367196 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xml
index 3680df3ccf..3680df3ccf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xsd
index 9af4d3e721..9af4d3e721 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/company_with_nillable_SN.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyabs.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyabs.xsd
index eb5ce1e18b..eb5ce1e18b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyabs.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyabs.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyref.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyref.xsd
index 1f706fca8f..1f706fca8f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyref.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companyref.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companysubs.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companysubs.xsd
index 3e16090350..3e16090350 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companysubs.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/companysubs.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload-output.txt
index 0ed7d5c8a8..0ed7d5c8a8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload2-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload2-output.txt
index a4c1e4dd94..a4c1e4dd94 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload2-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload2-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload3-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload3-output.txt
index a4c1e4dd94..a4c1e4dd94 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload3-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/csload3-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave-output.txt
index 8fb656138c..8fb656138c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave2-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave2-output.txt
index da51f8a037..da51f8a037 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave2-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/cssave2-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/datetest.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/datetest.txt
index 3da923ea55..3da923ea55 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/datetest.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/datetest.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/defaults.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/defaults.txt
index 1cdba8ea05..1cdba8ea05 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/defaults.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/defaults.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.txt
index b08b52a605..b08b52a605 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xml
index 2a5d1463c7..2a5d1463c7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xsd
index 0c953a6348..0c953a6348 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/doctest.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/employee.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/employee.xsd
index e2eec63eea..e2eec63eea 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/employee.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/employee.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs1.txt
index 31a188344b..31a188344b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs2.txt
index b2290965d3..b2290965d3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs3.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs3.txt
index 4ad714d46c..4ad714d46c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs3.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/emptycs3.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xml
index 3680df3ccf..3680df3ccf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xsd
index 6246be5efa..6246be5efa 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/error1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/extension.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/extension.xsd
index 7e6b336516..7e6b336516 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/extension.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/extension.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gCustomer.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gCustomer.xsd
index 055d758ca4..055d758ca4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gCustomer.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gCustomer.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xml
index 91a31c45f2..91a31c45f2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xsd
index 33683b1c62..33683b1c62 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g/gOrder.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g3.xsd
index 4ed8b44fc2..4ed8b44fc2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/g3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/getproptest.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/getproptest.txt
index f6bea1325d..f6bea1325d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/getproptest.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/getproptest.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham1.xsd
index 9c07e4b75d..9c07e4b75d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham2.xsd
index 0148a42e41..0148a42e41 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham3.xsd
index 969a6f8eb0..969a6f8eb0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/graham3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup.xsd
index 3e4a1a7d3a..3e4a1a7d3a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup_xsd.txt
index 7eba22a274..7eba22a274 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupingroup_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup.xsd
index 8e8a7aded6..8e8a7aded6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup_xsd.txt
index f879c8adb2..f879c8adb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouprefingroup_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate.xsd
index 1e1b5c5678..1e1b5c5678 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate_xsd.txt
index 81ccaee474..81ccaee474 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/grouptoolate_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix.xsd
index fc61269d42..fc61269d42 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix_xsd.txt
index 81ccaee474..81ccaee474 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwithprefix_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwrongname.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwrongname.xsd
index 8905af53d8..8905af53d8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwrongname.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/groupwrongname.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc1.txt
index bf517ec394..bf517ec394 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc2.txt
index ac4a97479f..ac4a97479f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/inc2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include.xsd
index 904ec8e1fd..904ec8e1fd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include1.xsd
index 8c4187077c..8c4187077c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include2.xsd
index 5c05afdf36..5c05afdf36 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/include2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/includeother3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/includeother3.xsd
index c661f6871e..c661f6871e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/includeother3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/includeother3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira490.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira490.txt
index 4527deb32a..4527deb32a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira490.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira490.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705.xsd
index 0001371677..0001371677 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705_out.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705_out.txt
index 6b5bf10cda..6b5bf10cda 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705_out.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/jira705_out.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xml
index a40accebc2..a40accebc2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xsd
index 89faa4d68b..89faa4d68b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xml.txt
index ddf8e8ac22..ddf8e8ac22 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xsd.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xsd.txt
index 2adeaf3a7c..2adeaf3a7c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xsd.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/list1_xsd.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/loadload-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/loadload-output.txt
index a6df48b1be..a6df48b1be 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/loadload-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/loadload-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/main.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/main.cpp
index d6499fb34f..d6499fb34f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/main.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/main.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/maintest.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/maintest.txt
index 3d2a8f793e..3d2a8f793e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/maintest.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/maintest.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xml
index fe78c6198b..fe78c6198b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xsd
index 7d49ca3258..7d49ca3258 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/many.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/matttest1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/matttest1.txt
index 5c5200ff22..5c5200ff22 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/matttest1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/matttest1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/merle1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/merle1.txt
index f0eae645b6..f0eae645b6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/merle1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/merle1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-core.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-core.xsd
index acfc5c9f13..acfc5c9f13 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-core.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-core.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-implementation-local-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-implementation-local-java.xsd
index a7ef0f6ecd..a7ef0f6ecd 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-implementation-local-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my-implementation-local-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my.xsd
index e910a7db44..e910a7db44 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/my.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/notns.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/notns.txt
index a6f2bc0411..a6f2bc0411 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/notns.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/notns.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/nulltest.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/nulltest.txt
index 01442ec949..01442ec949 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/nulltest.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/nulltest.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/oddchars.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/oddchars.txt
index b9ed9643b3..b9ed9643b3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/oddchars.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/oddchars.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xml
index 1b5d7e1b6a..1b5d7e1b6a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xsd
index 336f40def7..336f40def7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xml
index ff2b31c610..ff2b31c610 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xsd
index e1498578cf..e1498578cf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNS2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNSout.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNSout.txt
index 742842bd3e..742842bd3e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNSout.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openloadNSout.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openseq.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openseq.txt
index 44091f2608..44091f2608 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openseq.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/openseq.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order1.txt
index 4f46cbfecf..4f46cbfecf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order2.txt
index ec01027ebb..ec01027ebb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/order2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/partial.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/partial.xml
index 11acb1b806..11acb1b806 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/partial.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/partial.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xml
index 41b3bb02b7..41b3bb02b7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xsd
index f61d50a942..f61d50a942 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/pete.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/querytest.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/querytest.txt
index 9b895282a0..9b895282a0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/querytest.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/querytest.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/saveopen-output.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/saveopen-output.txt
index fa36e7113c..fa36e7113c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/saveopen-output.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/saveopen-output.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-sca.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-sca.xsd
index d0adc9bda0..d0adc9bda0 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-sca.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-sca.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-webservice.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-webservice.xsd
index 60c642fbfe..60c642fbfe 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-webservice.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-webservice.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-ws.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-ws.xsd
index 5ee7500578..5ee7500578 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-ws.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-binding-ws.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-core.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-core.xsd
index cfe9d8d884..cfe9d8d884 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-core.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-core.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-dll.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-dll.xsd
index 6e1ec1d6eb..6e1ec1d6eb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-dll.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-dll.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-java.xsd
index 3f54089755..3f54089755 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-local-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-local-java.xsd
index ce4f529f3e..ce4f529f3e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-local-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-implementation-local-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-cpp.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-cpp.xsd
index ddbfe540b7..ddbfe540b7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-cpp.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-cpp.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-java.xsd
index 579f9483df..579f9483df 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-wsdl.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-wsdl.xsd
index 9c15d87485..9c15d87485 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-wsdl.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-interface-wsdl.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-java.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-java.xsd
index 77a6df6772..77a6df6772 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-java.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-java.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-xsd.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-xsd.xsd
index 2820bd3dd6..2820bd3dd6 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-xsd.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca-property-xsd.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca.xsd
index 72cc5f497b..72cc5f497b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sca.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario1.txt
index a0a3c7a203..a0a3c7a203 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario2.txt
index 9728bd6f0a..9728bd6f0a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario3.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario3.txt
index e174f62538..e174f62538 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario3.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario3.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario4.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario4.txt
index f678499e15..f678499e15 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario4.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario4.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario5.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario5.txt
index af5bf47102..af5bf47102 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario5.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/scenario5.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.cpp
index 4f5964966a..4f5964966a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.h
index dd134c9d4f..dd134c9d4f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest2.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest2.cpp
index 374400b474..374400b474 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest2.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sdotest2.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sequence.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sequence.txt
index 1a616a3d16..1a616a3d16 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sequence.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/sequence.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setmany.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setmany.txt
index 083ebf6b62..083ebf6b62 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setmany.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setmany.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setnull.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setnull.txt
index f6fe0633e1..f6fe0633e1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setnull.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/setnull.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault1.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault1.txt
index f49e95dd58..f49e95dd58 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault1.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault1.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault2.txt
index a7bd1cba92..a7bd1cba92 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/showdefault2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.txt
index 0b143e19a9..0b143e19a9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xml
index 4896d30619..4896d30619 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xsd
index f31d6e21d2..f31d6e21d2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/simple.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.wsdl b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.wsdl
index d465f1beb2..d465f1beb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.wsdl
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.wsdl
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.xml
index 435fc549ad..435fc549ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_wsdl.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_wsdl.txt
index 47a11b4d3b..47a11b4d3b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_wsdl.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_wsdl.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_xml.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_xml.txt
index 6aa493dfa3..6aa493dfa3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_xml.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/stock_xml.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/include3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/include3.xsd
index c661f6871e..c661f6871e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/include3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/include3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother.xsd
index 3332ed6b53..3332ed6b53 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother1.xsd
index 3023ffaca5..3023ffaca5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother2.xsd
index 5c05afdf36..5c05afdf36 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/t2/includeother2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/include3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/include3.xsd
index 8b7ca5822b..8b7ca5822b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/include3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/include3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother.xsd
index 21f3ff25cb..21f3ff25cb 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother1.xsd
index 3023ffaca5..3023ffaca5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother2.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother2.xsd
index 5c05afdf36..5c05afdf36 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother2.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test/includeother2.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test2/includeother3.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test2/includeother3.xsd
index 8b7ca5822b..8b7ca5822b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test2/includeother3.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/test2/includeother3.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testabstract.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testabstract.txt
index 80c1d03afe..80c1d03afe 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testabstract.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testabstract.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testerrors.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testerrors.txt
index 62254aeaf9..62254aeaf9 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testerrors.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testerrors.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testinc2.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testinc2.txt
index 837559562e..837559562e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testinc2.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testinc2.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen.txt
index 7d7b816e6d..7d7b816e6d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen3.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen3.xml
index b16a75802e..b16a75802e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen3.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testopen3.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testorder.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testorder.txt
index 4f46cbfecf..4f46cbfecf 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testorder.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testorder.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/teststyles.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/teststyles.txt
index 52de3ffc6a..52de3ffc6a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/teststyles.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/teststyles.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testsubsload.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testsubsload.txt
index 43c16114c3..43c16114c3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testsubsload.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testsubsload.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testutils.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testutils.txt
index dd86813b90..dd86813b90 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testutils.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testutils.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.txt
index 025b797d96..025b797d96 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.xml
index 47f983d51e..47f983d51e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/testwsdl.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/travel.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/travel.txt
index 5311a919f8..5311a919f8 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/travel.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/travel.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/userdata.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/userdata.txt
index e24caba194..e24caba194 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/userdata.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/userdata.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/utils.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/utils.cpp
index ac6103a5da..ac6103a5da 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/utils.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/utils.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml1.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml1.xsd
index 54d78e0366..54d78e0366 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml1.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml1.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_in.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_in.xml
index e897ece9c1..e897ece9c1 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_in.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_in.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_out.txt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_out.txt
index d485768c7e..d485768c7e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_out.txt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/runtime/core/test/xhtml_out.txt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/AUTHORS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/AUTHORS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/AUTHORS
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/COPYING b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/COPYING
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/COPYING
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ChangeLog b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ChangeLog
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ChangeLog
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/GettingStarted.html b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/GettingStarted.html
index 0a2d269083..0a2d269083 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/GettingStarted.html
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/GettingStarted.html
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/INSTALL b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/INSTALL
index f3710f30e4..f3710f30e4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/INSTALL
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/INSTALL
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/LICENSE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/LICENSE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/LICENSE
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/Makefile.am
index 4e5bab506c..4e5bab506c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/NEWS b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/NEWS
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/NEWS
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/NOTICE b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/NOTICE
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/NOTICE
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/README b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/README
index f3710f30e4..f3710f30e4 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/README
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/README
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/autogen.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/autogen.sh
index af38864985..af38864985 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/autogen.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/autogen.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.bat
index 72600e83a3..72600e83a3 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.sh
index 850bd6ee4c..850bd6ee4c 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/build.sh
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/configure.ac b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/configure.ac
index 9b2d92a07d..9b2d92a07d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/configure.ac
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/configure.ac
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/build.cmd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/build.cmd
index 1fad2ace06..1fad2ace06 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/build.cmd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/build.cmd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.dsw b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.dsw
index 816b3b2f93..816b3b2f93 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.dsw
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.dsw
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.ncb b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.ncb
index 67b2fcb95b..67b2fcb95b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.ncb
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.ncb
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.opt b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.opt
index eeb2b8a757..eeb2b8a757 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.opt
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/misc.opt
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp
index 5ef0b2382e..5ef0b2382e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak
index 7ebb95941a..7ebb95941a 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.sln b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.sln
index d7de879890..d7de879890 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.sln
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.sln
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.suo b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.suo
index 59edb30889..59edb30889 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.suo
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/misc.suo
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
index fd5ee10f8b..fd5ee10f8b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.cpp
index 5a27683807..5a27683807 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.xsd
index b626d6a45b..b626d6a45b 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ChangeSummarySave.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Makefile.am b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Makefile.am
index c16feffd5d..c16feffd5d 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Makefile.am
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Makefile.am
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ObjectCreation.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ObjectCreation.cpp
index 0db919cc69..0db919cc69 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ObjectCreation.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/ObjectCreation.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Query.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Query.cpp
index fe3f96e132..fe3f96e132 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Query.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Query.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Substitutes.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Substitutes.cpp
index 816caee2d5..816caee2d5 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Substitutes.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/Substitutes.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.cpp
index 8462f80f21..8462f80f21 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xml b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xml
index 29ac158654..29ac158654 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xml
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xml
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xsd
index 4b7270354c..4b7270354c 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/XSDLoading.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/companysubs.xsd b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/companysubs.xsd
index 5b7e52ed9e..5b7e52ed9e 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/companysubs.xsd
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/companysubs.xsd
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/deploy.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/deploy.bat
index fb2bec5a1f..fb2bec5a1f 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/deploy.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/deploy.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.cpp b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.cpp
index 4d1ee57c61..4d1ee57c61 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.cpp
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.cpp
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.h b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.h
index f39cc910f7..f39cc910f7 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.h
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/samples/misc/samples.h
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.bat b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.bat
index 63ff4e6442..63ff4e6442 100644
--- a/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.bat
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.bat
diff --git a/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.sh b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.sh
index e55a02395d..e55a02395d 100755
--- a/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.sh
+++ b/sca-cpp/tags/cpp-1.0-incubating-M2-final/sdo/sdotest.sh